From cd9fb1c5446d85d2086072a61e9e1f771a487a2f Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 1 Jun 2018 21:23:25 +0200 Subject: [PATCH] adjusting variable names in isotropic to DAMASK paper --- PRIVATE | 2 +- src/plastic_isotropic.f90 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PRIVATE b/PRIVATE index cd02f6c1a..076a65960 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit cd02f6c1a481491eb4517651516b8311348b4777 +Subproject commit 076a65960f8df7ab52b4fe67249f0824e003d7eb diff --git a/src/plastic_isotropic.f90 b/src/plastic_isotropic.f90 index 31312d936..eb3120562 100644 --- a/src/plastic_isotropic.f90 +++ b/src/plastic_isotropic.f90 @@ -149,7 +149,7 @@ use IO p%gdot0 = phaseConfig(phase)%getFloat('gdot0') p%n = phaseConfig(phase)%getFloat('n') p%h0 = phaseConfig(phase)%getFloat('h0') - p%fTaylor = phaseConfig(phase)%getFloat('taylorfactor') + p%fTaylor = phaseConfig(phase)%getFloat('m') p%h0_slopeLnRate = phaseConfig(phase)%getFloat('h0_slopelnrate', defaultVal=0.0_pReal) ! ToDo: alias allowed? p%tausat_SinhFitA = phaseConfig(phase)%getFloat('tausat_sinhfita',defaultVal=0.0_pReal) p%tausat_SinhFitB = phaseConfig(phase)%getFloat('tausat_sinhfitb',defaultVal=0.0_pReal) @@ -190,7 +190,7 @@ use IO if (p%n <= 0.0_pReal) extmsg = trim(extmsg)//"'n' " if (p%tausat <= p%tau0) extmsg = trim(extmsg)//"'tausat' " if (p%a <= 0.0_pReal) extmsg = trim(extmsg)//"'a' " - if (p%fTaylor <= 0.0_pReal) extmsg = trim(extmsg)//"'taylorfactor' " + if (p%fTaylor <= 0.0_pReal) extmsg = trim(extmsg)//"'m' " if (p%aTolFlowstress <= 0.0_pReal) extmsg = trim(extmsg)//"'atol_flowstress' " if (extmsg /= '') call IO_error(211_pInt,ip=instance,& ext_msg=trim(extmsg)//'('//PLASTICITY_ISOTROPIC_label//')')