From eb394b3139368253ad77f8bebd21ef2f06309a7a Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 20 Feb 2019 14:54:26 +0100 Subject: [PATCH] same name in all models --- src/constitutive.f90 | 2 +- src/plastic_nonlocal.f90 | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/constitutive.f90 b/src/constitutive.f90 index d49fcec6e..7e6cdee7a 100644 --- a/src/constitutive.f90 +++ b/src/constitutive.f90 @@ -358,7 +358,7 @@ subroutine constitutive_microstructure(orientations, Fe, Fp, ipc, ip, el) PLASTICITY_disloucla_ID, & PLASTICITY_nonlocal_ID use plastic_nonlocal, only: & - plastic_nonlocal_microstructure + plastic_nonlocal_dependentState use plastic_dislotwin, only: & plastic_dislotwin_dependentState use plastic_disloUCLA, only: & diff --git a/src/plastic_nonlocal.f90 b/src/plastic_nonlocal.f90 index 477bfee04..8652baf88 100644 --- a/src/plastic_nonlocal.f90 +++ b/src/plastic_nonlocal.f90 @@ -238,7 +238,7 @@ module plastic_nonlocal plastic_nonlocal_init, & plastic_nonlocal_stateInit, & plastic_nonlocal_aTolState, & - plastic_nonlocal_microstructure, & + plastic_nonlocal_dependentState, & plastic_nonlocal_LpAndItsTangent, & plastic_nonlocal_dotState, & plastic_nonlocal_deltaState, & @@ -1126,7 +1126,7 @@ end subroutine plastic_nonlocal_aTolState !-------------------------------------------------------------------------------------------------- !> @brief calculates quantities characterizing the microstructure !-------------------------------------------------------------------------------------------------- -subroutine plastic_nonlocal_microstructure(Fe, Fp, ip, el) +subroutine plastic_nonlocal_dependentState(Fe, Fp, ip, el) use prec, only: & dEq0 use IO, only: & @@ -1284,6 +1284,13 @@ forall (s = 1_pInt:ns) & tauBack = 0.0_pReal + !################################################################################################# + !################################################################################################# + ! ToDo: MD: this is most likely only correct for F_i = I + !################################################################################################# + !################################################################################################# + + if (.not. phase_localPlasticity(ph) .and. prm%shortRangeStressCorrection) then invFe = math_inv33(Fe) invFp = math_inv33(Fp) @@ -1406,7 +1413,7 @@ plasticState(ph)%state(iTauB(1:ns,instance),of) = tauBack endif #endif end associate -end subroutine plastic_nonlocal_microstructure +end subroutine plastic_nonlocal_dependentState !--------------------------------------------------------------------------------------------------