223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

grid does reading in of geometry independently

This commit is contained in:
Martin Diehl 2019-02-03 08:06:53 +01:00
parent 1eb30f3ae7
commit a92937a7e3
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/IO.f90
View File

@ -44,18 +44,22 @@ module IO
IO_lc, & IO_lc, &
IO_skipChunks, & IO_skipChunks, &
IO_extractValue, & IO_extractValue, &
IO_countDataLines, &
IO_countNumericalDataLines, &
IO_countContinuousIntValues, &
IO_continuousIntValues, &
IO_error, & IO_error, &
IO_warning, & IO_warning, &
IO_intOut, & IO_intOut, &
IO_timeStamp IO_timeStamp
#if defined(Marc4DAMASK) || defined(Abaqus) #if defined(Marc4DAMASK) || defined(Abaqus)
public :: & public :: &
#ifdef Abaqus
IO_countDataLines, &
#endif
#ifdef Marc4DAMASK
IO_countNumericalDataLines, &
#endif
IO_open_inputFile, & IO_open_inputFile, &
IO_open_logFile IO_open_logFile, &
IO_countContinuousIntValues, &
IO_continuousIntValues
#endif #endif
private :: & private :: &
IO_fixedFloatValue, & IO_fixedFloatValue, &
@ -889,6 +893,7 @@ character(len=300) pure function IO_extractValue(pair,key)
end function IO_extractValue end function IO_extractValue
#ifdef Abaqus
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief count lines containig data up to next *keyword !> @brief count lines containig data up to next *keyword
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
@ -919,8 +924,10 @@ integer(pInt) function IO_countDataLines(fileUnit)
backspace(fileUnit) backspace(fileUnit)
end function IO_countDataLines end function IO_countDataLines
#endif
#ifdef Marc4DAMASK
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief count lines containig data up to next *keyword !> @brief count lines containig data up to next *keyword
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
@ -951,12 +958,14 @@ integer(pInt) function IO_countNumericalDataLines(fileUnit)
backspace(fileUnit) backspace(fileUnit)
end function IO_countNumericalDataLines end function IO_countNumericalDataLines
#endif
#if defined(Abaqus) || defined(Marc4DAMASK)
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief count items in consecutive lines depending on lines !> @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 !> @details Marc: ints concatenated by "c" as last char or range of values a "to" b
!> Abaqus: triplet of start,stop,inc !> Abaqus: triplet of start,stop,inc
!> Spectral: ints concatenated range of a "to" b, multiple entries with a "of" b
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
integer(pInt) function IO_countContinuousIntValues(fileUnit) integer(pInt) function IO_countContinuousIntValues(fileUnit)
@ -972,7 +981,7 @@ integer(pInt) function IO_countContinuousIntValues(fileUnit)
IO_countContinuousIntValues = 0_pInt IO_countContinuousIntValues = 0_pInt
line = '' line = ''
#ifndef Abaqus #if defined(Marc4DAMASK)
do while (trim(line) /= IO_EOF) do while (trim(line) /= IO_EOF)
line = IO_read(fileUnit) line = IO_read(fileUnit)
chunkPos = IO_stringPos(line) chunkPos = IO_stringPos(line)
@ -984,10 +993,6 @@ integer(pInt) function IO_countContinuousIntValues(fileUnit)
- IO_intValue(line,chunkPos,1_pInt)) - IO_intValue(line,chunkPos,1_pInt))
line = IO_read(fileUnit, .true.) ! reset IO_read line = IO_read(fileUnit, .true.) ! reset IO_read
exit ! only one single range indicator allowed exit ! only one single range indicator allowed
else if (IO_lc(IO_stringValue(line,chunkPos,2_pInt)) == 'of' ) then ! found multiple entries indicator
IO_countContinuousIntValues = IO_intValue(line,chunkPos,1_pInt)
line = IO_read(fileUnit, .true.) ! reset IO_read
exit ! only one single multiplier allowed
else else
IO_countContinuousIntValues = IO_countContinuousIntValues+chunkPos(1)-1_pInt ! add line's count when assuming 'c' IO_countContinuousIntValues = IO_countContinuousIntValues+chunkPos(1)-1_pInt ! add line's count when assuming 'c'
if ( IO_lc(IO_stringValue(line,chunkPos,chunkPos(1))) /= 'c' ) then ! line finished, read last value if ( IO_lc(IO_stringValue(line,chunkPos,chunkPos(1))) /= 'c' ) then ! line finished, read last value
@ -997,14 +1002,14 @@ integer(pInt) function IO_countContinuousIntValues(fileUnit)
endif endif
endif endif
enddo enddo
#else #elif defined(Abaqus)
c = IO_countDataLines(fileUnit) c = IO_countDataLines(fileUnit)
do l = 1_pInt,c do l = 1_pInt,c
backspace(fileUnit) ! ToDo: substitute by rewind? backspace(fileUnit)
enddo enddo
l = 1_pInt l = 1_pInt
do while (trim(line) /= IO_EOF .and. l <= c) ! ToDo: is this correct do while (trim(line) /= IO_EOF .and. l <= c) ! ToDo: is this correct?
l = l + 1_pInt l = l + 1_pInt
line = IO_read(fileUnit) line = IO_read(fileUnit)
chunkPos = IO_stringPos(line) chunkPos = IO_stringPos(line)
@ -1022,7 +1027,6 @@ end function IO_countContinuousIntValues
!! First integer in array is counter !! First integer in array is counter
!> @details Marc: ints concatenated by "c" as last char, range of a "to" b, or named set !> @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 !! Abaqus: triplet of start,stop,inc or named set
!! Spectral: ints concatenated range of a "to" b, multiple entries with a "of" b
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
function IO_continuousIntValues(fileUnit,maxN,lookupName,lookupMap,lookupMaxN) function IO_continuousIntValues(fileUnit,maxN,lookupName,lookupMap,lookupMaxN)
@ -1046,7 +1050,7 @@ function IO_continuousIntValues(fileUnit,maxN,lookupName,lookupMap,lookupMaxN)
IO_continuousIntValues = 0_pInt IO_continuousIntValues = 0_pInt
rangeGeneration = .false. rangeGeneration = .false.
#ifndef Abaqus #if defined(Marc4DAMASK)
do do
read(fileUnit,'(A65536)',end=100) line read(fileUnit,'(A65536)',end=100) line
chunkPos = IO_stringPos(line) chunkPos = IO_stringPos(line)
@ -1068,10 +1072,6 @@ function IO_continuousIntValues(fileUnit,maxN,lookupName,lookupMap,lookupMaxN)
IO_continuousIntValues(1+IO_continuousIntValues(1)) = i IO_continuousIntValues(1+IO_continuousIntValues(1)) = i
enddo enddo
exit exit
else if (chunkPos(1) > 2_pInt .and. IO_lc(IO_stringValue(line,chunkPos,2_pInt)) == 'of' ) then ! found multiple entries indicator
IO_continuousIntValues(1) = IO_intValue(line,chunkPos,1_pInt)
IO_continuousIntValues(2:IO_continuousIntValues(1)+1) = IO_intValue(line,chunkPos,3_pInt)
exit
else else
do i = 1_pInt,chunkPos(1)-1_pInt ! interpret up to second to last value do i = 1_pInt,chunkPos(1)-1_pInt ! interpret up to second to last value
IO_continuousIntValues(1) = IO_continuousIntValues(1) + 1_pInt IO_continuousIntValues(1) = IO_continuousIntValues(1) + 1_pInt
@ -1084,7 +1084,7 @@ function IO_continuousIntValues(fileUnit,maxN,lookupName,lookupMap,lookupMaxN)
endif endif
endif endif
enddo enddo
#else #elif defined(Abaqus)
c = IO_countDataLines(fileUnit) c = IO_countDataLines(fileUnit)
do l = 1_pInt,c do l = 1_pInt,c
backspace(fileUnit) backspace(fileUnit)
@ -1130,6 +1130,7 @@ function IO_continuousIntValues(fileUnit,maxN,lookupName,lookupMap,lookupMaxN)
#endif #endif
100 end function IO_continuousIntValues 100 end function IO_continuousIntValues
#endif
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------