From a5ee02ff01d057e84cd94509ff7860292dbc4c07 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 9 Mar 2015 11:29:44 +0000 Subject: [PATCH] added some aliases for output to finally converge from 'shear_rate' to 'shearrate' and from 'accumulatedshear' to 'accumulated_shear' --- code/config/Crystallite_All.config | 2 +- .../Phase_Dislotwin_TWIP-Steel-FeMnC.config | 6 +- code/config/Phase_Nonlocal_Aluminum.config | 2 +- .../Phase_Phenopowerlaw_Aluminum.config | 4 +- code/plastic_disloKMC.f90 | 4 +- code/plastic_disloUCLA.f90 | 4 +- code/plastic_dislotwin.f90 | 6 +- code/plastic_nonlocal.f90 | 168 +++++++++--------- code/plastic_phenopowerlaw.f90 | 4 +- 9 files changed, 100 insertions(+), 100 deletions(-) diff --git a/code/config/Crystallite_All.config b/code/config/Crystallite_All.config index 898466bb5..6ac7c86db 100644 --- a/code/config/Crystallite_All.config +++ b/code/config/Crystallite_All.config @@ -18,4 +18,4 @@ (output) s # second Piola-Kichhoff stress tensor; synonyms: "tstar", "secondpiola", "2ndpiola" (output) lp # plastic velocity gradient tensor (output) elasmatrix # elastic stiffness matrix -(output) ipcoords # current ip coordinates \ No newline at end of file +(output) ipcoords # current ip coordinates diff --git a/code/config/Phase_Dislotwin_TWIP-Steel-FeMnC.config b/code/config/Phase_Dislotwin_TWIP-Steel-FeMnC.config index 894134487..6c5b397ac 100644 --- a/code/config/Phase_Dislotwin_TWIP-Steel-FeMnC.config +++ b/code/config/Phase_Dislotwin_TWIP-Steel-FeMnC.config @@ -6,18 +6,18 @@ plasticity dislotwin #(output) edge_density #(output) dipole_density -#(output) shear_rate_slip +#(output) shearrate_slip #(output) accumulated_shear_slip #(output) mfp_slip #(output) resolved_stress_slip #(output) threshold_stress_slip #(output) twin_fraction -#(output) shear_rate_twin +#(output) shearrate_twin #(output) accumulated_shear_twin #(output) mfp_twin #(output) resolved_stress_twin #(output) threshold_stress_twin -#(output) shear_rate_shearband +#(output) shearrate_shearband #(output) resolved_stress_shearband #(output) sb_eigenvalues #(output) sb_eigenvectors diff --git a/code/config/Phase_Nonlocal_Aluminum.config b/code/config/Phase_Nonlocal_Aluminum.config index 034960060..09c41d4c4 100644 --- a/code/config/Phase_Nonlocal_Aluminum.config +++ b/code/config/Phase_Nonlocal_Aluminum.config @@ -87,7 +87,7 @@ plasticity nonlocal (output) fluxDensity_screw_neg.z (output) maximumDipoleHeight_edge (output) maximumDipoleHeight_screw -(output) accumulatedshear +(output) accumulated_shear (output) dislocationstress lattice_structure fcc diff --git a/code/config/Phase_Phenopowerlaw_Aluminum.config b/code/config/Phase_Phenopowerlaw_Aluminum.config index c5f920a78..769e0cdfa 100644 --- a/code/config/Phase_Phenopowerlaw_Aluminum.config +++ b/code/config/Phase_Phenopowerlaw_Aluminum.config @@ -6,12 +6,12 @@ plasticity phenopowerlaw (output) resistance_slip (output) shearrate_slip (output) resolvedstress_slip -(output) accumulatedshear_slip +(output) accumulated_shear_slip (output) totalshear (output) resistance_twin (output) shearrate_twin (output) resolvedstress_twin -(output) accumulatedshear_twin +(output) accumulated_shear_twin (output) totalvolfrac_twin lattice_structure fcc diff --git a/code/plastic_disloKMC.f90 b/code/plastic_disloKMC.f90 index 87513436d..b4d7e87d1 100644 --- a/code/plastic_disloKMC.f90 +++ b/code/plastic_disloKMC.f90 @@ -320,7 +320,7 @@ subroutine plastic_disloKMC_init(fileUnit) plastic_disloKMC_outputID(plastic_disloKMC_Noutput(instance),instance) = dipole_density_ID plastic_disloKMC_output(plastic_disloKMC_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case ('shear_rate_slip') + case ('shear_rate_slip','shearrate_slip') plastic_disloKMC_Noutput(instance) = plastic_disloKMC_Noutput(instance) + 1_pInt plastic_disloKMC_outputID(plastic_disloKMC_Noutput(instance),instance) = shear_rate_slip_ID plastic_disloKMC_output(plastic_disloKMC_Noutput(instance),instance) = & @@ -360,7 +360,7 @@ subroutine plastic_disloKMC_init(fileUnit) plastic_disloKMC_outputID(plastic_disloKMC_Noutput(instance),instance) = twin_fraction_ID plastic_disloKMC_output(plastic_disloKMC_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case ('shear_rate_twin') + case ('shear_rate_twin','shearrate_twin') plastic_disloKMC_Noutput(instance) = plastic_disloKMC_Noutput(instance) + 1_pInt plastic_disloKMC_outputID(plastic_disloKMC_Noutput(instance),instance) = shear_rate_twin_ID plastic_disloKMC_output(plastic_disloKMC_Noutput(instance),instance) = & diff --git a/code/plastic_disloUCLA.f90 b/code/plastic_disloUCLA.f90 index 77955c14d..bef73dcc9 100644 --- a/code/plastic_disloUCLA.f90 +++ b/code/plastic_disloUCLA.f90 @@ -328,7 +328,7 @@ subroutine plastic_disloUCLA_init(fileUnit) plastic_disloUCLA_outputID(plastic_disloUCLA_Noutput(instance),instance) = dipole_density_ID plastic_disloUCLA_output(plastic_disloUCLA_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case ('shear_rate_slip') + case ('shear_rate_slip','shearrate_slip') plastic_disloUCLA_Noutput(instance) = plastic_disloUCLA_Noutput(instance) + 1_pInt plastic_disloUCLA_outputID(plastic_disloUCLA_Noutput(instance),instance) = shear_rate_slip_ID plastic_disloUCLA_output(plastic_disloUCLA_Noutput(instance),instance) = & @@ -368,7 +368,7 @@ subroutine plastic_disloUCLA_init(fileUnit) plastic_disloUCLA_outputID(plastic_disloUCLA_Noutput(instance),instance) = twin_fraction_ID plastic_disloUCLA_output(plastic_disloUCLA_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case ('shear_rate_twin') + case ('shear_rate_twin','shearrate_twin') plastic_disloUCLA_Noutput(instance) = plastic_disloUCLA_Noutput(instance) + 1_pInt plastic_disloUCLA_outputID(plastic_disloUCLA_Noutput(instance),instance) = shear_rate_twin_ID plastic_disloUCLA_output(plastic_disloUCLA_Noutput(instance),instance) = & diff --git a/code/plastic_dislotwin.f90 b/code/plastic_dislotwin.f90 index 2988f803c..346554d4f 100644 --- a/code/plastic_dislotwin.f90 +++ b/code/plastic_dislotwin.f90 @@ -376,7 +376,7 @@ subroutine plastic_dislotwin_init(fileUnit) plastic_dislotwin_outputID(plastic_dislotwin_Noutput(instance),instance) = dipole_density_ID plastic_dislotwin_output(plastic_dislotwin_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case ('shear_rate_slip') + case ('shear_rate_slip','shearrate_slip') plastic_dislotwin_Noutput(instance) = plastic_dislotwin_Noutput(instance) + 1_pInt plastic_dislotwin_outputID(plastic_dislotwin_Noutput(instance),instance) = shear_rate_slip_ID plastic_dislotwin_output(plastic_dislotwin_Noutput(instance),instance) = & @@ -416,7 +416,7 @@ subroutine plastic_dislotwin_init(fileUnit) plastic_dislotwin_outputID(plastic_dislotwin_Noutput(instance),instance) = twin_fraction_ID plastic_dislotwin_output(plastic_dislotwin_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case ('shear_rate_twin') + case ('shear_rate_twin','shearrate_twin') plastic_dislotwin_Noutput(instance) = plastic_dislotwin_Noutput(instance) + 1_pInt plastic_dislotwin_outputID(plastic_dislotwin_Noutput(instance),instance) = shear_rate_twin_ID plastic_dislotwin_output(plastic_dislotwin_Noutput(instance),instance) = & @@ -446,7 +446,7 @@ subroutine plastic_dislotwin_init(fileUnit) plastic_dislotwin_outputID(plastic_dislotwin_Noutput(instance),instance) = resolved_stress_shearband_ID plastic_dislotwin_output(plastic_dislotwin_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case ('shear_rate_shearband') + case ('shear_rate_shearband','shearrate_shearband') plastic_dislotwin_Noutput(instance) = plastic_dislotwin_Noutput(instance) + 1_pInt plastic_dislotwin_outputID(plastic_dislotwin_Noutput(instance),instance) = shear_rate_shearband_ID plastic_dislotwin_output(plastic_dislotwin_Noutput(instance),instance) = & diff --git a/code/plastic_nonlocal.f90 b/code/plastic_nonlocal.f90 index 819fc9e96..20a0f204b 100644 --- a/code/plastic_nonlocal.f90 +++ b/code/plastic_nonlocal.f90 @@ -436,422 +436,422 @@ allocate(nonSchmidCoeff(lattice_maxNnonSchmid,maxNinstances), s select case(tag) case ('(output)') select case(IO_lc(IO_stringValue(line,positions,2_pInt))) - case('rho') + case ('rho') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('delta') + case ('delta') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = delta_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_edge') + case ('rho_edge') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_edge_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_screw') + case ('rho_screw') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_screw_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl') + case ('rho_sgl') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('delta_sgl') + case ('delta_sgl') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = delta_sgl_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl_edge') + case ('rho_sgl_edge') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_edge_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl_edge_pos') + case ('rho_sgl_edge_pos') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_edge_pos_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl_edge_neg') + case ('rho_sgl_edge_neg') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_edge_neg_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl_screw') + case ('rho_sgl_screw') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_screw_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl_screw_pos') + case ('rho_sgl_screw_pos') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_screw_pos_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl_screw_neg') + case ('rho_sgl_screw_neg') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_screw_neg_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl_mobile') + case ('rho_sgl_mobile') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_mobile_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl_edge_mobile') + case ('rho_sgl_edge_mobile') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_edge_mobile_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl_edge_pos_mobile') + case ('rho_sgl_edge_pos_mobile') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_edge_pos_mobile_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl_edge_neg_mobile') + case ('rho_sgl_edge_neg_mobile') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_edge_neg_mobile_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl_screw_mobile') + case ('rho_sgl_screw_mobile') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_screw_mobile_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl_screw_pos_mobile') + case ('rho_sgl_screw_pos_mobile') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_screw_pos_mobile_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl_screw_neg_mobile') + case ('rho_sgl_screw_neg_mobile') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_screw_neg_mobile_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl_immobile') + case ('rho_sgl_immobile') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_immobile_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl_edge_immobile') + case ('rho_sgl_edge_immobile') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_edge_immobile_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl_edge_pos_immobile') + case ('rho_sgl_edge_pos_immobile') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_edge_pos_immobile_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl_edge_neg_immobile') + case ('rho_sgl_edge_neg_immobile') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_edge_neg_immobile_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl_screw_immobile') + case ('rho_sgl_screw_immobile') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_screw_immobile_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl_screw_pos_immobile') + case ('rho_sgl_screw_pos_immobile') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_screw_pos_immobile_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_sgl_screw_neg_immobile') + case ('rho_sgl_screw_neg_immobile') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_sgl_screw_neg_immobile_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dip') + case ('rho_dip') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dip_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('delta_dip') + case ('delta_dip') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = delta_dip_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dip_edge') + case ('rho_dip_edge') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dip_edge_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dip_screw') + case ('rho_dip_screw') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dip_screw_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('excess_rho') + case ('excess_rho') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = excess_rho_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('excess_rho_edge') + case ('excess_rho_edge') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = excess_rho_edge_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('excess_rho_screw') + case ('excess_rho_screw') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = excess_rho_screw_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_forest') + case ('rho_forest') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_forest_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('shearrate') + case ('shearrate') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = shearrate_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('resolvedstress') + case ('resolvedstress') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = resolvedstress_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('resolvedstress_external') + case ('resolvedstress_external') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = resolvedstress_external_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('resolvedstress_back') + case ('resolvedstress_back') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = resolvedstress_back_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('resistance') + case ('resistance') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = resistance_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dot') + case ('rho_dot') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dot_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dot_sgl') + case ('rho_dot_sgl') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dot_sgl_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dot_sgl_mobile') + case ('rho_dot_sgl_mobile') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dot_sgl_mobile_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dot_dip') + case ('rho_dot_dip') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dot_dip_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dot_gen') + case ('rho_dot_gen') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dot_gen_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dot_gen_edge') + case ('rho_dot_gen_edge') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dot_gen_edge_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dot_gen_screw') + case ('rho_dot_gen_screw') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dot_gen_screw_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dot_sgl2dip') + case ('rho_dot_sgl2dip') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dot_sgl2dip_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dot_sgl2dip_edge') + case ('rho_dot_sgl2dip_edge') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dot_sgl2dip_edge_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dot_sgl2dip_screw') + case ('rho_dot_sgl2dip_screw') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dot_sgl2dip_screw_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dot_ann_ath') + case ('rho_dot_ann_ath') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dot_ann_ath_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dot_ann_the') + case ('rho_dot_ann_the') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dot_ann_the_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dot_ann_the_edge') + case ('rho_dot_ann_the_edge') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dot_ann_the_edge_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dot_ann_the_screw') + case ('rho_dot_ann_the_screw') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dot_ann_the_screw_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dot_edgejogs') + case ('rho_dot_edgejogs') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dot_edgejogs_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dot_flux') + case ('rho_dot_flux') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dot_flux_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dot_flux_mobile') + case ('rho_dot_flux_mobile') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dot_flux_mobile_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dot_flux_edge') + case ('rho_dot_flux_edge') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dot_flux_edge_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('rho_dot_flux_screw') + case ('rho_dot_flux_screw') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = rho_dot_flux_screw_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('velocity_edge_pos') + case ('velocity_edge_pos') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = velocity_edge_pos_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('velocity_edge_neg') + case ('velocity_edge_neg') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = velocity_edge_neg_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('velocity_screw_pos') + case ('velocity_screw_pos') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = velocity_screw_pos_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('velocity_screw_neg') + case ('velocity_screw_neg') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = velocity_screw_neg_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('slipdirection.x') + case ('slipdirection.x') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = slipdirectionx_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('slipdirection.y') + case ('slipdirection.y') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = slipdirectiony_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('slipdirection.z') + case ('slipdirection.z') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = slipdirectionz_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('slipnormal.x') + case ('slipnormal.x') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = slipnormalx_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('slipnormal.y') + case ('slipnormal.y') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = slipnormaly_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('slipnormal.z') + case ('slipnormal.z') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = slipnormalz_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('fluxdensity_edge_pos.x') + case ('fluxdensity_edge_pos.x') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = fluxdensity_edge_posx_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('fluxdensity_edge_pos.y') + case ('fluxdensity_edge_pos.y') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = fluxdensity_edge_posy_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('fluxdensity_edge_pos.z') + case ('fluxdensity_edge_pos.z') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = fluxdensity_edge_posz_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('fluxdensity_edge_neg.x') + case ('fluxdensity_edge_neg.x') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = fluxdensity_edge_negx_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('fluxdensity_edge_neg.y') + case ('fluxdensity_edge_neg.y') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = fluxdensity_edge_negy_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('fluxdensity_edge_neg.z') + case ('fluxdensity_edge_neg.z') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = fluxdensity_edge_negz_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('fluxdensity_screw_pos.x') + case ('fluxdensity_screw_pos.x') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = fluxdensity_screw_posx_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('fluxdensity_screw_pos.y') + case ('fluxdensity_screw_pos.y') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = fluxdensity_screw_posy_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('fluxdensity_screw_pos.z') + case ('fluxdensity_screw_pos.z') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = fluxdensity_screw_posz_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('fluxdensity_screw_neg.x') + case ('fluxdensity_screw_neg.x') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = fluxdensity_screw_negx_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('fluxdensity_screw_neg.y') + case ('fluxdensity_screw_neg.y') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = fluxdensity_screw_negy_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('fluxdensity_screw_neg.z') + case ('fluxdensity_screw_neg.z') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = fluxdensity_screw_negz_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('maximumdipoleheight_edge') + case ('maximumdipoleheight_edge') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = maximumdipoleheight_edge_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('maximumdipoleheight_screw') + case ('maximumdipoleheight_screw') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = maximumdipoleheight_screw_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('accumulatedshear') + case ('accumulatedshear','accumulated_shear') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = accumulatedshear_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case('dislocationstress') + case ('dislocationstress') plastic_nonlocal_Noutput(instance) = plastic_nonlocal_Noutput(instance) + 1_pInt plastic_nonlocal_outputID(plastic_nonlocal_Noutput(instance),instance) = dislocationstress_ID plastic_nonlocal_output(plastic_nonlocal_Noutput(instance),instance) = & diff --git a/code/plastic_phenopowerlaw.f90 b/code/plastic_phenopowerlaw.f90 index c1048d1cf..40e08f45e 100644 --- a/code/plastic_phenopowerlaw.f90 +++ b/code/plastic_phenopowerlaw.f90 @@ -269,7 +269,7 @@ subroutine plastic_phenopowerlaw_init(fileUnit) plastic_phenopowerlaw_outputID(plastic_phenopowerlaw_Noutput(instance),instance) = resistance_slip_ID plastic_phenopowerlaw_output(plastic_phenopowerlaw_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case ('accumulatedshear_slip') + case ('accumulatedshear_slip','accumulated_shear_slip') plastic_phenopowerlaw_Noutput(instance) = plastic_phenopowerlaw_Noutput(instance) + 1_pInt plastic_phenopowerlaw_outputID(plastic_phenopowerlaw_Noutput(instance),instance) = accumulatedshear_slip_ID plastic_phenopowerlaw_output(plastic_phenopowerlaw_Noutput(instance),instance) = & @@ -294,7 +294,7 @@ subroutine plastic_phenopowerlaw_init(fileUnit) plastic_phenopowerlaw_outputID(plastic_phenopowerlaw_Noutput(instance),instance) = resistance_twin_ID plastic_phenopowerlaw_output(plastic_phenopowerlaw_Noutput(instance),instance) = & IO_lc(IO_stringValue(line,positions,2_pInt)) - case ('accumulatedshear_twin') + case ('accumulatedshear_twin','accumulated_shear_twin') plastic_phenopowerlaw_Noutput(instance) = plastic_phenopowerlaw_Noutput(instance) + 1_pInt plastic_phenopowerlaw_outputID(plastic_phenopowerlaw_Noutput(instance),instance) = accumulatedshear_twin_ID plastic_phenopowerlaw_output(plastic_phenopowerlaw_Noutput(instance),instance) = &