From 8f6dc054d0895ec603e4840d70f22592d79beb37 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 24 Mar 2020 22:25:40 +0100 Subject: [PATCH] move up the nonlocal skip --- src/crystallite.f90 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/crystallite.f90 b/src/crystallite.f90 index 77fd00fe7..01ef8bd27 100644 --- a/src/crystallite.f90 +++ b/src/crystallite.f90 @@ -1524,7 +1524,6 @@ subroutine integrateStateRKCK45 !$OMP END PARALLEL DO - if(nonlocalBroken) where(.not. crystallite_localPlasticity) crystallite_todo = .false. !-------------------------------------------------------------------------------------------------- ! --- STATE UPDATE WITH ERROR ESTIMATE FOR STATE --- @@ -1533,7 +1532,9 @@ subroutine integrateStateRKCK45 do e = FEsolving_execElem(1),FEsolving_execElem(2) do i = FEsolving_execIP(1),FEsolving_execIP(2) do g = 1,homogenization_Ngrains(material_homogenizationAt(e)) - if (crystallite_todo(g,i,e)) then + + if(crystallite_todo(g,i,e) .and. (.not. nonlocalBroken .or. crystallite_localPlasticity(g,i,e)) ) then + p = material_phaseAt(g,e); c = material_phaseMemberAt(g,i,e) sizeDotState = plasticState(p)%sizeDotState @@ -1564,6 +1565,8 @@ subroutine integrateStateRKCK45 enddo; enddo; enddo !$OMP END PARALLEL DO + if(nonlocalBroken) where(.not. crystallite_localPlasticity) crystallite_todo = .false. + call update_state(1.0_pReal) ! --- relative residui and state convergence ---