From 3f71288e0ae7b6a180ac9020b9df26edef945232 Mon Sep 17 00:00:00 2001 From: Jaeyong Jung Date: Fri, 4 May 2018 14:09:49 +0200 Subject: [PATCH] Now, homogenization_RGC is fixed! --- src/homogenization_RGC.f90 | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) mode change 100644 => 100755 src/homogenization_RGC.f90 diff --git a/src/homogenization_RGC.f90 b/src/homogenization_RGC.f90 old mode 100644 new mode 100755 index fe9885215..95dab049f --- a/src/homogenization_RGC.f90 +++ b/src/homogenization_RGC.f90 @@ -166,52 +166,30 @@ subroutine homogenization_RGC_init(fileUnit) tag = IO_lc(IO_stringValue(line,chunkPos,1_pInt)) ! extract key select case(tag) case ('(output)') + homogenization_RGC_Noutput(i) = homogenization_RGC_Noutput(i) + 1_pInt + homogenization_RGC_output(homogenization_RGC_Noutput(i),i) = & + IO_lc(IO_stringValue(line,chunkPos,2_pInt)) select case(IO_lc(IO_stringValue(line,chunkPos,2_pInt))) case('constitutivework') - homogenization_RGC_Noutput(i) = homogenization_RGC_Noutput(i) + 1_pInt homogenization_RGC_outputID(homogenization_RGC_Noutput(i),i) = constitutivework_ID - homogenization_RGC_output(homogenization_RGC_Noutput(i),i) = & - IO_lc(IO_stringValue(line,chunkPos,2_pInt)) case('penaltyenergy') - homogenization_RGC_Noutput(i) = homogenization_RGC_Noutput(i) + 1_pInt homogenization_RGC_outputID(homogenization_RGC_Noutput(i),i) = penaltyenergy_ID - homogenization_RGC_output(homogenization_RGC_Noutput(i),i) = & - IO_lc(IO_stringValue(line,chunkPos,2_pInt)) case('volumediscrepancy') - homogenization_RGC_Noutput(i) = homogenization_RGC_Noutput(i) + 1_pInt homogenization_RGC_outputID(homogenization_RGC_Noutput(i),i) = volumediscrepancy_ID - homogenization_RGC_output(homogenization_RGC_Noutput(i),i) = & - IO_lc(IO_stringValue(line,chunkPos,2_pInt)) case('averagerelaxrate') - homogenization_RGC_Noutput(i) = homogenization_RGC_Noutput(i) + 1_pInt homogenization_RGC_outputID(homogenization_RGC_Noutput(i),i) = averagerelaxrate_ID - homogenization_RGC_output(homogenization_RGC_Noutput(i),i) = & - IO_lc(IO_stringValue(line,chunkPos,2_pInt)) case('maximumrelaxrate') - homogenization_RGC_Noutput(i) = homogenization_RGC_Noutput(i) + 1_pInt homogenization_RGC_outputID(homogenization_RGC_Noutput(i),i) = maximumrelaxrate_ID - homogenization_RGC_output(homogenization_RGC_Noutput(i),i) = & - IO_lc(IO_stringValue(line,chunkPos,2_pInt)) case('magnitudemismatch') - homogenization_RGC_Noutput(i) = homogenization_RGC_Noutput(i) + 1_pInt homogenization_RGC_outputID(homogenization_RGC_Noutput(i),i) = magnitudemismatch_ID - homogenization_RGC_output(homogenization_RGC_Noutput(i),i) = & - IO_lc(IO_stringValue(line,chunkPos,2_pInt)) case('ipcoords') - homogenization_RGC_Noutput(i) = homogenization_RGC_Noutput(i) + 1_pInt homogenization_RGC_outputID(homogenization_RGC_Noutput(i),i) = ipcoords_ID - homogenization_RGC_output(homogenization_RGC_Noutput(i),i) = & - IO_lc(IO_stringValue(line,chunkPos,2_pInt)) case('avgdefgrad','avgf') - homogenization_RGC_Noutput(i) = homogenization_RGC_Noutput(i) + 1_pInt homogenization_RGC_outputID(homogenization_RGC_Noutput(i),i) = avgdefgrad_ID - homogenization_RGC_output(homogenization_RGC_Noutput(i),i) = & - IO_lc(IO_stringValue(line,chunkPos,2_pInt)) case('avgp','avgfirstpiola','avg1stpiola') - homogenization_RGC_Noutput(i) = homogenization_RGC_Noutput(i) + 1_pInt homogenization_RGC_outputID(homogenization_RGC_Noutput(i),i) = avgfirstpiola_ID - homogenization_RGC_output(homogenization_RGC_Noutput(i),i) = & - IO_lc(IO_stringValue(line,chunkPos,2_pInt)) + case default + homogenization_RGC_Noutput(i) = homogenization_RGC_Noutput(i) -1_pInt ! correct for invalid end select case ('clustersize')