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

consistent variable names

This commit is contained in:
Martin Diehl 2019-01-29 23:04:50 +01:00
parent 1408d66c0c
commit eade54a68f
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/crystallite.f90
View File

@ -1784,7 +1784,7 @@ subroutine integrateStateAdaptiveEuler()
u, & ! state index u, & ! state index
p, & p, &
c, & c, &
mySource, & s, &
sizeDotState sizeDotState
real(pReal), dimension(constitutive_plasticity_maxSizeDotState, & real(pReal), dimension(constitutive_plasticity_maxSizeDotState, &
homogenization_maxNgrains,mesh_maxNips,mesh_NcpElems) :: & homogenization_maxNgrains,mesh_maxNips,mesh_NcpElems) :: &
@ -1825,15 +1825,15 @@ real(pReal), dimension(constitutive_plasticity_maxSizeDotState, &
plasticState(p)%state (1:sizeDotState,c) & plasticState(p)%state (1:sizeDotState,c) &
+ plasticState(p)%dotstate(1:sizeDotState,c) & + plasticState(p)%dotstate(1:sizeDotState,c) &
* crystallite_subdt(g,i,e) * crystallite_subdt(g,i,e)
do mySource = 1_pInt, phase_Nsources(p) do s = 1_pInt, phase_Nsources(p)
sizeDotState = sourceState(p)%p(mySource)%sizeDotState sizeDotState = sourceState(p)%p(s)%sizeDotState
sourceStateResiduum(1:sizeDotState,mySource,g,i,e) = & sourceStateResiduum(1:sizeDotState,s,g,i,e) = &
- 0.5_pReal & - 0.5_pReal &
* sourceState(p)%p(mySource)%dotstate(1:sizeDotState,c) & * sourceState(p)%p(s)%dotstate(1:sizeDotState,c) &
* crystallite_subdt(g,i,e) ! contribution to absolute residuum in state * crystallite_subdt(g,i,e) ! contribution to absolute residuum in state
sourceState(p)%p(mySource)%state (1:sizeDotState,c) = & sourceState(p)%p(s)%state (1:sizeDotState,c) = &
sourceState(p)%p(mySource)%state (1:sizeDotState,c) & sourceState(p)%p(s)%state (1:sizeDotState,c) &
+ sourceState(p)%p(mySource)%dotstate(1:sizeDotState,c) & + sourceState(p)%p(s)%dotstate(1:sizeDotState,c) &
* crystallite_subdt(g,i,e) * crystallite_subdt(g,i,e)
enddo enddo
endif endif
@ -1873,23 +1873,23 @@ real(pReal), dimension(constitutive_plasticity_maxSizeDotState, &
plasticStateResiduum(u,g,i,e) / plasticState(p)%dotState(u,c) plasticStateResiduum(u,g,i,e) / plasticState(p)%dotState(u,c)
do mySource = 1_pInt, phase_Nsources(p) do s = 1_pInt, phase_Nsources(p)
sizeDotState = sourceState(p)%p(mySource)%sizeDotState sizeDotState = sourceState(p)%p(s)%sizeDotState
sourceStateResiduum(1:sizeDotState,mySource,g,i,e) = & sourceStateResiduum(1:sizeDotState,s,g,i,e) = &
sourceStateResiduum(1:sizeDotState,mySource,g,i,e) & sourceStateResiduum(1:sizeDotState,s,g,i,e) &
+ 0.5_pReal * sourceState(p)%p(mySource)%dotState(:,c) & + 0.5_pReal * sourceState(p)%p(s)%dotState(:,c) &
* crystallite_subdt(g,i,e) ! contribution to absolute residuum in state * crystallite_subdt(g,i,e) ! contribution to absolute residuum in state
forall (u = 1_pInt:sizeDotState,abs(sourceState(p)%p(mySource)%dotState(u,c)) > 0.0_pReal) & forall (u = 1_pInt:sizeDotState,abs(sourceState(p)%p(s)%dotState(u,c)) > 0.0_pReal) &
relSourceStateResiduum(u,mySource,g,i,e) = & relSourceStateResiduum(u,s,g,i,e) = &
sourceStateResiduum(u,mySource,g,i,e) / sourceState(p)%p(mySource)%dotState(u,c) sourceStateResiduum(u,s,g,i,e) / sourceState(p)%p(s)%dotState(u,c)
sizeDotState = sourceState(p)%p(mySource)%sizeDotState sizeDotState = sourceState(p)%p(s)%sizeDotState
converged = converged .and. & converged = converged .and. &
all(abs(relSourceStateResiduum(1:sizeDotState,mySource,g,i,e)) < & all(abs(relSourceStateResiduum(1:sizeDotState,s,g,i,e)) < &
rTol_crystalliteState .or. & rTol_crystalliteState .or. &
abs(sourceStateResiduum(1:sizeDotState,mySource,g,i,e)) < & abs(sourceStateResiduum(1:sizeDotState,s,g,i,e)) < &
sourceState(p)%p(mySource)%aTolState(1:sizeDotState)) sourceState(p)%p(s)%aTolState(1:sizeDotState))
enddo enddo
if (converged) crystallite_converged(g,i,e) = .true. ! ... converged per definition if (converged) crystallite_converged(g,i,e) = .true. ! ... converged per definition
endif endif