diff --git a/PRIVATE b/PRIVATE index b13ed2628..ed4e161d4 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit b13ed2628e2ece45bcf433ce88483759b02c946e +Subproject commit ed4e161d4302852a31c59a1d1d9b11d49f1a5427 diff --git a/examples/config/phase/mechanical/plastic/dislotungsten_W.yaml b/examples/config/phase/mechanical/plastic/dislotungsten_W.yaml index 42aebec22..d20e82413 100644 --- a/examples/config/phase/mechanical/plastic/dislotungsten_W.yaml +++ b/examples/config/phase/mechanical/plastic/dislotungsten_W.yaml @@ -26,7 +26,7 @@ h_sl-sl: [0.009, 0.72, 0.009, 0.05, 0.05, 0.06, 0.09] w: [2.992e-09] # 11b # values in Cereceda et al. are high, using parameters from Gröger et al. -a_nonSchmid: [0.0, 0.56, 0.75] # Tab. 2 +a_nonSchmid_110: [0.0, 0.56, 0.75] # Tab. 2 # (almost) no annhilation, adjustment needed for simulations beyond the yield point i_sl: [1] # c, eq. (25) diff --git a/src/phase_mechanical_plastic_dislotungsten.f90 b/src/phase_mechanical_plastic_dislotungsten.f90 index a3567efe4..b11d9e95b 100644 --- a/src/phase_mechanical_plastic_dislotungsten.f90 +++ b/src/phase_mechanical_plastic_dislotungsten.f90 @@ -153,7 +153,7 @@ module function plastic_dislotungsten_init() result(myPlasticity) prm%P_sl = crystal_SchmidMatrix_slip(N_sl,phase_lattice(ph),phase_cOverA(ph)) if (phase_lattice(ph) == 'cI') then - a = pl%get_as1dReal('a_nonSchmid',defaultVal = emptyRealArray) + a = pl%get_as1dReal('a_nonSchmid_110',defaultVal = emptyRealArray) prm%P_nS_pos = crystal_nonSchmidMatrix(N_sl,a,+1) prm%P_nS_neg = crystal_nonSchmidMatrix(N_sl,a,-1) else diff --git a/src/phase_mechanical_plastic_kinehardening.f90 b/src/phase_mechanical_plastic_kinehardening.f90 index 81fa188c8..9ecbde9c0 100644 --- a/src/phase_mechanical_plastic_kinehardening.f90 +++ b/src/phase_mechanical_plastic_kinehardening.f90 @@ -144,7 +144,7 @@ module function plastic_kinehardening_init() result(myPlasticity) prm%P = crystal_SchmidMatrix_slip(N_sl,phase_lattice(ph),phase_cOverA(ph)) if (phase_lattice(ph) == 'cI') then - a = pl%get_as1dReal('a_nonSchmid',defaultVal=emptyRealArray) + a = pl%get_as1dReal('a_nonSchmid_110',defaultVal=emptyRealArray) prm%nonSchmidActive = size(a) > 0 prm%P_nS_pos = crystal_nonSchmidMatrix(N_sl,a,+1) prm%P_nS_neg = crystal_nonSchmidMatrix(N_sl,a,-1) diff --git a/src/phase_mechanical_plastic_nonlocal.f90 b/src/phase_mechanical_plastic_nonlocal.f90 index e90dcae3c..28107f54e 100644 --- a/src/phase_mechanical_plastic_nonlocal.f90 +++ b/src/phase_mechanical_plastic_nonlocal.f90 @@ -253,7 +253,7 @@ module function plastic_nonlocal_init() result(myPlasticity) prm%P_sl = crystal_SchmidMatrix_slip(ini%N_sl,phase_lattice(ph), phase_cOverA(ph)) if (phase_lattice(ph) == 'cI') then - a = pl%get_as1dReal('a_nonSchmid',defaultVal = emptyRealArray) + a = pl%get_as1dReal('a_nonSchmid_110',defaultVal = emptyRealArray) if (size(a) > 0) prm%nonSchmidActive = .true. prm%P_nS_pos = crystal_nonSchmidMatrix(ini%N_sl,a,+1) prm%P_nS_neg = crystal_nonSchmidMatrix(ini%N_sl,a,-1) diff --git a/src/phase_mechanical_plastic_phenopowerlaw.f90 b/src/phase_mechanical_plastic_phenopowerlaw.f90 index 4091e0f76..00f072780 100644 --- a/src/phase_mechanical_plastic_phenopowerlaw.f90 +++ b/src/phase_mechanical_plastic_phenopowerlaw.f90 @@ -160,7 +160,7 @@ module function plastic_phenopowerlaw_init() result(myPlasticity) prm%P_sl = crystal_SchmidMatrix_slip(N_sl,phase_lattice(ph),phase_cOverA(ph)) if (phase_lattice(ph) == 'cI') then - a = pl%get_as1dReal('a_nonSchmid',defaultVal=emptyRealArray) + a = pl%get_as1dReal('a_nonSchmid_110',defaultVal=emptyRealArray) if (size(a) > 0) prm%nonSchmidActive = .true. prm%P_nS_pos = crystal_nonSchmidMatrix(N_sl,a,+1) prm%P_nS_neg = crystal_nonSchmidMatrix(N_sl,a,-1)