From 570c0421000461cb193f3032c31f86a01d78a7f5 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Wed, 1 Apr 2020 07:18:37 +0200
Subject: [PATCH] update of dependent state always in conjunction with state
 integration

---
 src/crystallite.f90 | 35 +++--------------------------------
 1 file changed, 3 insertions(+), 32 deletions(-)

diff --git a/src/crystallite.f90 b/src/crystallite.f90
index fb12c439b..d657b5b55 100644
--- a/src/crystallite.f90
+++ b/src/crystallite.f90
@@ -849,6 +849,9 @@ logical function integrateStress(ipc,ip,el,timeFraction)
     F  = crystallite_subF(1:3,1:3,ipc,ip,el)
   endif
 
+  call constitutive_dependentState(crystallite_partionedF(1:3,1:3,ipc,ip,el), &
+                                   crystallite_Fp(1:3,1:3,ipc,ip,el),ipc,ip,el)
+
   Lpguess = crystallite_Lp(1:3,1:3,ipc,ip,el)                                                       ! take as first guess
   Liguess = crystallite_Li(1:3,1:3,ipc,ip,el)                                                       ! take as first guess
 
@@ -1060,10 +1063,6 @@ subroutine integrateStateFPI
               source_dotState(1:sizeDotState,1,s) = sourceState(p)%p(s)%dotState(:,c)
             enddo
 
-            call constitutive_dependentState(crystallite_partionedF(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)
             if(.not. crystallite_todo(g,i,e)) exit iteration
 
@@ -1202,10 +1201,6 @@ subroutine integrateStateEuler
             nonlocalBroken = .true.
           if(.not. crystallite_todo(g,i,e)) cycle
 
-          call constitutive_dependentState(crystallite_partionedF(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)
           if(.not. (crystallite_todo(g,i,e) .or. crystallite_localPlasticity(g,i,e))) &
             nonlocalBroken = .true.
@@ -1281,10 +1276,6 @@ subroutine integrateStateAdaptiveEuler
             nonlocalBroken = .true.
           if(.not. crystallite_todo(g,i,e)) cycle
 
-          call constitutive_dependentState(crystallite_partionedF(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)
           if(.not. (crystallite_todo(g,i,e) .or. crystallite_localPlasticity(g,i,e))) &
             nonlocalBroken = .true.
@@ -1415,10 +1406,6 @@ subroutine integrateStateRK4
                                                             * crystallite_subdt(g,i,e)
             enddo
 
-            call constitutive_dependentState(crystallite_partionedF(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.
@@ -1466,14 +1453,6 @@ subroutine integrateStateRK4
             nonlocalBroken = .true.
           if(.not. crystallite_todo(g,i,e)) cycle
 
-          call constitutive_dependentState(crystallite_partionedF(1:3,1:3,g,i,e), &
-                                           crystallite_Fp(1:3,1:3,g,i,e), &
-                                           g, i, e)
-
-          if(.not. (crystallite_todo(g,i,e) .or. crystallite_localPlasticity(g,i,e))) &
-            nonlocalBroken = .true.
-          if(.not. crystallite_todo(g,i,e)) cycle
-
           crystallite_todo(g,i,e) = integrateStress(g,i,e)
           if(.not. (crystallite_todo(g,i,e) .or. crystallite_localPlasticity(g,i,e))) &
             nonlocalBroken = .true.
@@ -1583,10 +1562,6 @@ subroutine integrateStateRKCK45
                                                             * crystallite_subdt(g,i,e)
             enddo
 
-            call constitutive_dependentState(crystallite_partionedF(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.
@@ -1644,10 +1619,6 @@ subroutine integrateStateRKCK45
             nonlocalBroken = .true.
           if(.not. crystallite_todo(g,i,e)) cycle
 
-          call constitutive_dependentState(crystallite_partionedF(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)
           if(.not. (crystallite_todo(g,i,e) .or. crystallite_localPlasticity(g,i,e))) &
             nonlocalBroken = .true.