From 70a44fbbdd6226482ae8d2a936d063003451b326 Mon Sep 17 00:00:00 2001 From: Franz Roters Date: Thu, 15 Mar 2012 09:22:24 +0000 Subject: [PATCH] constitutive models need to skip new keyword elasticity when reading their arameters --- code/constitutive_dislotwin.f90 | 2 +- code/constitutive_nonlocal.f90 | 2 +- code/constitutive_phenopowerlaw.f90 | 2 +- code/constitutive_titanmod.f90 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/constitutive_dislotwin.f90 b/code/constitutive_dislotwin.f90 index 557c13381..9758b622e 100644 --- a/code/constitutive_dislotwin.f90 +++ b/code/constitutive_dislotwin.f90 @@ -300,7 +300,7 @@ do ! read thru sections of positions = IO_stringPos(line,maxNchunks) tag = IO_lc(IO_stringValue(line,positions,1_pInt)) ! extract key select case(tag) - case ('plasticity') + case ('plasticity', 'elasticity') cycle case ('(output)') constitutive_dislotwin_Noutput(i) = constitutive_dislotwin_Noutput(i) + 1_pInt diff --git a/code/constitutive_nonlocal.f90 b/code/constitutive_nonlocal.f90 index e7928ceae..725a9b70e 100644 --- a/code/constitutive_nonlocal.f90 +++ b/code/constitutive_nonlocal.f90 @@ -349,7 +349,7 @@ do positions = IO_stringPos(line,maxNchunks) tag = IO_lc(IO_stringValue(line,positions,1_pInt)) ! extract key select case(tag) - case('plasticity','/nonlocal/') + case('plasticity','elasticity','/nonlocal/') cycle case ('(output)') constitutive_nonlocal_Noutput(i) = constitutive_nonlocal_Noutput(i) + 1_pInt diff --git a/code/constitutive_phenopowerlaw.f90 b/code/constitutive_phenopowerlaw.f90 index 8a4a6db04..e8d637995 100644 --- a/code/constitutive_phenopowerlaw.f90 +++ b/code/constitutive_phenopowerlaw.f90 @@ -295,7 +295,7 @@ subroutine constitutive_phenopowerlaw_init(myFile) positions = IO_stringPos(line,maxNchunks) tag = IO_lc(IO_stringValue(line,positions,1_pInt)) ! extract key select case(tag) - case ('plasticity') + case ('plasticity','elasticity') cycle case ('(output)') constitutive_phenopowerlaw_Noutput(i) = constitutive_phenopowerlaw_Noutput(i) + 1_pInt diff --git a/code/constitutive_titanmod.f90 b/code/constitutive_titanmod.f90 index be491efad..e5a999d24 100644 --- a/code/constitutive_titanmod.f90 +++ b/code/constitutive_titanmod.f90 @@ -432,7 +432,7 @@ enddo positions = IO_stringPos(line,maxNchunks) tag = IO_lc(IO_stringValue(line,positions,1_pInt)) ! extract key select case(tag) - case ('plasticity') + case ('plasticity','elasticity') cycle case ('(output)') constitutive_titanmod_Noutput(i) = constitutive_titanmod_Noutput(i) + 1_pInt