From c49ba5419b4ccc3af23966b786c1bab661cb6fe3 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 21 Jun 2021 23:26:17 +0200 Subject: [PATCH] sign-transfer done right --- src/phase_mechanical_plastic_isotropic.f90 | 3 +-- src/phase_mechanical_plastic_phenopowerlaw.f90 | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/phase_mechanical_plastic_isotropic.f90 b/src/phase_mechanical_plastic_isotropic.f90 index a5bca56ab..aee9bc95d 100644 --- a/src/phase_mechanical_plastic_isotropic.f90 +++ b/src/phase_mechanical_plastic_isotropic.f90 @@ -282,8 +282,7 @@ module subroutine isotropic_dotState(Mp,ph,en) endif dot%xi(en) = dot_gamma & * ( prm%h_0 + prm%h_ln * log(dot_gamma) ) & - * abs( 1.0_pReal - stt%xi(en)/xi_inf_star )**prm%a *prm%h & - * sign(1.0_pReal, 1.0_pReal - stt%xi(en)/xi_inf_star) + * sign(abs(1.0_pReal - stt%xi(en)/xi_inf_star)**prm%a *prm%h, 1.0_pReal-stt%xi(en)/xi_inf_star) else dot%xi(en) = 0.0_pReal endif diff --git a/src/phase_mechanical_plastic_phenopowerlaw.f90 b/src/phase_mechanical_plastic_phenopowerlaw.f90 index 978a2cf1d..af6734add 100644 --- a/src/phase_mechanical_plastic_phenopowerlaw.f90 +++ b/src/phase_mechanical_plastic_phenopowerlaw.f90 @@ -364,8 +364,8 @@ module subroutine phenopowerlaw_dotState(Mp,ph,en) ! calculate left and right vectors left_SlipSlip = 1.0_pReal + prm%h_int xi_slip_sat_offset = prm%f_sat_sl_tw*sqrt(sumF) - right_SlipSlip = abs(1.0_pReal-stt%xi_slip(:,en) / (prm%xi_inf_sl+xi_slip_sat_offset)) **prm%a_sl & - * sign(1.0_pReal,1.0_pReal-stt%xi_slip(:,en) / (prm%xi_inf_sl+xi_slip_sat_offset)) + right_SlipSlip = sign(abs(1.0_pReal-stt%xi_slip(:,en) / (prm%xi_inf_sl+xi_slip_sat_offset)) **prm%a_sl, & + 1.0_pReal-stt%xi_slip(:,en) / (prm%xi_inf_sl+xi_slip_sat_offset)) !-------------------------------------------------------------------------------------------------- ! shear rates