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

consistent names

This commit is contained in:
Martin Diehl 2019-12-01 20:07:16 +01:00
parent 05aa38cc71
commit 2b3b26087f
4 changed files with 42 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PRIVATE

@ -1 +1 @@
Subproject commit 633a2d1ba8c1f96c0362a35af407304228934b0d Subproject commit 1d177aa3f080eacf9fca568070707f04cd7058d6

67
examples/ConfigFiles/Phase_Nonlocal_Aluminum.config
View File

@ -4,58 +4,23 @@ elasticity hooke
plasticity nonlocal plasticity nonlocal
/nonlocal/ /nonlocal/
(output) rho (output) rho_sgl_mob_edg_pos
(output) rho_edge (output) rho_sgl_imm_edg_pos
(output) rho_screw (output) rho_sgl_mob_edg_neg
(output) rho_sgl (output) rho_sgl_imm_edg_neg
(output) rho_sgl_edge_pos (output) rho_sgl_mob_scr_pos
(output) rho_sgl_edge_neg (output) rho_sgl_imm_scr_pos
(output) rho_sgl_screw_pos (output) rho_sgl_mob_scr_neg
(output) rho_sgl_screw_neg (output) rho_sgl_imm_scr_neg
(output) rho_sgl_edge_pos_mobile (output) rho_dip_edg
(output) rho_sgl_edge_neg_mobile (output) rho_dip_scr
(output) rho_sgl_screw_pos_mobile
(output) rho_sgl_screw_neg_mobile
(output) rho_sgl_edge_pos_immobile
(output) rho_sgl_edge_neg_immobile
(output) rho_sgl_screw_pos_immobile
(output) rho_sgl_screw_neg_immobile
(output) rho_dip_edge
(output) rho_dip_screw
(output) rho_forest (output) rho_forest
(output) delta (output) gamma
(output) delta_sgl (output) tau_pass
(output) delta_dip (output) v_edg_pos
(output) shearrate (output) v_edg_neg
(output) resolvedstress (output) v_scr_pos
(output) resolvedstress_back (output) v_scr_neg
(output) resolvedstress_external
(output) resistance
(output) rho_dot
(output) rho_dot_sgl
(output) rho_dot_sgl_mobile
(output) rho_dot_dip
(output) rho_dot_gen_edge
(output) rho_dot_gen_screw
(output) rho_dot_sgl2dip_edge
(output) rho_dot_sgl2dip_screw
(output) rho_dot_ann_ath
(output) rho_dot_ann_the
(output) rho_dot_ann_the_edge
(output) rho_dot_ann_the_screw
(output) rho_dot_edgejogs
(output) rho_dot_flux
(output) rho_dot_flux_mobile
(output) rho_dot_flux_edge
(output) rho_dot_flux_screw
(output) velocity_edge_pos
(output) velocity_edge_neg
(output) velocity_screw_pos
(output) velocity_screw_neg
(output) maximumDipoleHeight_edge
(output) maximumDipoleHeight_screw
(output) accumulated_shear
(output) dislocationstress
lattice_structure fcc lattice_structure fcc
Nslip 12 # number of slip systems Nslip 12 # number of slip systems

41
examples/ConfigFiles/Phase_Nonlocal_Nickel.config
View File

