223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

short and consistent naming

This commit is contained in:
Martin Diehl 2019-12-01 08:39:30 +01:00
parent df4b642400
commit afad2f2dce
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/plastic_nonlocal.f90
View File

@ -86,10 +86,10 @@ module plastic_nonlocal
rho_dot_sgl_ID, & rho_dot_sgl_ID, &
rho_dot_sgl_mobile_ID, & rho_dot_sgl_mobile_ID, &
rho_dot_dip_ID, & rho_dot_dip_ID, &
velocity_edge_pos_ID, & v_edg_pos_ID, &
velocity_edge_neg_ID, & v_edg_neg_ID, &
velocity_screw_pos_ID, & v_scr_pos_ID, &
velocity_screw_neg_ID, & v_scr_neg_ID, &
accumulatedshear_ID accumulatedshear_ID
end enum end enum
@ -482,13 +482,13 @@ subroutine plastic_nonlocal_init
case ('rho_dot_dip') case ('rho_dot_dip')
outputID = merge(rho_dot_dip_ID,undefined_ID,prm%totalNslip>0) outputID = merge(rho_dot_dip_ID,undefined_ID,prm%totalNslip>0)
case ('velocity_edge_pos') case ('velocity_edge_pos')
outputID = merge(velocity_edge_pos_ID,undefined_ID,prm%totalNslip>0) outputID = merge(v_edg_pos_ID,undefined_ID,prm%totalNslip>0)
case ('velocity_edge_neg') case ('velocity_edge_neg')
outputID = merge(velocity_edge_neg_ID,undefined_ID,prm%totalNslip>0) outputID = merge(v_edg_neg_ID,undefined_ID,prm%totalNslip>0)
case ('velocity_screw_pos') case ('velocity_screw_pos')
outputID = merge(velocity_screw_pos_ID,undefined_ID,prm%totalNslip>0) outputID = merge(v_scr_pos_ID,undefined_ID,prm%totalNslip>0)
case ('velocity_screw_neg') case ('velocity_screw_neg')
outputID = merge(velocity_screw_neg_ID,undefined_ID,prm%totalNslip>0) outputID = merge(v_scr_neg_ID,undefined_ID,prm%totalNslip>0)
case ('accumulatedshear','accumulated_shear') case ('accumulatedshear','accumulated_shear')
outputID = merge(accumulatedshear_ID,undefined_ID,prm%totalNslip>0) outputID = merge(accumulatedshear_ID,undefined_ID,prm%totalNslip>0)
end select end select
@ -2064,19 +2064,19 @@ outputsLoop: do o = 1,size(param(instance)%outputID)
postResults(cs+1:cs+ns) = sum(rhoDotDip,2) postResults(cs+1:cs+ns) = sum(rhoDotDip,2)
cs = cs + ns cs = cs + ns
case (velocity_edge_pos_ID) case (v_edg_pos_ID)
postResults(cs+1:cs+ns) = v(1:ns,1) postResults(cs+1:cs+ns) = v(1:ns,1)
cs = cs + ns cs = cs + ns
case (velocity_edge_neg_ID) case (v_edg_neg_ID)
postResults(cs+1:cs+ns) = v(1:ns,2) postResults(cs+1:cs+ns) = v(1:ns,2)
cs = cs + ns cs = cs + ns
case (velocity_screw_pos_ID) case (v_scr_pos_ID)
postResults(cs+1:cs+ns) = v(1:ns,3) postResults(cs+1:cs+ns) = v(1:ns,3)
cs = cs + ns cs = cs + ns
case (velocity_screw_neg_ID) case (v_scr_neg_ID)
postResults(cs+1:cs+ns) = v(1:ns,4) postResults(cs+1:cs+ns) = v(1:ns,4)
cs = cs + ns cs = cs + ns