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

avoid loops

This commit is contained in:
Martin Diehl 2019-01-30 10:46:53 +01:00
parent 72c4f2b25f
commit 0876787e3c
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/crystallite.f90
View File

@ -1976,10 +1976,8 @@ subroutine integrateStateRKCK45()
phaseAt, phasememberAt, & phaseAt, phasememberAt, &
homogenization_maxNgrains homogenization_maxNgrains
use constitutive, only: & use constitutive, only: &
constitutive_collectDotState, &
constitutive_plasticity_maxSizeDotState, & constitutive_plasticity_maxSizeDotState, &
constitutive_source_maxSizeDotState, & constitutive_source_maxSizeDotState
constitutive_microstructure
implicit none implicit none
real(pReal), dimension(5,5), parameter :: & real(pReal), dimension(5,5), parameter :: &
@ -2134,17 +2132,17 @@ subroutine integrateStateRKCK45()
relPlasticStateResiduum(u,g,i,e) = & relPlasticStateResiduum(u,g,i,e) = &
plasticStateResiduum(u,g,i,e) / plasticState(p)%state(u,cc) plasticStateResiduum(u,g,i,e) / plasticState(p)%state(u,cc)
crystallite_todo(g,i,e) = all(abs(relPlasticStateResiduum(1:mySizePlasticDotState,g,i,e)) < &
rTol_crystalliteState .or. &
abs(plasticStateResiduum(1:mySizePlasticDotState,g,i,e)) < &
plasticState(p)%aTolState(1:mySizePlasticDotState))
do s = 1_pInt, phase_Nsources(p) do s = 1_pInt, phase_Nsources(p)
mySizeSourceDotState = sourceState(p)%p(s)%sizeDotState mySizeSourceDotState = sourceState(p)%p(s)%sizeDotState
forall (u = 1_pInt:mySizeSourceDotState,abs(sourceState(p)%p(s)%state(u,cc)) > 0.0_pReal) & forall (u = 1_pInt:mySizeSourceDotState,abs(sourceState(p)%p(s)%state(u,cc)) > 0.0_pReal) &
relSourceStateResiduum(u,s,g,i,e) = & relSourceStateResiduum(u,s,g,i,e) = &
sourceStateResiduum(u,s,g,i,e) / sourceState(p)%p(s)%state(u,cc) sourceStateResiduum(u,s,g,i,e) / sourceState(p)%p(s)%state(u,cc)
enddo
crystallite_todo(g,i,e) = all(abs(relPlasticStateResiduum(1:mySizePlasticDotState,g,i,e)) < &
rTol_crystalliteState .or. &
abs(plasticStateResiduum(1:mySizePlasticDotState,g,i,e)) < &
plasticState(p)%aTolState(1:mySizePlasticDotState))
do s = 1_pInt, phase_Nsources(p)
mySizeSourceDotState = sourceState(p)%p(s)%sizeDotState mySizeSourceDotState = sourceState(p)%p(s)%sizeDotState
crystallite_todo(g,i,e) = crystallite_todo(g,i,e) .and. & crystallite_todo(g,i,e) = crystallite_todo(g,i,e) .and. &
all(abs(relSourceStateResiduum(1:mySizeSourceDotState,s,g,i,e)) < & all(abs(relSourceStateResiduum(1:mySizeSourceDotState,s,g,i,e)) < &