Skip to content

Commit 86bfbe6

Browse files
committed
Merge branch 'per-system-initialization' into 'development'
enabling initialization per slip system See merge request damask/DAMASK!937
2 parents 22b5a25 + 135aa2e commit 86bfbe6

2 files changed

+12
-0
lines changed

src/phase_mechanical_plastic_dislotwin.f90

+7
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,15 @@ module function plastic_dislotwin_init() result(myPlasticity)
213213

214214
f_edge = math_expand(pl%get_as1dReal('f_edge', requiredSize=size(N_sl), &
215215
defaultVal=[(0.5_pREAL,i=1,size(N_sl))]),N_sl)
216+
217+
#ifdef __GFORTRAN__
218+
rho_mob_0 = pl%get_as1dReal('rho_mob_0', requiredChunks=N_sl)
219+
rho_dip_0 = pl%get_as1dReal('rho_dip_0', requiredChunks=N_sl)
220+
#else
216221
rho_mob_0 = math_expand(pl%get_as1dReal('rho_mob_0', requiredSize=size(N_sl)),N_sl)
217222
rho_dip_0 = math_expand(pl%get_as1dReal('rho_dip_0', requiredSize=size(N_sl)),N_sl)
223+
#endif
224+
218225
prm%v_0 = math_expand(pl%get_as1dReal('v_0', requiredSize=size(N_sl)),N_sl)
219226
prm%b_sl = math_expand(pl%get_as1dReal('b_sl', requiredSize=size(N_sl)),N_sl)
220227
prm%Q_sl = math_expand(pl%get_as1dReal('Q_sl', requiredSize=size(N_sl)),N_sl)

src/phase_mechanical_plastic_phenopowerlaw.f90

+5
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,13 @@ module function plastic_phenopowerlaw_init() result(myPlasticity)
144144
prm%n_sl = math_expand(pl%get_as1dReal('n_sl', requiredSize=size(N_sl)), N_sl)
145145
prm%a_sl = math_expand(pl%get_as1dReal('a_sl', requiredSize=size(N_sl)), N_sl)
146146
prm%h_0_sl_sl = math_expand(pl%get_as1dReal('h_0_sl-sl', requiredSize=size(N_sl)), N_sl)
147+
#ifdef __GFORTRAN__
148+
xi_0_sl = pl%get_as1dReal('xi_0_sl', requiredChunks=N_sl)
149+
prm%xi_inf_sl = pl%get_as1dReal('xi_inf_sl',requiredChunks=N_sl)
150+
#else
147151
xi_0_sl = math_expand(pl%get_as1dReal('xi_0_sl', requiredSize=size(N_sl)), N_sl)
148152
prm%xi_inf_sl = math_expand(pl%get_as1dReal('xi_inf_sl', requiredSize=size(N_sl)), N_sl)
153+
#endif
149154
prm%c_1 = math_expand(pl%get_as1dReal('c_1', requiredSize=size(N_sl), &
150155
defaultVal=misc_zeros(size(N_sl))), N_sl)
151156
prm%c_2 = math_expand(pl%get_as1dReal('c_2', requiredSize=size(N_sl), &

0 commit comments

Comments
 (0)