Merge branch 'nonlocal-compatibility-in-dependent-state' into 'develo…

…pment'

Nonlocal compatibility in dependent state

See merge request damask/DAMASK!891

src/phase.f90

@@ -326,11 +326,6 @@ module function phase_f_T(ph,en) result(f)
       real(pREAL) :: f
     end function phase_f_T
 
-    module subroutine plastic_nonlocal_updateCompatibility(orientation,ce)
-      integer, intent(in) :: ce
-        type(tRotationContainer), dimension(:), intent(in) :: orientation
-    end subroutine plastic_nonlocal_updateCompatibility
-
     module subroutine plastic_dependentState(ph,en)
       integer, intent(in) :: &
         ph, &
@@ -363,7 +358,6 @@ end subroutine damage_anisobrittle_LiAndItsTangent
     phase_allocateState, &
     phase_forward, &
     phase_restore, &
-    plastic_nonlocal_updateCompatibility, &
     converged, &
     phase_mechanical_constitutive, &
     phase_thermal_constitutive, &
@@ -576,9 +570,6 @@ subroutine crystallite_orientations(co,ce)
 
   call phase_O(ph)%data(en)%fromMatrix(transpose(math_rotationalPart(mechanical_F_e(ph,en))))
 
-  if (plasticState(material_ID_phase(1,ce))%nonlocal) call plastic_nonlocal_updateCompatibility(phase_O,ce)
-
-
 end subroutine crystallite_orientations
 
 

src/phase_mechanical_plastic.f90

@@ -204,6 +204,11 @@ module subroutine plastic_nonlocal_deltaState(Mp,ph,en)
         en
     end subroutine plastic_nonlocal_deltaState
 
+    module subroutine plastic_nonlocal_updateCompatibility(orientation,ph,en)
+      integer, intent(in) :: ph, en
+        type(tRotationContainer), dimension(:), intent(in) :: orientation
+    end subroutine plastic_nonlocal_updateCompatibility
+
   end interface
 
 contains
@@ -359,6 +364,7 @@ module subroutine plastic_dependentState(ph,en)
 
     case (MECHANICAL_PLASTICITY_NONLOCAL) plasticType
       call nonlocal_dependentState(ph,en)
+      if (plasticState(ph)%nonlocal) call plastic_nonlocal_updateCompatibility(phase_O,ph,en)
 
   end select plasticType