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

run in one loop

This commit is contained in:
Martin Diehl 2020-03-23 00:32:41 +01:00
parent 0b321bd9d4
commit 027818c942
1 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/crystallite.f90
View File

@ -1019,7 +1019,8 @@ subroutine integrateStateFPI
real(pReal), dimension(constitutive_source_maxSizeDotState) :: & real(pReal), dimension(constitutive_source_maxSizeDotState) :: &
residuum_source ! residuum for source state residuum_source ! residuum for source state
logical :: & logical :: &
doneWithIntegration doneWithIntegration, &
nonlocal_broken
! --+>> PREGUESS FOR STATE <<+-- ! --+>> PREGUESS FOR STATE <<+--
call update_dotState(1.0_pReal) call update_dotState(1.0_pReal)
@ -1027,6 +1028,7 @@ subroutine integrateStateFPI
NiterationState = 0 NiterationState = 0
doneWithIntegration = .false. doneWithIntegration = .false.
nonlocal_broken = .false.
crystalliteLooping: do while (.not. doneWithIntegration .and. NiterationState < num%nState) crystalliteLooping: do while (.not. doneWithIntegration .and. NiterationState < num%nState)
NiterationState = NiterationState + 1 NiterationState = NiterationState + 1
@ -1037,33 +1039,39 @@ subroutine integrateStateFPI
! store previousDotState and previousDotState2 ! store previousDotState and previousDotState2
!$OMP PARALLEL DO PRIVATE(p,c) !$OMP PARALLEL DO PRIVATE(p,c)
do e = FEsolving_execElem(1),FEsolving_execElem(2) do e = FEsolving_execElem(1),FEsolving_execElem(2)
do i = FEsolving_execIP(1),FEsolving_execIP(2) do i = FEsolving_execIP(1),FEsolving_execIP(2)
do g = 1,homogenization_Ngrains(material_homogenizationAt(e)) do g = 1,homogenization_Ngrains(material_homogenizationAt(e))
if (crystallite_todo(g,i,e) .and. .not. crystallite_converged(g,i,e)) then if(crystallite_todo(g,i,e) .and. .not. crystallite_converged(g,i,e) .and. &
p = material_phaseAt(g,e); c = material_phaseMemberAt(g,i,e) (.not. nonlocal_broken .or. crystallite_localPlasticity(g,i,e)) ) then
p = material_phaseAt(g,e); c = material_phaseMemberAt(g,i,e)
plasticState(p)%previousDotState2(:,c) = merge(plasticState(p)%previousDotState(:,c),& plasticState(p)%previousDotState2(:,c) = merge(plasticState(p)%previousDotState(:,c),&
0.0_pReal,& 0.0_pReal,&
NiterationState > 1) NiterationState > 1)
plasticState(p)%previousDotState (:,c) = plasticState(p)%dotState(:,c) plasticState(p)%previousDotState (:,c) = plasticState(p)%dotState(:,c)
do s = 1, phase_Nsources(p) do s = 1, phase_Nsources(p)
sourceState(p)%p(s)%previousDotState2(:,c) = merge(sourceState(p)%p(s)%previousDotState(:,c),& sourceState(p)%p(s)%previousDotState2(:,c) = merge(sourceState(p)%p(s)%previousDotState(:,c),&
0.0_pReal, & 0.0_pReal, &
NiterationState > 1) NiterationState > 1)
sourceState(p)%p(s)%previousDotState (:,c) = sourceState(p)%p(s)%dotState(:,c) sourceState(p)%p(s)%previousDotState (:,c) = sourceState(p)%p(s)%dotState(:,c)
enddo enddo
call constitutive_dependentState(crystallite_Fe(1:3,1:3,g,i,e), & call constitutive_dependentState(crystallite_Fe(1:3,1:3,g,i,e), &
crystallite_Fp(1:3,1:3,g,i,e), & crystallite_Fp(1:3,1:3,g,i,e), &
g, i, e) g, i, e)
endif crystallite_todo(g,i,e) = integrateStress(g,i,e,1.0_pReal)
enddo if(.not. (crystallite_todo(g,i,e) .or. crystallite_localPlasticity(g,i,e))) &
enddo nonlocal_broken = .true.
enddo endif
!$OMP END PARALLEL DO enddo
enddo
enddo
!$OMP END PARALLEL DO
if(nonlocal_broken) &
where(.not. crystallite_localPlasticity) crystallite_todo = .false.
call update_stress(1.0_pReal)
call update_dotState(1.0_pReal) call update_dotState(1.0_pReal)
!$OMP PARALLEL !$OMP PARALLEL