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

systematic names

This commit is contained in:
Martin Diehl 2020-12-22 11:38:29 +01:00
parent 81602dd0e0
commit 830a61a9ff
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/constitutive.f90
View File

@ -637,7 +637,7 @@ end subroutine constitutive_LiAndItsTangents
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief contains the constitutive equation for calculating the rate of change of microstructure !> @brief contains the constitutive equation for calculating the rate of change of microstructure
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
function constitutive_collectDotState_source(S, ipc, ip, el,phase,of) result(broken) function constitutive_source_collectDotState(S, ipc, ip, el,phase,of) result(broken)
integer, intent(in) :: & integer, intent(in) :: &
ipc, & !< component-ID of integration point ipc, & !< component-ID of integration point
@ -676,7 +676,7 @@ function constitutive_collectDotState_source(S, ipc, ip, el,phase,of) result(bro
enddo SourceLoop enddo SourceLoop
end function constitutive_collectDotState_source end function constitutive_source_collectDotState
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
@ -1453,7 +1453,7 @@ subroutine integrateSourceState(g,i,e)
p = material_phaseAt(g,e) p = material_phaseAt(g,e)
c = material_phaseMemberAt(g,i,e) c = material_phaseMemberAt(g,i,e)
broken = constitutive_collectDotState_source(crystallite_S(1:3,1:3,g,i,e), g,i,e,p,c) broken = constitutive_source_collectDotState(crystallite_S(1:3,1:3,g,i,e), g,i,e,p,c)
if(broken) return if(broken) return
do s = 1, phase_Nsources(p) do s = 1, phase_Nsources(p)
@ -1471,7 +1471,7 @@ subroutine integrateSourceState(g,i,e)
source_dotState(1:size_so(s),1,s) = sourceState(p)%p(s)%dotState(:,c) source_dotState(1:size_so(s),1,s) = sourceState(p)%p(s)%dotState(:,c)
enddo enddo
broken = constitutive_collectDotState_source(crystallite_S(1:3,1:3,g,i,e), g,i,e,p,c) broken = constitutive_source_collectDotState(crystallite_S(1:3,1:3,g,i,e), g,i,e,p,c)
if(broken) exit iteration if(broken) exit iteration
do s = 1, phase_Nsources(p) do s = 1, phase_Nsources(p)

18
src/constitutive_mech.f90
View File

@ -546,7 +546,7 @@ end subroutine constitutive_plastic_LpAndItsTangents
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief contains the constitutive equation for calculating the rate of change of microstructure !> @brief contains the constitutive equation for calculating the rate of change of microstructure
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
function constitutive_collectDotState(FpArray, subdt, ipc, ip, el,phase,of) result(broken) function mech_collectDotState(FpArray, subdt, ipc, ip, el,phase,of) result(broken)
integer, intent(in) :: & integer, intent(in) :: &
ipc, & !< component-ID of integration point ipc, & !< component-ID of integration point
@ -597,7 +597,7 @@ function constitutive_collectDotState(FpArray, subdt, ipc, ip, el,phase,of) resu
broken = any(IEEE_is_NaN(plasticState(phase)%dotState(:,of))) broken = any(IEEE_is_NaN(plasticState(phase)%dotState(:,of)))
end function constitutive_collectDotState end function mech_collectDotState
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
@ -952,7 +952,7 @@ module subroutine integrateStateFPI(g,i,e)
p = material_phaseAt(g,e) p = material_phaseAt(g,e)
c = material_phaseMemberAt(g,i,e) c = material_phaseMemberAt(g,i,e)
broken = constitutive_collectDotState(crystallite_partitionedFp0, & broken = mech_collectDotState(crystallite_partitionedFp0, &
crystallite_subdt(g,i,e), g,i,e,p,c) crystallite_subdt(g,i,e), g,i,e,p,c)
if(broken) return if(broken) return
@ -970,7 +970,7 @@ module subroutine integrateStateFPI(g,i,e)
broken = integrateStress(g,i,e) broken = integrateStress(g,i,e)
if(broken) exit iteration if(broken) exit iteration
broken = constitutive_collectDotState(crystallite_partitionedFp0, & broken = mech_collectDotState(crystallite_partitionedFp0, &
crystallite_subdt(g,i,e), g,i,e,p,c) crystallite_subdt(g,i,e), g,i,e,p,c)
if(broken) exit iteration if(broken) exit iteration
@ -1040,7 +1040,7 @@ module subroutine integrateStateEuler(g,i,e)
p = material_phaseAt(g,e) p = material_phaseAt(g,e)
c = material_phaseMemberAt(g,i,e) c = material_phaseMemberAt(g,i,e)
broken = constitutive_collectDotState(crystallite_partitionedFp0, & broken = mech_collectDotState(crystallite_partitionedFp0, &
crystallite_subdt(g,i,e), g,i,e,p,c) crystallite_subdt(g,i,e), g,i,e,p,c)
if(broken) return if(broken) return
@ -1081,7 +1081,7 @@ module subroutine integrateStateAdaptiveEuler(g,i,e)
p = material_phaseAt(g,e) p = material_phaseAt(g,e)
c = material_phaseMemberAt(g,i,e) c = material_phaseMemberAt(g,i,e)
broken = constitutive_collectDotState(crystallite_partitionedFp0, & broken = mech_collectDotState(crystallite_partitionedFp0, &
crystallite_subdt(g,i,e), g,i,e,p,c) crystallite_subdt(g,i,e), g,i,e,p,c)
if(broken) return if(broken) return
@ -1098,7 +1098,7 @@ module subroutine integrateStateAdaptiveEuler(g,i,e)
broken = integrateStress(g,i,e) broken = integrateStress(g,i,e)
if(broken) return if(broken) return
broken = constitutive_collectDotState(crystallite_partitionedFp0, & broken = mech_collectDotState(crystallite_partitionedFp0, &
crystallite_subdt(g,i,e), g,i,e,p,c) crystallite_subdt(g,i,e), g,i,e,p,c)
if(broken) return if(broken) return
@ -1193,7 +1193,7 @@ subroutine integrateStateRK(g,i,e,A,B,CC,DB)
p = material_phaseAt(g,e) p = material_phaseAt(g,e)
c = material_phaseMemberAt(g,i,e) c = material_phaseMemberAt(g,i,e)
broken = constitutive_collectDotState(crystallite_partitionedFp0, & broken = mech_collectDotState(crystallite_partitionedFp0, &
crystallite_subdt(g,i,e), g,i,e,p,c) crystallite_subdt(g,i,e), g,i,e,p,c)
if(broken) return if(broken) return
@ -1216,7 +1216,7 @@ subroutine integrateStateRK(g,i,e,A,B,CC,DB)
broken = integrateStress(g,i,e,CC(stage)) broken = integrateStress(g,i,e,CC(stage))
if(broken) exit if(broken) exit
broken = constitutive_collectDotState(crystallite_partitionedFp0, & broken = mech_collectDotState(crystallite_partitionedFp0, &
crystallite_subdt(g,i,e)*CC(stage), g,i,e,p,c) crystallite_subdt(g,i,e)*CC(stage), g,i,e,p,c)
if(broken) exit if(broken) exit