From b46a5b3135883e18e241d8a16da3a29bd866190e Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 22 Dec 2018 14:47:02 +0100 Subject: [PATCH] save space --- src/plastic_kinematichardening.f90 | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/plastic_kinematichardening.f90 b/src/plastic_kinematichardening.f90 index 2a9245140..8188c1480 100644 --- a/src/plastic_kinematichardening.f90 +++ b/src/plastic_kinematichardening.f90 @@ -440,6 +440,8 @@ subroutine plastic_kinehardening_deltaState(Mp,instance,of) gdot_pos,gdot_neg, & sense + associate( prm => paramNew(instance), stt => state(instance), del => deltaState(instance)) + call plastic_kinehardening_shearRates(Mp,instance,of,gdot_pos,gdot_neg) sense = merge(state(instance)%sense(:,of), & ! keep existing... sign(1.0_pReal,gdot_pos+gdot_neg), & ! ...or have a defined @@ -463,15 +465,17 @@ subroutine plastic_kinehardening_deltaState(Mp,instance,of) #endif !-------------------------------------------------------------------------------------------------- ! switch in sense of shear? - where(dNeq(sense,state(instance)%sense(:,of),0.1_pReal)) - deltaState(instance)%sense (:,of) = sense - state(instance)%sense(:,of) ! switch sense - deltaState(instance)%chi0 (:,of) = abs(state(instance)%crss_back(:,of)) - state(instance)%chi0(:,of) ! remember current backstress magnitude - deltaState(instance)%gamma0(:,of) = state(instance)%accshear(:,of) - state(instance)%gamma0(:,of) ! remember current accumulated shear + where(dNeq(sense,stt%sense(:,of),0.1_pReal)) + del%sense (:,of) = sense - stt%sense(:,of) ! switch sense + del%chi0 (:,of) = abs(stt%crss_back(:,of)) - stt%chi0(:,of) ! remember current backstress magnitude + del%gamma0(:,of) = stt%accshear(:,of) - stt%gamma0(:,of) ! remember current accumulated shear else where - deltaState(instance)%sense (:,of) = 0.0_pReal ! no change - deltaState(instance)%chi0 (:,of) = 0.0_pReal - deltaState(instance)%gamma0(:,of) = 0.0_pReal + del%sense (:,of) = 0.0_pReal + del%chi0 (:,of) = 0.0_pReal + del%gamma0(:,of) = 0.0_pReal end where + + end associate end subroutine plastic_kinehardening_deltaState