diff --git a/PRIVATE b/PRIVATE index 633a2d1ba..1d177aa3f 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 633a2d1ba8c1f96c0362a35af407304228934b0d +Subproject commit 1d177aa3f080eacf9fca568070707f04cd7058d6 diff --git a/examples/ConfigFiles/Phase_Nonlocal_Aluminum.config b/examples/ConfigFiles/Phase_Nonlocal_Aluminum.config index 6406a47c0..fd18aa719 100644 --- a/examples/ConfigFiles/Phase_Nonlocal_Aluminum.config +++ b/examples/ConfigFiles/Phase_Nonlocal_Aluminum.config @@ -4,58 +4,23 @@ elasticity hooke plasticity nonlocal /nonlocal/ -(output) rho -(output) rho_edge -(output) rho_screw -(output) rho_sgl -(output) rho_sgl_edge_pos -(output) rho_sgl_edge_neg -(output) rho_sgl_screw_pos -(output) rho_sgl_screw_neg -(output) rho_sgl_edge_pos_mobile -(output) rho_sgl_edge_neg_mobile -(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_sgl_mob_edg_pos +(output) rho_sgl_imm_edg_pos +(output) rho_sgl_mob_edg_neg +(output) rho_sgl_imm_edg_neg +(output) rho_sgl_mob_scr_pos +(output) rho_sgl_imm_scr_pos +(output) rho_sgl_mob_scr_neg +(output) rho_sgl_imm_scr_neg +(output) rho_dip_edg +(output) rho_dip_scr (output) rho_forest -(output) delta -(output) delta_sgl -(output) delta_dip -(output) shearrate -(output) resolvedstress -(output) resolvedstress_back -(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 +(output) gamma +(output) tau_pass +(output) v_edg_pos +(output) v_edg_neg +(output) v_scr_pos +(output) v_scr_neg lattice_structure fcc Nslip 12 # number of slip systems diff --git a/examples/ConfigFiles/Phase_Nonlocal_Nickel.config b/examples/ConfigFiles/Phase_Nonlocal_Nickel.config index 3420b4246..3cba4d975 100644 --- a/examples/ConfigFiles/Phase_Nonlocal_Nickel.config +++ b/examples/ConfigFiles/Phase_Nonlocal_Nickel.config @@ -3,31 +3,24 @@ elasticity hooke plasticity nonlocal /nonlocal/ - -(output) rho -(output) rho_sgl_mobile -(output) rho_sgl_immobile -(output) rho_sgl_edge_pos -(output) rho_sgl_edge_neg -(output) rho_sgl_screw_pos -(output) rho_sgl_screw_neg -(output) rho_dip_edge -(output) rho_dip_screw +(output) rho_sgl_mob_edg_pos +(output) rho_sgl_imm_edg_pos +(output) rho_sgl_mob_edg_neg +(output) rho_sgl_imm_edg_neg +(output) rho_sgl_mob_scr_pos +(output) rho_sgl_imm_scr_pos +(output) rho_sgl_mob_scr_neg +(output) rho_sgl_imm_scr_neg +(output) rho_dip_edg +(output) rho_dip_scr (output) rho_forest -(output) accumulatedshear -(output) shearrate -(output) resolvedstress -(output) resistance -(output) velocity_edge_pos -(output) rho_dot_gen -(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 +(output) gamma +(output) tau_pass +(output) v_edg_pos +(output) v_edg_neg +(output) v_scr_pos +(output) v_scr_neg + lattice_structure fcc Nslip 12 # number of slip systems per family diff --git a/src/plastic_nonlocal.f90 b/src/plastic_nonlocal.f90 index 0f0e3aa3a..c2400494c 100644 --- a/src/plastic_nonlocal.f90 +++ b/src/plastic_nonlocal.f90 @@ -453,21 +453,21 @@ subroutine plastic_nonlocal_init do i=1, size(outputs) outputID = undefined_ID 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) - 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) - 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) - 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) - 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) - 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) - 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) - 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) case ('rho_dip_edg') outputID = merge(rho_dip_edg_ID,undefined_ID,prm%totalNslip>0)