From 831e905b16f3fdeda6a2a350f63cffdbbc0c0390 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 20 Dec 2013 11:13:12 +0000 Subject: [PATCH] added missing lp output to crystallite --- code/constitutive_phenopowerlaw.f90 | 21 ++++++++++----------- code/crystallite.f90 | 3 +++ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/code/constitutive_phenopowerlaw.f90 b/code/constitutive_phenopowerlaw.f90 index f0377d095..9bf6a987b 100644 --- a/code/constitutive_phenopowerlaw.f90 +++ b/code/constitutive_phenopowerlaw.f90 @@ -273,7 +273,6 @@ subroutine constitutive_phenopowerlaw_init(fileUnit) tag = IO_lc(IO_stringValue(line,positions,1_pInt)) ! extract key select case(tag) case ('plasticity','elasticity') - cycle case ('(output)') constitutive_phenopowerlaw_Noutput(i) = constitutive_phenopowerlaw_Noutput(i) + 1_pInt constitutive_phenopowerlaw_output(constitutive_phenopowerlaw_Noutput(i),i) = & @@ -305,16 +304,16 @@ subroutine constitutive_phenopowerlaw_init(fileUnit) case ('lattice_structure') structure = IO_lc(IO_stringValue(line,positions,2_pInt)) select case(structure(1:3)) - case(LATTICE_iso_label) - constitutive_phenopowerlaw_structureID(i) = LATTICE_iso_ID - case(LATTICE_fcc_label) - constitutive_phenopowerlaw_structureID(i) = LATTICE_fcc_ID - case(LATTICE_bcc_label) - constitutive_phenopowerlaw_structureID(i) = LATTICE_bcc_ID - case(LATTICE_hex_label) - constitutive_phenopowerlaw_structureID(i) = LATTICE_hex_ID - case(LATTICE_ort_label) - constitutive_phenopowerlaw_structureID(i) = LATTICE_ort_ID + case(LATTICE_iso_label) + constitutive_phenopowerlaw_structureID(i) = LATTICE_iso_ID + case(LATTICE_fcc_label) + constitutive_phenopowerlaw_structureID(i) = LATTICE_fcc_ID + case(LATTICE_bcc_label) + constitutive_phenopowerlaw_structureID(i) = LATTICE_bcc_ID + case(LATTICE_hex_label) + constitutive_phenopowerlaw_structureID(i) = LATTICE_hex_ID + case(LATTICE_ort_label) + constitutive_phenopowerlaw_structureID(i) = LATTICE_ort_ID end select configNchunks = lattice_configNchunks(constitutive_phenopowerlaw_structureID(i)) Nchunks_SlipFamilies = configNchunks(1) diff --git a/code/crystallite.f90 b/code/crystallite.f90 index f1dbca371..4f64e0174 100644 --- a/code/crystallite.f90 +++ b/code/crystallite.f90 @@ -308,6 +308,7 @@ subroutine crystallite_init(temperature) if (IO_getTag(line,'[',']') /= '') then ! next section section = section + 1_pInt output = 0_pInt ! reset output counter + cycle ! skip to next line endif if (section > 0_pInt) then positions = IO_stringPos(line,maxNchunks) @@ -343,6 +344,8 @@ subroutine crystallite_init(temperature) crystallite_outputID(output,section) = fe_ID case ('fp') crystallite_outputID(output,section) = fp_ID + case ('lp') + crystallite_outputID(output,section) = lp_ID case ('e') crystallite_outputID(output,section) = e_ID case ('ee')