From 44e24a9c4f3eec300b1cb6724e54874b8cfd54de Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Tue, 24 Mar 2020 20:25:29 +0100
Subject: [PATCH] merging into one loop

---
 src/crystallite.f90 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/crystallite.f90 b/src/crystallite.f90
index 12994589b..09c782deb 100644
--- a/src/crystallite.f90
+++ b/src/crystallite.f90
@@ -1496,13 +1496,20 @@ subroutine integrateStateRKCK45
            nonlocalBroken = .true.
          if(.not. crystallite_todo(g,i,e)) cycle
 
+         call constitutive_dependentState(crystallite_Fe(1:3,1:3,g,i,e), &
+                                          crystallite_Fp(1:3,1:3,g,i,e), &
+                                          g, i, e)
+
+         crystallite_todo(g,i,e) = integrateStress(g,i,e,CC(stage))
+         if(.not. (crystallite_todo(g,i,e) .or. crystallite_localPlasticity(g,i,e))) &
+           nonlocalBroken = .true.
+         if(.not. crystallite_todo(g,i,e)) cycle
+
        endif
    enddo; enddo; enddo
    !$OMP END PARALLEL DO
 
   if(nonlocalBroken) where(.not. crystallite_localPlasticity) crystallite_todo = .false.
-    call update_dependentState
-    call update_stress(CC(stage))
     call update_dotState(CC(stage))
 
  enddo