From 4a6e08bb6945bbbc3d096f430ef10322b1b403fa Mon Sep 17 00:00:00 2001 From: Christoph Kords Date: Thu, 18 Oct 2012 10:17:16 +0000 Subject: [PATCH] changed keyword in spectral geometry file for multiplication of entries from "copies of" to "of" --- code/IO.f90 | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/code/IO.f90 b/code/IO.f90 index 09192f6c4..ecf9a6261 100644 --- a/code/IO.f90 +++ b/code/IO.f90 @@ -1104,7 +1104,7 @@ end function IO_countDataLines !> @brief count items in consecutive lines depending on lines !> @details Marc: ints concatenated by "c" as last char or range of values a "to" b !> Abaqus: triplet of start,stop,inc -!> Spectral: ints concatenated range of a "to" b, multiple entries with a "copies of" b +!> Spectral: ints concatenated range of a "to" b, multiple entries with a "of" b !-------------------------------------------------------------------------------------------------- integer(pInt) function IO_countContinuousIntValues(myUnit) @@ -1127,8 +1127,7 @@ integer(pInt) function IO_countContinuousIntValues(myUnit) if (IO_lc(IO_stringValue(line,myPos,2_pInt)) == 'to' ) then ! found range indicator IO_countContinuousIntValues = 1_pInt + IO_intValue(line,myPos,3_pInt) - IO_intValue(line,myPos,1_pInt) exit ! only one single range indicator allowed - else if (IO_lc(IO_stringValue(line,myPos,2_pInt)) == 'copies' .and. & - IO_lc(IO_stringValue(line,myPos,3_pInt)) == 'of' ) then ! found multiple entries indicator + else if (IO_lc(IO_stringValue(line,myPos,2_pInt)) == 'of' ) then ! found multiple entries indicator IO_countContinuousIntValues = IO_intValue(line,myPos,1_pInt) exit ! only one single multiplier allowed else @@ -1162,7 +1161,7 @@ integer(pInt) function IO_countContinuousIntValues(myUnit) ! First integer in array is counter !> @details Marc: ints concatenated by "c" as last char, range of a "to" b, or named set ! Abaqus: triplet of start,stop,inc or named set -! Spectral: ints concatenated range of a "to" b, multiple entries with a "copies of" b +! Spectral: ints concatenated range of a "to" b, multiple entries with a "of" b !-------------------------------------------------------------------------------------------------- function IO_continuousIntValues(myUnit,maxN,lookupName,lookupMap,lookupMaxN) @@ -1205,10 +1204,9 @@ function IO_continuousIntValues(myUnit,maxN,lookupName,lookupMap,lookupMaxN) IO_continuousIntValues(1+IO_continuousIntValues(1)) = i enddo exit - else if (myPos(1) > 3_pInt .and. IO_lc(IO_stringValue(line,myPos,2_pInt)) == 'copies' & - .and. IO_lc(IO_stringValue(line,myPos,3_pInt)) == 'of' ) then ! found multiple entries indicator + else if (myPos(1) > 2_pInt .and. IO_lc(IO_stringValue(line,myPos,2_pInt)) == 'of' ) then ! found multiple entries indicator IO_continuousIntValues(1) = IO_intValue(line,myPos,1_pInt) - IO_continuousIntValues(2:IO_continuousIntValues(1)+1) = IO_intValue(line,myPos,4_pInt) + IO_continuousIntValues(2:IO_continuousIntValues(1)+1) = IO_intValue(line,myPos,3_pInt) exit else do i = 1_pInt,myPos(1)-1_pInt ! interpret up to second to last value