From 3b5a5ab81294475f8f2e7e408e05c9acb6d4eb4d Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 11 Oct 2013 09:17:03 +0000 Subject: [PATCH] changed error in case of number of found interaction types is less than expected to warning --- code/IO.f90 | 8 ++++---- code/constitutive_dislotwin.f90 | 26 ++++++++++---------------- code/constitutive_none.f90 | 22 +++++++++++----------- code/constitutive_nonlocal.f90 | 4 ++-- code/constitutive_phenopowerlaw.f90 | 16 +++++++--------- code/constitutive_titanmod.f90 | 26 +++++++++++++++++++------- 6 files changed, 53 insertions(+), 49 deletions(-) diff --git a/code/IO.f90 b/code/IO.f90 index c8ca56390..f5a762906 100644 --- a/code/IO.f90 +++ b/code/IO.f90 @@ -1488,8 +1488,6 @@ subroutine IO_error(error_ID,el,ip,g,ext_msg) msg = 'material parameter out of bounds:' case (212_pInt) msg = 'unknown plasticity output:' - case (213_pInt) - msg = 'not enough values for material parameter:' case (214_pInt) msg = 'stiffness parameter close to zero:' @@ -1684,9 +1682,11 @@ subroutine IO_warning(warning_ID,el,ip,g,ext_msg) case (47_pInt) msg = 'no valid parameter for FFTW, using FFTW_PATIENT' case (50_pInt) - msg = 'not using all available slip system families' + msg = 'not all available slip system families are defined' case (51_pInt) - msg = 'not using all available twin system families' + msg = 'not all available twin system families are defined' + case (52_pInt) + msg = 'not all available parameters are defined' case (101_pInt) msg = 'crystallite debugging off' case (201_pInt) diff --git a/code/constitutive_dislotwin.f90 b/code/constitutive_dislotwin.f90 index d8e33c56f..37214ba57 100644 --- a/code/constitutive_dislotwin.f90 +++ b/code/constitutive_dislotwin.f90 @@ -382,17 +382,15 @@ subroutine constitutive_dislotwin_init(file) case ('c66') constitutive_dislotwin_Cslip_66(6,6,i) = IO_floatValue(line,positions,2_pInt) case ('nslip') - if (positions(1) < 1_pInt + Nchunks_SlipFamilies) then + if (positions(1) < 1_pInt + Nchunks_SlipFamilies) & call IO_warning(50_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_DISLOTWIN_label//')') - endif Nchunks_SlipFamilies = positions(1) - 1_pInt do j = 1_pInt, Nchunks_SlipFamilies constitutive_dislotwin_Nslip(j,i) = IO_intValue(line,positions,1_pInt+j) enddo case ('ntwin') - if (positions(1) < 1_pInt + Nchunks_TwinFamilies) then + if (positions(1) < 1_pInt + Nchunks_TwinFamilies) & call IO_warning(51_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_DISLOTWIN_label//')') - endif Nchunks_TwinFamilies = positions(1) - 1_pInt do j = 1_pInt, Nchunks_TwinFamilies constitutive_dislotwin_Ntwin(j,i) = IO_intValue(line,positions,1_pInt+j) @@ -468,30 +466,26 @@ subroutine constitutive_dislotwin_init(file) case ('catomicvolume') constitutive_dislotwin_CAtomicVolume(i) = IO_floatValue(line,positions,2_pInt) case ('interaction_slipslip','interactionslipslip') - if (positions(1) < 1_pInt + Nchunks_SlipSlip) then - call IO_error(213_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_DISLOTWIN_label//')') - endif + if (positions(1) < 1_pInt + Nchunks_SlipSlip) & + call IO_warning(52_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_DISLOTWIN_label//')') do j = 1_pInt, Nchunks_SlipSlip constitutive_dislotwin_interaction_SlipSlip(j,i) = IO_floatValue(line,positions,1_pInt+j) enddo case ('interaction_sliptwin','interactionsliptwin') - if (positions(1) < 1_pInt + Nchunks_SlipTwin) then - call IO_error(213_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_DISLOTWIN_label//')') - endif + if (positions(1) < 1_pInt + Nchunks_SlipTwin) & + call IO_warning(52_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_DISLOTWIN_label//')') do j = 1_pInt, Nchunks_SlipTwin constitutive_dislotwin_interaction_SlipTwin(j,i) = IO_floatValue(line,positions,1_pInt+j) enddo case ('interaction_twinslip','interactiontwinslip') - if (positions(1) < 1_pInt + Nchunks_TwinSlip) then - call IO_error(213_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_DISLOTWIN_label//')') - endif + if (positions(1) < 1_pInt + Nchunks_TwinSlip) & + call IO_warning(52_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_DISLOTWIN_label//')') do j = 1_pInt, Nchunks_TwinSlip constitutive_dislotwin_interaction_TwinSlip(j,i) = IO_floatValue(line,positions,1_pInt+j) enddo case ('interaction_twintwin','interactiontwintwin') - if (positions(1) < 1_pInt + Nchunks_TwinTwin) then - call IO_error(213_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_DISLOTWIN_label//')') - endif + if (positions(1) < 1_pInt + Nchunks_TwinTwin) & + call IO_warning(52_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_DISLOTWIN_label//')') do j = 1_pInt, Nchunks_TwinTwin constitutive_dislotwin_interaction_TwinTwin(j,i) = IO_floatValue(line,positions,1_pInt+j) enddo diff --git a/code/constitutive_none.f90 b/code/constitutive_none.f90 index e7e524776..db27b9057 100644 --- a/code/constitutive_none.f90 +++ b/code/constitutive_none.f90 @@ -144,27 +144,27 @@ subroutine constitutive_none_init(myFile) case ('plasticity','elasticity') cycle case ('lattice_structure') - constitutive_none_structureName(i) = IO_lc(IO_stringValue(line,positions,2_pInt)) + constitutive_none_structureName(i) = IO_lc(IO_stringValue(line,positions,2_pInt)) case ('c11') - constitutive_none_Cslip_66(1,1,i) = IO_floatValue(line,positions,2_pInt) + constitutive_none_Cslip_66(1,1,i) = IO_floatValue(line,positions,2_pInt) case ('c12') - constitutive_none_Cslip_66(1,2,i) = IO_floatValue(line,positions,2_pInt) + constitutive_none_Cslip_66(1,2,i) = IO_floatValue(line,positions,2_pInt) case ('c13') - constitutive_none_Cslip_66(1,3,i) = IO_floatValue(line,positions,2_pInt) + constitutive_none_Cslip_66(1,3,i) = IO_floatValue(line,positions,2_pInt) case ('c22') - constitutive_none_Cslip_66(2,2,i) = IO_floatValue(line,positions,2_pInt) + constitutive_none_Cslip_66(2,2,i) = IO_floatValue(line,positions,2_pInt) case ('c23') - constitutive_none_Cslip_66(2,3,i) = IO_floatValue(line,positions,2_pInt) + constitutive_none_Cslip_66(2,3,i) = IO_floatValue(line,positions,2_pInt) case ('c33') - constitutive_none_Cslip_66(3,3,i) = IO_floatValue(line,positions,2_pInt) + constitutive_none_Cslip_66(3,3,i) = IO_floatValue(line,positions,2_pInt) case ('c44') - constitutive_none_Cslip_66(4,4,i) = IO_floatValue(line,positions,2_pInt) + constitutive_none_Cslip_66(4,4,i) = IO_floatValue(line,positions,2_pInt) case ('c55') - constitutive_none_Cslip_66(5,5,i) = IO_floatValue(line,positions,2_pInt) + constitutive_none_Cslip_66(5,5,i) = IO_floatValue(line,positions,2_pInt) case ('c66') - constitutive_none_Cslip_66(6,6,i) = IO_floatValue(line,positions,2_pInt) + constitutive_none_Cslip_66(6,6,i) = IO_floatValue(line,positions,2_pInt) case default - call IO_error(210_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_NONE_label//')') + call IO_error(210_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_NONE_label//')') end select endif endif diff --git a/code/constitutive_nonlocal.f90 b/code/constitutive_nonlocal.f90 index 0f1f119f3..fd991a9ce 100644 --- a/code/constitutive_nonlocal.f90 +++ b/code/constitutive_nonlocal.f90 @@ -531,7 +531,7 @@ do while (trim(line) /= '#EOF#') significantN(i) = IO_floatValue(line,positions,2_pInt) case ('interaction_slipslip') if (positions(1) < 1_pInt + Nchunks_SlipSlip) & - call IO_error(213_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_NONLOCAL_LABEL//')') + call IO_warning(52_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_NONLOCAL_LABEL//')') do it = 1_pInt,Nchunks_SlipSlip interactionSlipSlip(it,i) = IO_floatValue(line,positions,1_pInt+it) enddo @@ -581,7 +581,7 @@ do while (trim(line) /= '#EOF#') shortRangeStressCorrection(i) = IO_floatValue(line,positions,2_pInt) > 0.0_pReal case ('nonschmid_coefficients') if (positions(1) < 1_pInt + Nchunks_nonSchmid) & - call IO_error(213_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_NONLOCAL_LABEL//')') + call IO_warning(52_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_NONLOCAL_LABEL//')') do f = 1_pInt,Nchunks_nonSchmid nonSchmidCoeff(f,i) = IO_floatValue(line,positions,1_pInt+f) enddo diff --git a/code/constitutive_phenopowerlaw.f90 b/code/constitutive_phenopowerlaw.f90 index 58317d19e..b43d59782 100644 --- a/code/constitutive_phenopowerlaw.f90 +++ b/code/constitutive_phenopowerlaw.f90 @@ -318,9 +318,8 @@ subroutine constitutive_phenopowerlaw_init(myFile) if (abs(constitutive_phenopowerlaw_Cslip_66(6,6,i)) < tol_math_check) & call IO_error(214_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_PHENOPOWERLAW_label//')') case ('nslip') - if (positions(1) < 1_pInt + Nchunks_SlipFamilies) then + if (positions(1) < 1_pInt + Nchunks_SlipFamilies) & call IO_warning(50_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_PHENOPOWERLAW_label//')') - endif Nchunks_SlipFamilies = positions(1) - 1_pInt do j = 1_pInt, Nchunks_SlipFamilies constitutive_phenopowerlaw_Nslip(j,i) = IO_intValue(line,positions,1_pInt+j) @@ -340,9 +339,8 @@ subroutine constitutive_phenopowerlaw_init(myFile) case ('a_slip', 'w0_slip') constitutive_phenopowerlaw_a_slip(i) = IO_floatValue(line,positions,2_pInt) case ('ntwin') - if (positions(1) < 1_pInt + Nchunks_TwinFamilies) then + if (positions(1) < 1_pInt + Nchunks_TwinFamilies) & call IO_warning(51_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_PHENOPOWERLAW_label//')') - endif Nchunks_TwinFamilies = positions(1) - 1_pInt do j = 1_pInt, Nchunks_TwinFamilies constitutive_phenopowerlaw_Ntwin(j,i) = IO_intValue(line,positions,1_pInt+j) @@ -382,31 +380,31 @@ subroutine constitutive_phenopowerlaw_init(myFile) constitutive_phenopowerlaw_aTolTwinfrac(i) = IO_floatValue(line,positions,2_pInt) case ('interaction_slipslip') if (positions(1) < 1_pInt + Nchunks_SlipSlip) & - call IO_error(213_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_PHENOPOWERLAW_label//')') + call IO_warning(52_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_PHENOPOWERLAW_label//')') do j = 1_pInt, Nchunks_SlipSlip constitutive_phenopowerlaw_interaction_SlipSlip(j,i) = IO_floatValue(line,positions,1_pInt+j) enddo case ('interaction_sliptwin') if (positions(1) < 1_pInt + Nchunks_SlipTwin) & - call IO_error(213_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_PHENOPOWERLAW_label//')') + call IO_warning(52_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_PHENOPOWERLAW_label//')') do j = 1_pInt, Nchunks_SlipTwin constitutive_phenopowerlaw_interaction_SlipTwin(j,i) = IO_floatValue(line,positions,1_pInt+j) enddo case ('interaction_twinslip') if (positions(1) < 1_pInt + Nchunks_TwinSlip) & - call IO_error(213_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_PHENOPOWERLAW_label//')') + call IO_warning(52_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_PHENOPOWERLAW_label//')') do j = 1_pInt, Nchunks_TwinSlip constitutive_phenopowerlaw_interaction_TwinSlip(j,i) = IO_floatValue(line,positions,1_pInt+j) enddo case ('interaction_twintwin') if (positions(1) < 1_pInt + Nchunks_TwinTwin) & - call IO_error(213_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_PHENOPOWERLAW_label//')') + call IO_warning(52_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_PHENOPOWERLAW_label//')') do j = 1_pInt, Nchunks_TwinTwin constitutive_phenopowerlaw_interaction_TwinTwin(j,i) = IO_floatValue(line,positions,1_pInt+j) enddo case ('nonschmid_coefficients') if (positions(1) < 1_pInt + Nchunks_nonSchmid) & - call IO_error(213_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_PHENOPOWERLAW_label//')') + call IO_warning(52_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_PHENOPOWERLAW_label//')') do j = 1_pInt,Nchunks_nonSchmid constitutive_phenopowerlaw_nonSchmidCoeff(j,i) = IO_floatValue(line,positions,1_pInt+j) enddo diff --git a/code/constitutive_titanmod.f90 b/code/constitutive_titanmod.f90 index 5f5e9ab1e..645f2677a 100644 --- a/code/constitutive_titanmod.f90 +++ b/code/constitutive_titanmod.f90 @@ -450,10 +450,14 @@ subroutine constitutive_titanmod_init(myFile) case ('kinkf0') constitutive_titanmod_kinkf0(i) = IO_floatValue(line,positions,2_pInt) case ('nslip') + if (positions(1) < 1_pInt + Nchunks_SlipFamilies) & + call IO_warning(50_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_TITANMOD_label//')') do j = 1_pInt, Nchunks_SlipFamilies constitutive_titanmod_Nslip(j,i) = IO_intValue(line,positions,1_pInt+j) enddo case ('ntwin') + if (positions(1) < 1_pInt + Nchunks_TwinFamilies) & + call IO_warning(51_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_TITANMOD_label//')') do j = 1_pInt, Nchunks_TwinFamilies constitutive_titanmod_Ntwin(j,i) = IO_intValue(line,positions,1_pInt+j) enddo @@ -571,10 +575,6 @@ subroutine constitutive_titanmod_init(myFile) constitutive_titanmod_twinhpconstant(i) = IO_floatValue(line,positions,2_pInt) case ('atol_rho') constitutive_titanmod_aTolRho(i) = IO_floatValue(line,positions,2_pInt) - case ('interactionslipslip') - do j = 1_pInt, Nchunks_SlipSlip - constitutive_titanmod_interactionSlipSlip(j,i) = IO_floatValue(line,positions,1_pInt+j) - enddo case ('interactionee') do j = 1_pInt, lattice_maxNinteraction constitutive_titanmod_interaction_ee(j,i) = IO_floatValue(line,positions,1_pInt+j) @@ -587,15 +587,27 @@ subroutine constitutive_titanmod_init(myFile) do j = 1_pInt, lattice_maxNinteraction constitutive_titanmod_interaction_es(j,i) = IO_floatValue(line,positions,1_pInt+j) enddo - case ('interactionsliptwin') + case ('interaction_slipslip','interactionslipslip') + if (positions(1) < 1_pInt + Nchunks_SlipSlip) & + call IO_warning(52_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_TITANMOD_label//')') + do j = 1_pInt, Nchunks_SlipSlip + constitutive_titanmod_interactionSlipSlip(j,i) = IO_floatValue(line,positions,1_pInt+j) + enddo + case ('interaction_sliptwin','interactionsliptwin') + if (positions(1) < 1_pInt + Nchunks_SlipTwin) & + call IO_warning(52_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_TITANMOD_label//')') do j = 1_pInt, Nchunks_SlipTwin constitutive_titanmod_interactionSlipTwin(j,i) = IO_floatValue(line,positions,1_pInt+j) enddo - case ('interactiontwinslip') + case ('interaction_twinslip','interactiontwinslip') + if (positions(1) < 1_pInt + Nchunks_TwinSlip) & + call IO_warning(52_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_TITANMOD_label//')') do j = 1_pInt, Nchunks_TwinSlip constitutive_titanmod_interactionTwinSlip(j,i) = IO_floatValue(line,positions,1_pInt+j) enddo - case ('interactiontwintwin') + case ('interaction_twintwin','interactiontwintwin') + if (positions(1) < 1_pInt + Nchunks_TwinTwin) & + call IO_warning(52_pInt,ext_msg=trim(tag)//' ('//CONSTITUTIVE_TITANMOD_label//')') do j = 1_pInt, Nchunks_TwinTwin constitutive_titanmod_interactionTwinTwin(j,i) = IO_floatValue(line,positions,1_pInt+j) enddo