From 34980a1d4498e77e9c44fa94779d9b0d8a5a4f81 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 8 Sep 2015 19:44:32 +0000 Subject: [PATCH] more logical structure when reading in --- code/plastic_phenopowerlaw.f90 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/plastic_phenopowerlaw.f90 b/code/plastic_phenopowerlaw.f90 index 75a4c4baa..8c585630e 100644 --- a/code/plastic_phenopowerlaw.f90 +++ b/code/plastic_phenopowerlaw.f90 @@ -369,6 +369,12 @@ subroutine plastic_phenopowerlaw_init(fileUnit) enddo !-------------------------------------------------------------------------------------------------- ! parameters depending on number of interactions + case ('interaction_slipslip') + if (chunkPos(1) < 1_pInt + Nchunks_SlipSlip) & + call IO_warning(52_pInt,ext_msg=trim(tag)//' ('//PLASTICITY_PHENOPOWERLAW_label//')') + do j = 1_pInt, Nchunks_SlipSlip + plastic_phenopowerlaw_interaction_SlipSlip(j,instance) = IO_floatValue(line,chunkPos,1_pInt+j) + enddo case ('interaction_sliptwin') if (chunkPos(1) < 1_pInt + Nchunks_SlipTwin) & call IO_warning(52_pInt,ext_msg=trim(tag)//' ('//PLASTICITY_PHENOPOWERLAW_label//')') @@ -437,12 +443,6 @@ subroutine plastic_phenopowerlaw_init(fileUnit) plastic_phenopowerlaw_Cgro(instance) = IO_floatValue(line,chunkPos,2_pInt) case ('deltag') plastic_phenopowerlaw_deltaG(instance) = IO_floatValue(line,chunkPos,2_pInt) - case ('interaction_slipslip') - if (chunkPos(1) < 1_pInt + Nchunks_SlipSlip) & - call IO_warning(52_pInt,ext_msg=trim(tag)//' ('//PLASTICITY_PHENOPOWERLAW_label//')') - do j = 1_pInt, Nchunks_SlipSlip - plastic_phenopowerlaw_interaction_SlipSlip(j,instance) = IO_floatValue(line,chunkPos,1_pInt+j) - enddo case default end select @@ -973,8 +973,8 @@ subroutine plastic_phenopowerlaw_dotState(Tstar_v,ipc,ip,el) index_myFamily = sum(lattice_NtwinSystem(1:f-1_pInt,ph)) ! at which index starts my family twinSystems1: do i = 1_pInt,plastic_phenopowerlaw_Ntwin(f,instance) j = j+1_pInt - left_TwinSlip(j) = 1.0_pReal ! no system-dependent right part - left_TwinTwin(j) = 1.0_pReal ! no system-dependent right part + left_TwinSlip(j) = 1.0_pReal ! no system-dependent left part + left_TwinTwin(j) = 1.0_pReal ! no system-dependent left part right_SlipTwin(j) = 1.0_pReal ! no system-dependent right part right_TwinTwin(j) = 1.0_pReal ! no system-dependent right part