From 26014aec1f50c88c486a4b90ef051e718f2d74f4 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 18 Jul 2023 04:51:16 +0200 Subject: [PATCH] 'true' kinematics first --- src/phase_mechanical_eigen.f90 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/phase_mechanical_eigen.f90 b/src/phase_mechanical_eigen.f90 index 7b965bf23..dc2d3d598 100644 --- a/src/phase_mechanical_eigen.f90 +++ b/src/phase_mechanical_eigen.f90 @@ -173,14 +173,6 @@ module subroutine phase_LiAndItsTangents(Li, dLi_dS, dLi_dFi, & dLi_dFi = 0.0_pREAL - plasticType: select case (phase_plasticity(ph)) - case (PLASTIC_isotropic_ID) plasticType - call plastic_isotropic_LiAndItsTangent(my_Li, my_dLi_dS, S ,ph,en) - Li = Li + my_Li - dLi_dS = dLi_dS + my_dLi_dS - active = .true. - end select plasticType - KinematicsLoop: do k = 1, Nmodels(ph) kinematicsType: select case (model(k,ph)) case (EIGEN_thermal_expansion_ID) kinematicsType @@ -191,6 +183,14 @@ module subroutine phase_LiAndItsTangents(Li, dLi_dS, dLi_dFi, & end select kinematicsType end do KinematicsLoop + plasticType: select case (phase_plasticity(ph)) + case (PLASTIC_isotropic_ID) plasticType + call plastic_isotropic_LiAndItsTangent(my_Li, my_dLi_dS, S ,ph,en) + Li = Li + my_Li + dLi_dS = dLi_dS + my_dLi_dS + active = .true. + end select plasticType + damageType: select case (model_damage(ph)) case (EIGEN_cleavage_opening_ID) call damage_anisobrittle_LiAndItsTangent(my_Li, my_dLi_dS, S, ph, en)