From 0a22916aba00d1f6b054870d5e86e843a2674af1 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 19 Jun 2021 15:13:27 +0200 Subject: [PATCH] not a double subscript --- PRIVATE | 2 +- examples/Marc/material.yaml | 4 ++-- .../config/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml | 6 +++--- examples/config/Phase_Dislotwin_Tungsten.yaml | 2 +- .../config/Phase_Phenopowerlaw_Aluminum.yaml | 4 ++-- .../config/Phase_Phenopowerlaw_BCC-Ferrite.yaml | 4 ++-- .../Phase_Phenopowerlaw_BCC-Martensite.yaml | 4 ++-- .../config/Phase_Phenopowerlaw_Magnesium.yaml | 16 ++++++++-------- examples/config/Phase_Phenopowerlaw_cpTi.yaml | 4 ++-- .../mechanical/plastic/dislotwin_IF-steel.yaml | 2 +- .../mechanical/plastic/phenopowerlaw_Au.yaml | 4 ++-- examples/grid/material.yaml | 4 ++-- examples/mesh/material.yaml | 4 ++-- .../reference/Result/12grains6x7x8.material.yaml | 8 ++++---- .../reference/Result/4grains2x4x3.material.yaml | 8 ++++---- .../6grains6x7x8_single_phase.material.yaml | 4 ++-- src/phase_mechanical_plastic_dislotungsten.f90 | 2 +- src/phase_mechanical_plastic_dislotwin.f90 | 10 +++++----- src/phase_mechanical_plastic_kinehardening.f90 | 2 +- src/phase_mechanical_plastic_nonlocal.f90 | 2 +- src/phase_mechanical_plastic_phenopowerlaw.f90 | 16 ++++++++-------- 21 files changed, 56 insertions(+), 56 deletions(-) diff --git a/PRIVATE b/PRIVATE index 8fc3c44f5..023f86ff9 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 8fc3c44f533f5addbea8a787239627cb850206ac +Subproject commit 023f86ff9e603dcc8c7adc16545783653083ea83 diff --git a/examples/Marc/material.yaml b/examples/Marc/material.yaml index b82fcc75c..a02a9e739 100644 --- a/examples/Marc/material.yaml +++ b/examples/Marc/material.yaml @@ -16,8 +16,8 @@ phase: a_sl: 2.25 atol_xi: 1.0 dot_gamma_0_sl: 0.001 - h_0_sl_sl: 75e6 - h_sl_sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] + h_0_sl-sl: 75e6 + h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] n_sl: 20 output: [xi_sl] xi_0_sl: [31e6] diff --git a/examples/config/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml b/examples/config/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml index f5353b3b6..31b58b0b9 100644 --- a/examples/config/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml +++ b/examples/config/Phase_Dislotwin_TWIP-Steel-FeMnC.yaml @@ -19,7 +19,7 @@ TWIP_Steel_FeMnC: D_0: 4.0e-5 # Vacancy diffusion prefactor / m^2/s D_a: 1.0 # minimum dipole distance / b Q_cl: 4.5e-19 # Activation energy for climb / J - h_sl_sl: [0.122, 0.122, 0.625, 0.07, 0.137, 0.137, 0.122] # Interaction coefficients (Kubin et al. 2008) + h_sl-sl: [0.122, 0.122, 0.625, 0.07, 0.137, 0.137, 0.122] # Interaction coefficients (Kubin et al. 2008) # shear band parameters xi_sb: 180.0e6 Q_sb: 3.7e-19 @@ -35,7 +35,7 @@ TWIP_Steel_FeMnC: V_cs: 1.67e-29 # cross slip volume / m^3 p_tw: [10.0] # r-exponent in twin formation probability i_tw: 1.0 # Adj. parameter controlling twin mean free path - h_sl_tw: [0.0, 1.0, 1.0] # dislocation-twin interaction coefficients - h_tw_tw: [0.0, 1.0] # twin-twin interaction coefficients + h_sl-tw: [0.0, 1.0, 1.0] # dislocation-twin interaction coefficients + h_tw-tw: [0.0, 1.0] # twin-twin interaction coefficients Gamma_sf_0K: -0.0396 # stacking fault energy / J/m^2 at zero K; TWIP steel: -0.0526; Cu: -0.0396 dGamma_sf_dT: 0.0002 # temperature dependence / J/(m^2 K) of stacking fault energy diff --git a/examples/config/Phase_Dislotwin_Tungsten.yaml b/examples/config/Phase_Dislotwin_Tungsten.yaml index 397cfb662..44d8d2260 100644 --- a/examples/config/Phase_Dislotwin_Tungsten.yaml +++ b/examples/config/Phase_Dislotwin_Tungsten.yaml @@ -18,4 +18,4 @@ Tungsten: D_0: 4.0e-5 # Vacancy diffusion prefactor / m^2/s D_a: 1.0 # minimum dipole distance / b Q_cl: 4.5e-19 # Activation energy for climb / J - h_sl_sl: [1, 1.4, 1, 1.4, 1.4, 1.4, 1.4] + h_sl-sl: [1, 1.4, 1, 1.4, 1.4, 1.4, 1.4] diff --git a/examples/config/Phase_Phenopowerlaw_Aluminum.yaml b/examples/config/Phase_Phenopowerlaw_Aluminum.yaml index f05c18272..2a4afb219 100644 --- a/examples/config/Phase_Phenopowerlaw_Aluminum.yaml +++ b/examples/config/Phase_Phenopowerlaw_Aluminum.yaml @@ -7,8 +7,8 @@ Aluminum: N_sl: [12] a_sl: 2.25 dot_gamma_0_sl: 0.001 - h_0_sl_sl: 75e6 - h_sl_sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] + h_0_sl-sl: 75e6 + h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] n_sl: 20 output: [xi_sl, gamma_sl] type: phenopowerlaw diff --git a/examples/config/Phase_Phenopowerlaw_BCC-Ferrite.yaml b/examples/config/Phase_Phenopowerlaw_BCC-Ferrite.yaml index 609414dad..5b714af7c 100644 --- a/examples/config/Phase_Phenopowerlaw_BCC-Ferrite.yaml +++ b/examples/config/Phase_Phenopowerlaw_BCC-Ferrite.yaml @@ -9,8 +9,8 @@ Ferrite: N_sl: [12, 12] a_sl: 2.0 dot_gamma_0_sl: 0.001 - h_0_sl_sl: 1000.0e6 - h_sl_sl: [1, 1.4, 1, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4] + h_0_sl-sl: 1000.0e6 + h_sl-sl: [1, 1.4, 1, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4] n_sl: 20 type: phenopowerlaw xi_0_sl: [95.e6, 96.e6] diff --git a/examples/config/Phase_Phenopowerlaw_BCC-Martensite.yaml b/examples/config/Phase_Phenopowerlaw_BCC-Martensite.yaml index a14a9a182..1b1753870 100644 --- a/examples/config/Phase_Phenopowerlaw_BCC-Martensite.yaml +++ b/examples/config/Phase_Phenopowerlaw_BCC-Martensite.yaml @@ -9,8 +9,8 @@ Martensite: N_sl: [12, 12] a_sl: 2.0 dot_gamma_0_sl: 0.001 - h_0_sl_sl: 563.0e9 - h_sl_sl: [1, 1.4, 1, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4] + h_0_sl-sl: 563.0e9 + h_sl-sl: [1, 1.4, 1, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4] n_sl: 20 type: phenopowerlaw xi_0_sl: [405.8e6, 456.7e6] diff --git a/examples/config/Phase_Phenopowerlaw_Magnesium.yaml b/examples/config/Phase_Phenopowerlaw_Magnesium.yaml index 050ad0790..eb73e9867 100644 --- a/examples/config/Phase_Phenopowerlaw_Magnesium.yaml +++ b/examples/config/Phase_Phenopowerlaw_Magnesium.yaml @@ -8,13 +8,13 @@ Magnesium: plastic: N_sl: [3, 3, 0, 6, 0, 6] N_tw: [6, 0, 0, 6] - h_0_tw_tw: 50.0e6 - h_0_sl_sl: 500.0e6 - h_0_tw_sl: 150.0e6 - h_sl_sl: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - h_tw_tw: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - h_sl_tw: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - h_tw_sl: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] + h_0_tw-tw: 50.0e6 + h_0_sl-sl: 500.0e6 + h_0_tw-sl: 150.0e6 + h_sl-sl: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] + h_tw-tw: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] + h_sl-tw: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] + h_tw-sl: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] output: [xi_sl, xi_tw] type: phenopowerlaw xi_0_sl: [10.0e6, 55.0e6, 0, 60.0e6, 0.0, 60.0e6] @@ -25,4 +25,4 @@ Magnesium: dot_gamma_0_tw: 0.001 n_sl: 20 n_tw: 20 - f_sat_sl_tw: 10.0 + f_sat_sl-tw: 10.0 diff --git a/examples/config/Phase_Phenopowerlaw_cpTi.yaml b/examples/config/Phase_Phenopowerlaw_cpTi.yaml index 6300a74e1..a63f011e6 100644 --- a/examples/config/Phase_Phenopowerlaw_cpTi.yaml +++ b/examples/config/Phase_Phenopowerlaw_cpTi.yaml @@ -11,8 +11,8 @@ cpTi: N_sl: [3, 3, 0, 6, 12] a_sl: 2.0 dot_gamma_0_sl: 0.001 - h_0_sl_sl: 200e6 - h_sl_sl: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] + h_0_sl-sl: 200e6 + h_sl-sl: [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] n_sl: 20 output: [gamma_sl] type: phenopowerlaw diff --git a/examples/config/phase/mechanical/plastic/dislotwin_IF-steel.yaml b/examples/config/phase/mechanical/plastic/dislotwin_IF-steel.yaml index 3da7038a2..80c63882d 100644 --- a/examples/config/phase/mechanical/plastic/dislotwin_IF-steel.yaml +++ b/examples/config/phase/mechanical/plastic/dislotwin_IF-steel.yaml @@ -18,7 +18,7 @@ q_sl: [1.55, 1.55] i_sl: [23.3, 23.3] D_a: 7.4 # C_anni B: [0.001, 0.001] -h_sl_sl: [0.1, 0.72, 0.1, 0.053, 0.053, 0.073, 0.137, 0.72, 0.72, 0.053, 0.053, 0.053, 0.053, 0.073, 0.073, 0.073, 0.073, 0.073, 0.073, 0.137, 0.073, 0.073, 0.137, 0.073] +h_sl-sl: [0.1, 0.72, 0.1, 0.053, 0.053, 0.073, 0.137, 0.72, 0.72, 0.053, 0.053, 0.053, 0.053, 0.073, 0.073, 0.073, 0.073, 0.073, 0.073, 0.137, 0.073, 0.073, 0.137, 0.073] D_0: 4.000E-05 Q_cl: 5.400E-19 # no recovery! D: 40e-6 # estimated diff --git a/examples/config/phase/mechanical/plastic/phenopowerlaw_Au.yaml b/examples/config/phase/mechanical/plastic/phenopowerlaw_Au.yaml index baf7c7c14..c5e63e8a1 100644 --- a/examples/config/phase/mechanical/plastic/phenopowerlaw_Au.yaml +++ b/examples/config/phase/mechanical/plastic/phenopowerlaw_Au.yaml @@ -10,8 +10,8 @@ output: [xi_sl, gamma_sl] N_sl: [12] n_sl: 83.3 dot_gamma_0_sl: 0.001 -h_0_sl_sl: 75.0e6 -h_sl_sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] +h_0_sl-sl: 75.0e6 +h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] a_sl: 1.0 xi_0_sl: [26.25e6] xi_inf_sl: [53.0e6] diff --git a/examples/grid/material.yaml b/examples/grid/material.yaml index 47ab66d8b..31cd812fc 100644 --- a/examples/grid/material.yaml +++ b/examples/grid/material.yaml @@ -16,8 +16,8 @@ phase: a_sl: 2.25 atol_xi: 1.0 dot_gamma_0_sl: 0.001 - h_0_sl_sl: 75e6 - h_sl_sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] + h_0_sl-sl: 75e6 + h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] n_sl: 20 output: [xi_sl] xi_0_sl: [31e6] diff --git a/examples/mesh/material.yaml b/examples/mesh/material.yaml index 4c3026c21..a8b5b22ac 100644 --- a/examples/mesh/material.yaml +++ b/examples/mesh/material.yaml @@ -15,8 +15,8 @@ phase: a_sl: 2.25 atol_xi: 1.0 dot_gamma_0_sl: 0.001 - h_0_sl_sl: 75e6 - h_sl_sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] + h_0_sl-sl: 75e6 + h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] n_sl: 20 output: [xi_sl] xi_0_sl: [31e6] diff --git a/python/tests/reference/Result/12grains6x7x8.material.yaml b/python/tests/reference/Result/12grains6x7x8.material.yaml index 741f6457e..a74e266c3 100644 --- a/python/tests/reference/Result/12grains6x7x8.material.yaml +++ b/python/tests/reference/Result/12grains6x7x8.material.yaml @@ -15,8 +15,8 @@ phase: a_sl: 2.25 atol_xi: 1.0 dot_gamma_0_sl: 0.001 - h_0_sl_sl: 75e6 - h_sl_sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] + h_0_sl-sl: 75e6 + h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] n_sl: 20 output: [xi_sl] type: phenopowerlaw @@ -32,8 +32,8 @@ phase: a_sl: 2.25 atol_xi: 1.0 dot_gamma_0_sl: 0.001 - h_0_sl_sl: 75e6 - h_sl_sl: [1, 1.4, 1, 1.4, 1.4, 1.4, 1.4] + h_0_sl-sl: 75e6 + h_sl-sl: [1, 1.4, 1, 1.4, 1.4, 1.4, 1.4] n_sl: 20 output: [xi_sl] type: phenopowerlaw diff --git a/python/tests/reference/Result/4grains2x4x3.material.yaml b/python/tests/reference/Result/4grains2x4x3.material.yaml index 6b7c83809..160db3ace 100644 --- a/python/tests/reference/Result/4grains2x4x3.material.yaml +++ b/python/tests/reference/Result/4grains2x4x3.material.yaml @@ -647,8 +647,8 @@ phase: a_sl: 2.25 atol_xi: 1.0 dot_gamma_0_sl: 0.001 - h_0_sl_sl: 75e6 - h_sl_sl: [1, 1, 1.4, 1.4, 1.4, 1.4] + h_0_sl-sl: 75e6 + h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4] n_sl: 20 output: [xi_sl] type: phenopowerlaw @@ -664,8 +664,8 @@ phase: a_sl: 2.25 atol_xi: 1.0 dot_gamma_0_sl: 0.001 - h_0_sl_sl: 75e6 - h_sl_sl: [1, 1.4, 1, 1.4, 1.4, 1.4, 1.4] + h_0_sl-sl: 75e6 + h_sl-sl: [1, 1.4, 1, 1.4, 1.4, 1.4, 1.4] n_sl: 20 output: [xi_sl] type: phenopowerlaw diff --git a/python/tests/reference/Result/6grains6x7x8_single_phase.material.yaml b/python/tests/reference/Result/6grains6x7x8_single_phase.material.yaml index 1894d4b2b..0f7bf5450 100644 --- a/python/tests/reference/Result/6grains6x7x8_single_phase.material.yaml +++ b/python/tests/reference/Result/6grains6x7x8_single_phase.material.yaml @@ -15,8 +15,8 @@ phase: a_sl: 2.25 atol_xi: 1.0 dot_gamma_0_sl: 0.001 - h_0_sl_sl: 75e6 - h_sl_sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] + h_0_sl-sl: 75e6 + h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] n_sl: 20 output: [xi_sl] type: phenopowerlaw diff --git a/src/phase_mechanical_plastic_dislotungsten.f90 b/src/phase_mechanical_plastic_dislotungsten.f90 index fb041d9f5..7c9accc8d 100644 --- a/src/phase_mechanical_plastic_dislotungsten.f90 +++ b/src/phase_mechanical_plastic_dislotungsten.f90 @@ -149,7 +149,7 @@ module function plastic_dislotungsten_init() result(myPlasticity) prm%nonSchmid_neg = prm%P_sl endif - prm%h_sl_sl = lattice_interaction_SlipBySlip(N_sl,pl%get_as1dFloat('h_sl_sl'), & + prm%h_sl_sl = lattice_interaction_SlipBySlip(N_sl,pl%get_as1dFloat('h_sl-sl'), & phase%get_asString('lattice')) prm%forestProjection = lattice_forestProjection_edge(N_sl,phase%get_asString('lattice'),& phase%get_asFloat('c/a',defaultVal=0.0_pReal)) diff --git a/src/phase_mechanical_plastic_dislotwin.f90 b/src/phase_mechanical_plastic_dislotwin.f90 index 20b4387f3..f1f39c71f 100644 --- a/src/phase_mechanical_plastic_dislotwin.f90 +++ b/src/phase_mechanical_plastic_dislotwin.f90 @@ -194,7 +194,7 @@ module function plastic_dislotwin_init() result(myPlasticity) slipActive: if (prm%sum_N_sl > 0) then prm%P_sl = lattice_SchmidMatrix_slip(N_sl,phase%get_asString('lattice'),& phase%get_asFloat('c/a',defaultVal=0.0_pReal)) - prm%h_sl_sl = lattice_interaction_SlipBySlip(N_sl,pl%get_as1dFloat('h_sl_sl'), & + prm%h_sl_sl = lattice_interaction_SlipBySlip(N_sl,pl%get_as1dFloat('h_sl-sl'), & phase%get_asString('lattice')) prm%forestProjection = lattice_forestProjection_edge(N_sl,phase%get_asString('lattice'),& phase%get_asFloat('c/a',defaultVal=0.0_pReal)) @@ -271,7 +271,7 @@ module function plastic_dislotwin_init() result(myPlasticity) prm%P_tw = lattice_SchmidMatrix_twin(N_tw,phase%get_asString('lattice'),& phase%get_asFloat('c/a',defaultVal=0.0_pReal)) prm%h_tw_tw = lattice_interaction_TwinByTwin(N_tw,& - pl%get_as1dFloat('h_tw_tw'), & + pl%get_as1dFloat('h_tw-tw'), & phase%get_asString('lattice')) prm%b_tw = pl%get_as1dFloat('b_tw', requiredSize=size(N_tw)) @@ -327,7 +327,7 @@ module function plastic_dislotwin_init() result(myPlasticity) prm%x_c_tr = pl%get_asFloat('x_c_tr', defaultVal=0.0_pReal) ! ToDo: How to handle that??? prm%L_tr = pl%get_asFloat('L_tr') - prm%h_tr_tr = lattice_interaction_TransByTrans(N_tr,pl%get_as1dFloat('h_tr_tr'), & + prm%h_tr_tr = lattice_interaction_TransByTrans(N_tr,pl%get_as1dFloat('h_tr-tr'), & phase%get_asString('lattice')) prm%C66_tr = lattice_C66_trans(N_tr,prm%C66,pl%get_asString('lattice_tr'), & @@ -392,14 +392,14 @@ module function plastic_dislotwin_init() result(myPlasticity) slipAndTwinActive: if (prm%sum_N_sl * prm%sum_N_tw > 0) then prm%h_sl_tw = lattice_interaction_SlipByTwin(N_sl,N_tw,& - pl%get_as1dFloat('h_sl_tw'), & + pl%get_as1dFloat('h_sl-tw'), & phase%get_asString('lattice')) if (prm%fccTwinTransNucleation .and. size(N_tw) /= 1) extmsg = trim(extmsg)//' interaction_sliptwin' endif slipAndTwinActive slipAndTransActive: if (prm%sum_N_sl * prm%sum_N_tr > 0) then prm%h_sl_tr = lattice_interaction_SlipByTrans(N_sl,N_tr,& - pl%get_as1dFloat('h_sl_tr'), & + pl%get_as1dFloat('h_sl-tr'), & phase%get_asString('lattice')) if (prm%fccTwinTransNucleation .and. size(N_tr) /= 1) extmsg = trim(extmsg)//' interaction_sliptrans' endif slipAndTransActive diff --git a/src/phase_mechanical_plastic_kinehardening.f90 b/src/phase_mechanical_plastic_kinehardening.f90 index 04e4bee72..461196d3f 100644 --- a/src/phase_mechanical_plastic_kinehardening.f90 +++ b/src/phase_mechanical_plastic_kinehardening.f90 @@ -125,7 +125,7 @@ module function plastic_kinehardening_init() result(myPlasticity) prm%nonSchmid_neg = prm%P endif prm%interaction_SlipSlip = lattice_interaction_SlipBySlip(N_sl, & - pl%get_as1dFloat('h_sl_sl'), & + pl%get_as1dFloat('h_sl-sl'), & phase%get_asString('lattice')) xi_0 = pl%get_as1dFloat('xi_0', requiredSize=size(N_sl)) diff --git a/src/phase_mechanical_plastic_nonlocal.f90 b/src/phase_mechanical_plastic_nonlocal.f90 index 7dd4c57de..efd45e97b 100644 --- a/src/phase_mechanical_plastic_nonlocal.f90 +++ b/src/phase_mechanical_plastic_nonlocal.f90 @@ -261,7 +261,7 @@ module function plastic_nonlocal_init() result(myPlasticity) endif prm%h_sl_sl = lattice_interaction_SlipBySlip(ini%N_sl, & - pl%get_as1dFloat('h_sl_sl'), & + pl%get_as1dFloat('h_sl-sl'), & phase%get_asString('lattice')) prm%forestProjection_edge = lattice_forestProjection_edge (ini%N_sl,phase%get_asString('lattice'),& diff --git a/src/phase_mechanical_plastic_phenopowerlaw.f90 b/src/phase_mechanical_plastic_phenopowerlaw.f90 index 17f2cc306..978a2cf1d 100644 --- a/src/phase_mechanical_plastic_phenopowerlaw.f90 +++ b/src/phase_mechanical_plastic_phenopowerlaw.f90 @@ -128,7 +128,7 @@ module function plastic_phenopowerlaw_init() result(myPlasticity) prm%nonSchmid_neg = prm%P_sl endif prm%h_sl_sl = lattice_interaction_SlipBySlip(N_sl, & - pl%get_as1dFloat('h_sl_sl'), & + pl%get_as1dFloat('h_sl-sl'), & phase%get_asString('lattice')) xi_0_sl = pl%get_as1dFloat('xi_0_sl', requiredSize=size(N_sl)) @@ -139,7 +139,7 @@ module function plastic_phenopowerlaw_init() result(myPlasticity) prm%dot_gamma_0_sl = pl%get_asFloat('dot_gamma_0_sl') prm%n_sl = pl%get_asFloat('n_sl') prm%a_sl = pl%get_asFloat('a_sl') - prm%h_0_sl_sl = pl%get_asFloat('h_0_sl_sl') + prm%h_0_sl_sl = pl%get_asFloat('h_0_sl-sl') ! expand: family => system xi_0_sl = math_expand(xi_0_sl, N_sl) @@ -167,7 +167,7 @@ module function plastic_phenopowerlaw_init() result(myPlasticity) prm%P_tw = lattice_SchmidMatrix_twin(N_tw,phase%get_asString('lattice'),& phase%get_asFloat('c/a',defaultVal=0.0_pReal)) prm%h_tw_tw = lattice_interaction_TwinByTwin(N_tw,& - pl%get_as1dFloat('h_tw_tw'), & + pl%get_as1dFloat('h_tw-tw'), & phase%get_asString('lattice')) prm%gamma_char = lattice_characteristicShear_twin(N_tw,phase%get_asString('lattice'),& phase%get_asFloat('c/a',defaultVal=0.0_pReal)) @@ -180,8 +180,8 @@ 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_sat_sl_tw = pl%get_asFloat('f_sat_sl_tw') - prm%h_0_tw_tw = pl%get_asFloat('h_0_tw_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 xi_0_tw = math_expand(xi_0_tw,N_tw) @@ -199,12 +199,12 @@ module function plastic_phenopowerlaw_init() result(myPlasticity) !-------------------------------------------------------------------------------------------------- ! slip-twin related parameters slipAndTwinActive: if (prm%sum_N_sl > 0 .and. prm%sum_N_tw > 0) then - prm%h_0_tw_sl = pl%get_asFloat('h_0_tw_sl') + prm%h_0_tw_sl = pl%get_asFloat('h_0_tw-sl') prm%h_sl_tw = lattice_interaction_SlipByTwin(N_sl,N_tw,& - pl%get_as1dFloat('h_sl_tw'), & + pl%get_as1dFloat('h_sl-tw'), & phase%get_asString('lattice')) prm%h_tw_sl = lattice_interaction_TwinBySlip(N_tw,N_sl,& - pl%get_as1dFloat('h_tw_sl'), & + pl%get_as1dFloat('h_tw-sl'), & phase%get_asString('lattice')) else slipAndTwinActive allocate(prm%h_sl_tw(prm%sum_N_sl,prm%sum_N_tw)) ! at least one dimension is 0