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

line should have the correct return value

This commit is contained in:
Martin Diehl 2018-06-03 14:27:43 +02:00
parent ad094f81f0
commit ab4f5413c6
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/material.f90
View File

@ -1157,33 +1157,33 @@ character(len=65536) function material_parseTexture(fileUnit)
character(len=256), dimension(:), allocatable :: bla character(len=256), dimension(:), allocatable :: bla
logical :: echo logical :: echo
character(len=65536) :: line, tag,devNull character(len=65536) :: line, tag,devNull, line2
allocate(textureConfig(0)) allocate(textureConfig(0))
t = 0_pInt t = 0_pInt
do while (trim(line) /= IO_EOF) ! read through sections of material part do while (trim(line2) /= IO_EOF) ! read through sections of material part
line = IO_read(fileUnit) line2 = IO_read(fileUnit)
if (IO_isBlank(line)) cycle ! skip empty lines if (IO_isBlank(line2)) cycle ! skip empty lines
foundNextPart: if (IO_getTag(line,'<','>') /= '') then foundNextPart: if (IO_getTag(line2,'<','>') /= '') then
devNull = IO_read(fileUnit, .true.) ! reset IO_read devNull = IO_read(fileUnit, .true.) ! reset IO_read
exit exit
endif foundNextPart endif foundNextPart
nextSection: if (IO_getTag(line,'[',']') /= '') then nextSection: if (IO_getTag(line2,'[',']') /= '') then
t = t + 1_pInt t = t + 1_pInt
textureConfig = [textureConfig, emptyList] textureConfig = [textureConfig, emptyList]
tag2 = IO_getTag(line,'[',']') tag2 = IO_getTag(line2,'[',']')
GfortranBug86033: if (.not. allocated(texture_name)) then GfortranBug86033: if (.not. allocated(texture_name)) then
allocate(texture_name(1),source=tag2) allocate(texture_name(1),source=tag2)
else GfortranBug86033 else GfortranBug86033
texture_name = [texture_name,tag2] texture_name = [texture_name,tag2]
endif GfortranBug86033 endif GfortranBug86033
endif nextSection endif nextSection
chunkPos = IO_stringPos(line) chunkPos = IO_stringPos(line2)
tag = IO_lc(IO_stringValue(trim(line),chunkPos,1_pInt)) ! extract key tag = IO_lc(IO_stringValue(trim(line2),chunkPos,1_pInt)) ! extract key
inSection: if (t > 0_pInt) then inSection: if (t > 0_pInt) then
chunkPos = IO_stringPos(line) chunkPos = IO_stringPos(line2)
call textureConfig(t)%add(IO_lc(trim(line)),chunkPos) call textureConfig(t)%add(IO_lc(trim(line2)),chunkPos)
else inSection else inSection
echo = (trim(tag) == '/echo/') echo = (trim(tag) == '/echo/')
endif inSection endif inSection
@ -1315,7 +1315,7 @@ character(len=65536) function material_parseTexture(fileUnit)
enddo lines enddo lines
enddo enddo
material_parseTexture = line material_parseTexture = line2
end function material_parseTexture end function material_parseTexture