223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

consistent naming

This commit is contained in:
Martin Diehl 2020-12-30 12:45:08 +01:00
parent bc12ac44c3
commit 8c6d759b55
3 changed files with 39 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/constitutive.f90
View File

@ -174,25 +174,25 @@ module constitutive
end subroutine mech_restartRead
module function constitutive_mech_getS(co,ip,el) result(S)
integer, intent(in) :: co, ip, el
module function mech_S(ph,me) result(S)
integer, intent(in) :: ph,me
real(pReal), dimension(3,3) :: S
end function constitutive_mech_getS
end function mech_S
module function constitutive_mech_getLp(co,ip,el) result(Lp)
integer, intent(in) :: co, ip, el
real(pReal), dimension(3,3) :: Lp
end function constitutive_mech_getLp
module function mech_L_p(ph,me) result(L_p)
integer, intent(in) :: ph,me
real(pReal), dimension(3,3) :: L_p
end function mech_L_p
module function constitutive_mech_getF(co,ip,el) result(F)
integer, intent(in) :: co, ip, el
real(pReal), dimension(3,3) :: F
end function constitutive_mech_getF
module function constitutive_mech_getF_e(co,ip,el) result(F_e)
integer, intent(in) :: co, ip, el
module function mech_F_e(ph,me) result(F_e)
integer, intent(in) :: ph,me
real(pReal), dimension(3,3) :: F_e
end function constitutive_mech_getF_e
end function mech_F_e
module function constitutive_mech_getP(co,ip,el) result(P)
integer, intent(in) :: co, ip, el
@ -421,12 +421,10 @@ module constitutive
constitutive_restartWrite, &
constitutive_restartRead, &
integrateSourceState, &
constitutive_mech_setF, &
constitutive_thermal_setT, &
constitutive_mech_getP, &
constitutive_mech_getLp, &
constitutive_mech_setF, &
constitutive_mech_getF, &
constitutive_mech_getS, &
constitutive_initializeRestorationPoints, &
constitutive_windForward, &
PLASTICITY_UNDEFINED_ID, &
@ -667,7 +665,8 @@ function constitutive_damage_collectDotState(co,ip,el,ph,of) result(broken)
sourceType: select case (phase_source(so,ph))
case (SOURCE_damage_anisoBrittle_ID) sourceType
call source_damage_anisoBrittle_dotState(constitutive_mech_getS(co,ip,el), co, ip, el) ! correct stress?
call source_damage_anisoBrittle_dotState(mech_S(material_phaseAt(co,el),material_phaseMemberAt(co,ip,el)),&
co, ip, el) ! correct stress?
case (SOURCE_damage_isoDuctile_ID) sourceType
call source_damage_isoDuctile_dotState(co, ip, el)
@ -1020,7 +1019,7 @@ subroutine crystallite_orientations(co,ip,el)
call crystallite_orientation(co,ip,el)%fromMatrix(transpose(math_rotationalPart(&
constitutive_mech_getF_e(co,ip,el))))
mech_F_e(material_phaseAt(co,el),material_phaseMemberAt(co,ip,el)))))
if (plasticState(material_phaseAt(1,el))%nonlocal) &
call plastic_nonlocal_updateCompatibility(crystallite_orientation, &
@ -1123,7 +1122,7 @@ function integrateSourceState(dt,co,ip,el) result(broken)
enddo
if(converged_) then
broken = constitutive_damage_deltaState(constitutive_mech_getF_e(co,ip,el),co,ip,el,ph,me)
broken = constitutive_damage_deltaState(mech_F_e(ph,me),co,ip,el,ph,me)
exit iteration
endif

26
src/constitutive_mech.f90
View File

@ -1847,27 +1847,27 @@ end subroutine mech_restartRead
! getter for non-mech (e.g. thermal)
module function constitutive_mech_getS(co,ip,el) result(S)
module function mech_S(ph,me) result(S)
integer, intent(in) :: co, ip, el
integer, intent(in) :: ph,me
real(pReal), dimension(3,3) :: S
S = constitutive_mech_S(material_phaseAt(co,el))%data(1:3,1:3,material_phaseMemberAt(co,ip,el))
S = constitutive_mech_S(ph)%data(1:3,1:3,me)
end function constitutive_mech_getS
end function mech_S
! getter for non-mech (e.g. thermal)
module function constitutive_mech_getLp(co,ip,el) result(Lp)
module function mech_L_p(ph,me) result(L_p)
integer, intent(in) :: co, ip, el
real(pReal), dimension(3,3) :: Lp
integer, intent(in) :: ph,me
real(pReal), dimension(3,3) :: L_p
Lp = constitutive_mech_Lp(material_phaseAt(co,el))%data(1:3,1:3,material_phaseMemberAt(co,ip,el))
L_p = constitutive_mech_Lp(ph)%data(1:3,1:3,me)
end function constitutive_mech_getLp
end function mech_L_p
! getter for non-mech (e.g. thermal)
@ -1883,15 +1883,15 @@ end function constitutive_mech_getF
! getter for non-mech (e.g. thermal)
module function constitutive_mech_getF_e(co,ip,el) result(F_e)
module function mech_F_e(ph,me) result(F_e)
integer, intent(in) :: co, ip, el
integer, intent(in) :: ph,me
real(pReal), dimension(3,3) :: F_e
F_e = constitutive_mech_Fe(material_phaseAt(co,el))%data(1:3,1:3,material_phaseMemberAt(co,ip,el))
F_e = constitutive_mech_Fe(ph)%data(1:3,1:3,me)
end function constitutive_mech_getF_e
end function mech_F_e

25
src/constitutive_thermal.f90
View File

@ -109,32 +109,29 @@ module subroutine constitutive_thermal_getRateAndItsTangents(TDot, dTDot_dT, T,
real(pReal) :: &
my_Tdot, &
my_dTdot_dT
real(pReal), dimension(3,3) :: Lp, S
integer :: &
phase, &
ph, &
homog, &
instance, &
grain, &
source, &
constituent
me, &
so, &
co
homog = material_homogenizationAt(el)
instance = thermal_typeInstance(homog)
do grain = 1, homogenization_Nconstituents(homog)
phase = material_phaseAt(grain,el)
constituent = material_phasememberAt(grain,ip,el)
do source = 1, phase_Nsources(phase)
select case(phase_source(source,phase))
do co = 1, homogenization_Nconstituents(homog)
ph = material_phaseAt(co,el)
me = material_phasememberAt(co,ip,el)
do so = 1, phase_Nsources(ph)
select case(phase_source(so,ph))
case (SOURCE_thermal_dissipation_ID)
Lp = constitutive_mech_getLp(grain,ip,el)
S = constitutive_mech_getS(grain,ip,el)
call source_thermal_dissipation_getRateAndItsTangent(my_Tdot, my_dTdot_dT, &
S, Lp, phase)
mech_S(ph,me),mech_L_p(ph,me), ph)
case (SOURCE_thermal_externalheat_ID)
call source_thermal_externalheat_getRateAndItsTangent(my_Tdot, my_dTdot_dT, &
phase, constituent)
ph, me)
case default
my_Tdot = 0.0_pReal