@ -3,31 +3,24 @@
elasticity hooke elasticity hooke
plasticity nonlocal plasticity nonlocal
/nonlocal/ /nonlocal/
(output) rho_sgl_mob_edg_pos
(output) rho (output) rho_sgl_imm_edg_pos
(output) rho_sgl_mobile (output) rho_sgl_mob_edg_neg
(output) rho_sgl_immobile (output) rho_sgl_imm_edg_neg
(output) rho_sgl_edge_pos (output) rho_sgl_mob_scr_pos
(output) rho_sgl_edge_neg (output) rho_sgl_imm_scr_pos
(output) rho_sgl_screw_pos (output) rho_sgl_mob_scr_neg
(output) rho_sgl_screw_neg (output) rho_sgl_imm_scr_neg
(output) rho_dip_edge (output) rho_dip_edg
(output) rho_dip_screw (output) rho_dip_scr
(output) rho_forest (output) rho_forest
(output) accumulatedshear (output) gamma
(output) shearrate (output) tau_pass
(output) resolvedstress (output) v_edg_pos
(output) resistance (output) v_edg_neg
(output) velocity_edge_pos (output) v_scr_pos
(output) rho_dot_gen (output) v_scr_neg
(output) rho_dot_sgl2dip_edge
(output) rho_dot_sgl2dip_screw
(output) rho_dot_ann_ath
(output) rho_dot_ann_the_edge
(output) rho_dot_ann_the_screw
(output) rho_dot_edgejogs
(output) rho_dot_flux_edge
(output) rho_dot_flux_screw
lattice_structure fcc lattice_structure fcc
Nslip 12 # number of slip systems per family Nslip 12 # number of slip systems per family

16
src/plastic_nonlocal.f90
View File

@ -453,21 +453,21 @@ subroutine plastic_nonlocal_init
do i=1, size(outputs) do i=1, size(outputs)
outputID = undefined_ID outputID = undefined_ID
select case(trim(outputs(i))) select case(trim(outputs(i)))
case ('rho_sgl_edge_pos_mob') case ('rho_sgl_mob_edg_pos')
outputID = merge(rho_sgl_mob_edg_pos_ID,undefined_ID,prm%totalNslip>0) outputID = merge(rho_sgl_mob_edg_pos_ID,undefined_ID,prm%totalNslip>0)
case ('rho_sgl_edge_neg_mob') case ('rho_sgl_mob_edg_neg')
outputID = merge(rho_sgl_mob_edg_neg_ID,undefined_ID,prm%totalNslip>0) outputID = merge(rho_sgl_mob_edg_neg_ID,undefined_ID,prm%totalNslip>0)
case ('rho_sgl_screw_pos_mob') case ('rho_sgl_mob_scr_pos')
outputID = merge(rho_sgl_mob_scr_pos_ID,undefined_ID,prm%totalNslip>0) outputID = merge(rho_sgl_mob_scr_pos_ID,undefined_ID,prm%totalNslip>0)
case ('rho_sgl_screw_neg_mob') case ('rho_sgl_mob_scr_neg')
outputID = merge(rho_sgl_mob_scr_neg_ID,undefined_ID,prm%totalNslip>0) outputID = merge(rho_sgl_mob_scr_neg_ID,undefined_ID,prm%totalNslip>0)
case ('rho_sgl_edge_pos_imm') case ('rho_sgl_imm_edg_pos')
outputID = merge(rho_sgl_imm_edg_pos_ID,undefined_ID,prm%totalNslip>0) outputID = merge(rho_sgl_imm_edg_pos_ID,undefined_ID,prm%totalNslip>0)
case ('rho_sgl_edge_neg_imm') case ('rho_sgl_imm_edg_neg')
outputID = merge(rho_sgl_imm_edg_neg_ID,undefined_ID,prm%totalNslip>0) outputID = merge(rho_sgl_imm_edg_neg_ID,undefined_ID,prm%totalNslip>0)
case ('rho_sgl_screw_pos_imm') case ('rho_sgl_imm_scr_pos')
outputID = merge(rho_sgl_imm_scr_pos_ID,undefined_ID,prm%totalNslip>0) outputID = merge(rho_sgl_imm_scr_pos_ID,undefined_ID,prm%totalNslip>0)
case ('rho_sgl_screw_neg_imm') case ('rho_sgl_imm_scr_neg')
outputID = merge(rho_sgl_imm_scr_neg_ID,undefined_ID,prm%totalNslip>0) outputID = merge(rho_sgl_imm_scr_neg_ID,undefined_ID,prm%totalNslip>0)
case ('rho_dip_edg') case ('rho_dip_edg')
outputID = merge(rho_dip_edg_ID,undefined_ID,prm%totalNslip>0) outputID = merge(rho_dip_edg_ID,undefined_ID,prm%totalNslip>0)