From e1c5671e1f11e3e0f6b41042177b463ec5d39061 Mon Sep 17 00:00:00 2001 From: Taymor El Achkar Date: Thu, 24 May 2012 14:08:48 +0000 Subject: [PATCH] relaxed error message triggering such that purely elastic calculations and more than one constitutive instance using hex lattice are possible. no twinning possible if no slip system exists --- code/constitutive_dislotwin.f90 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/constitutive_dislotwin.f90 b/code/constitutive_dislotwin.f90 index 83e5fed05..205c88f46 100644 --- a/code/constitutive_dislotwin.f90 +++ b/code/constitutive_dislotwin.f90 @@ -418,9 +418,11 @@ enddo myStructure = constitutive_dislotwin_structure(i) !* Sanity checks - if (myStructure < 1_pInt .or. myStructure > 3_pInt) call IO_error(205_pInt,e=i) - if (sum(constitutive_dislotwin_Nslip(:,i)) <= 0_pInt) call IO_error(241_pInt,e=i,ext_msg='nslip') - if (sum(constitutive_dislotwin_Ntwin(:,i)) < 0_pInt) call IO_error(241_pInt,e=i,ext_msg='ntwin') + if (myStructure < 1_pInt ) call IO_error(205_pInt,e=i) + if (sum(constitutive_dislotwin_Nslip(:,i)) < 0_pInt) call IO_error(241_pInt,e=i,ext_msg='nslip') + if (sum(constitutive_dislotwin_Ntwin(:,i)) < 0_pInt) call IO_error(241_pInt,e=i,ext_msg='ntwin') + if (sum(constitutive_dislotwin_Nslip(:,i)) == 0_pInt .and. & + sum(constitutive_dislotwin_Ntwin(:,i)) > 0_pInt) call IO_error(241_pInt,e=i,ext_msg='nslip/ntwin') do f = 1_pInt,lattice_maxNslipFamily if (constitutive_dislotwin_Nslip(f,i) > 0_pInt) then if (constitutive_dislotwin_rhoEdge0(f,i) < 0.0_pReal) call IO_error(241_pInt,e=i,ext_msg='rhoEdge0')