From 5bf4553882d1bcf65fa791d738edeac395aa29d1 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 29 Mar 2021 07:25:55 +0200 Subject: [PATCH] following naming of interaction coefficients --- PRIVATE | 2 +- examples/config/Phase_Phenopowerlaw_Magnesium.yaml | 2 +- src/phase_mechanical_plastic_phenopowerlaw.f90 | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/PRIVATE b/PRIVATE index 62e2b5bed..4511a963d 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 62e2b5bed89723649d4cabebe5fc191d05a40321 +Subproject commit 4511a963da5094db309a6a68783f24a23c76da81 diff --git a/examples/config/Phase_Phenopowerlaw_Magnesium.yaml b/examples/config/Phase_Phenopowerlaw_Magnesium.yaml index 6540fb880..d42cca09f 100644 --- a/examples/config/Phase_Phenopowerlaw_Magnesium.yaml +++ b/examples/config/Phase_Phenopowerlaw_Magnesium.yaml @@ -25,4 +25,4 @@ Magnesium: dot_gamma_0_tw: 0.001 n_sl: 20 n_tw: 20 - f_sl_sat_tw: 10.0 + f_sat_sl_tw: 10.0 diff --git a/src/phase_mechanical_plastic_phenopowerlaw.f90 b/src/phase_mechanical_plastic_phenopowerlaw.f90 index dbe2101e6..6c40c9a8f 100644 --- a/src/phase_mechanical_plastic_phenopowerlaw.f90 +++ b/src/phase_mechanical_plastic_phenopowerlaw.f90 @@ -12,7 +12,7 @@ submodule(phase:plastic) phenopowerlaw dot_gamma_0_tw = 1.0_pReal, & !< reference shear strain rate for twin n_sl = 1.0_pReal, & !< stress exponent for slip n_tw = 1.0_pReal, & !< stress exponent for twin - f_sl_sat_tw = 1.0_pReal, & !< push-up factor for slip saturation due to twinning + f_sat_sl_tw = 1.0_pReal, & !< push-up factor for slip saturation due to twinning c_1 = 1.0_pReal, & c_2 = 1.0_pReal, & c_3 = 1.0_pReal, & @@ -180,7 +180,7 @@ module function plastic_phenopowerlaw_init() result(myPlasticity) prm%c_4 = pl%get_asFloat('c_4',defaultVal=0.0_pReal) prm%dot_gamma_0_tw = pl%get_asFloat('dot_gamma_0_tw') prm%n_tw = pl%get_asFloat('n_tw') - prm%f_sl_sat_tw = pl%get_asFloat('f_sl_sat_tw') + prm%f_sat_sl_tw = pl%get_asFloat('f_sat_sl_tw') prm%h_0_tw_tw = pl%get_asFloat('h_0_tw_tw') ! expand: family => system @@ -365,7 +365,7 @@ module subroutine phenopowerlaw_dotState(Mp,ph,me) !-------------------------------------------------------------------------------------------------- ! calculate left and right vectors left_SlipSlip = 1.0_pReal + prm%h_int - xi_slip_sat_offset = prm%f_sl_sat_tw*sqrt(sumF) + xi_slip_sat_offset = prm%f_sat_sl_tw*sqrt(sumF) right_SlipSlip = abs(1.0_pReal-stt%xi_slip(:,me) / (prm%xi_inf_sl+xi_slip_sat_offset)) **prm%a_sl & * sign(1.0_pReal,1.0_pReal-stt%xi_slip(:,me) / (prm%xi_inf_sl+xi_slip_sat_offset))