From 0d2ff12894af6179e573ec5acf5f682f53a993c5 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 29 Dec 2023 23:17:24 +0100 Subject: [PATCH] compatibility is a dependent state of nonlocal --- src/phase.f90 | 9 --------- src/phase_mechanical_plastic.f90 | 6 ++++++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/phase.f90 b/src/phase.f90 index 23dc2f460..39a8679be 100644 --- a/src/phase.f90 +++ b/src/phase.f90 @@ -326,11 +326,6 @@ module phase real(pREAL) :: f end function phase_f_T - module subroutine plastic_nonlocal_updateCompatibility(orientation,ph,en) - integer, intent(in) :: ph, en - 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 @@ module phase 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(ph)%nonlocal) call plastic_nonlocal_updateCompatibility(phase_O,ph,en) - - end subroutine crystallite_orientations diff --git a/src/phase_mechanical_plastic.f90 b/src/phase_mechanical_plastic.f90 index 5d1a462e7..2d0324742 100644 --- a/src/phase_mechanical_plastic.f90 +++ b/src/phase_mechanical_plastic.f90 @@ -204,6 +204,11 @@ submodule(phase:mechanical) plastic 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