From f2a359bea144d544e592315c6a464e11c2ab445e Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 28 Jun 2021 23:28:41 +0200 Subject: [PATCH] relaxing tolerances allowed for simplified cases (no temperature dependency/friction) --- PRIVATE | 2 +- src/phase_mechanical_plastic_nonlocal.f90 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PRIVATE b/PRIVATE index 122022609..dec54aa09 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 122022609581777fdb323fc4b1b97d593f22bd58 +Subproject commit dec54aa095f3c0bd50b4f9ed3025694ffec8233a diff --git a/src/phase_mechanical_plastic_nonlocal.f90 b/src/phase_mechanical_plastic_nonlocal.f90 index 9220ea49b..fbb092d0e 100644 --- a/src/phase_mechanical_plastic_nonlocal.f90 +++ b/src/phase_mechanical_plastic_nonlocal.f90 @@ -323,7 +323,7 @@ module function plastic_nonlocal_init() result(myPlasticity) prm%D_0 = pl%get_asFloat('D_0') prm%Q_cl = pl%get_asFloat('Q_cl') prm%f_F = pl%get_asFloat('f_F') - prm%f_ed = pl%get_asFloat('f_ed') !,'edgejogs' + prm%f_ed = pl%get_asFloat('f_ed') prm%w = pl%get_asFloat('w') prm%Q_sol = pl%get_asFloat('Q_sol') prm%f_sol = pl%get_asFloat('f_sol') @@ -363,8 +363,8 @@ module function plastic_nonlocal_init() result(myPlasticity) if (any(prm%peierlsstress < 0.0_pReal)) extmsg = trim(extmsg)//' tau_peierls' if (any(prm%minDipoleHeight < 0.0_pReal)) extmsg = trim(extmsg)//' d_ed or d_sc' - if (prm%B <= 0.0_pReal) extmsg = trim(extmsg)//' B' - if (prm%Q_cl <= 0.0_pReal) extmsg = trim(extmsg)//' Q_cl' + if (prm%B < 0.0_pReal) extmsg = trim(extmsg)//' B' + if (prm%Q_cl < 0.0_pReal) extmsg = trim(extmsg)//' Q_cl' if (prm%nu_a <= 0.0_pReal) extmsg = trim(extmsg)//' nu_a' if (prm%w <= 0.0_pReal) extmsg = trim(extmsg)//' w' if (prm%D_0 < 0.0_pReal) extmsg = trim(extmsg)//' D_0'