From 950710196960c4b4cdea646016056b0534b70132 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Tue, 31 Mar 2020 08:33:35 +0200
Subject: [PATCH] can be done in one loop

---
 src/crystallite.f90 | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/crystallite.f90 b/src/crystallite.f90
index aef969d2e..1bce5528b 100644
--- a/src/crystallite.f90
+++ b/src/crystallite.f90
@@ -1021,10 +1021,6 @@ subroutine integrateStateFPI
   logical :: &
     nonlocalBroken
 
-  ! --+>> PREGUESS FOR STATE <<+--
-  call update_dotState(1.0_pReal)
-  call update_state(1.0_pReal)
-
   nonlocalBroken = .false.
   !$OMP PARALLEL DO PRIVATE(sizeDotState,residuum_plastic,residuum_source,zeta,p,c)
   do e = FEsolving_execElem(1),FEsolving_execElem(2)
@@ -1034,6 +1030,30 @@ subroutine integrateStateFPI
 
           p = material_phaseAt(g,e); c = material_phaseMemberAt(g,i,e)
 
+          call constitutive_collectDotState(crystallite_S(1:3,1:3,g,i,e), &
+                                            crystallite_partionedF0, &
+                                            crystallite_Fi(1:3,1:3,g,i,e), &
+                                            crystallite_partionedFp0, &
+                                            crystallite_subdt(g,i,e), g,i,e)
+          crystallite_todo(g,i,e) = all(.not. IEEE_is_NaN(plasticState(p)%dotState(:,c)))
+          do s = 1, phase_Nsources(p)
+            crystallite_todo(g,i,e) = crystallite_todo(g,i,e) .and. all(.not. IEEE_is_NaN(sourceState(p)%p(s)%dotState(:,c)))
+          enddo
+          if(.not. (crystallite_todo(g,i,e) .or. crystallite_localPlasticity(g,i,e))) &
+            nonlocalBroken = .true.
+          if(.not. crystallite_todo(g,i,e)) cycle
+
+          sizeDotState = plasticState(p)%sizeDotState
+          plasticState(p)%state(1:sizeDotState,c) = plasticState(p)%subState0(1:sizeDotState,c) &
+                                                  + plasticState(p)%dotState (1:sizeDotState,c) &
+                                                    * crystallite_subdt(g,i,e)
+          do s = 1, phase_Nsources(p)
+            sizeDotState = sourceState(p)%p(s)%sizeDotState
+            sourceState(p)%p(s)%state(1:sizeDotState,c) = sourceState(p)%p(s)%subState0(1:sizeDotState,c) &
+                                                        + sourceState(p)%p(s)%dotState (1:sizeDotState,c) &
+                                                          * crystallite_subdt(g,i,e)
+          enddo
+
           iteration: do NiterationState = 1, num%nState
 
             plasticState(p)%previousDotState2(:,c) = merge(plasticState(p)%previousDotState(:,c),&