Skip to content

Commit

Permalink
more systematic name
Browse files Browse the repository at this point in the history
  • Loading branch information
MarDiehl committed Sep 14, 2023
1 parent a2b571c commit 4de21b5
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion PRIVATE
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/phase_mechanical_plastic_dislotungsten.f90
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/phase_mechanical_plastic_kinehardening.f90
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/phase_mechanical_plastic_nonlocal.f90
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/phase_mechanical_plastic_phenopowerlaw.f90
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 4de21b5

Please sign in to comment.