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

polishing

This commit is contained in:
Martin Diehl 2020-01-23 07:19:44 +01:00
parent 2c942de45d
commit d28b18267b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mesh_marc.f90
View File

@ -401,7 +401,7 @@ subroutine inputRead_mapElemSets(nameElemSet,mapElemSet,fileUnit,fileContent)
character(len=64), dimension(:), allocatable, intent(out) :: nameElemSet character(len=64), dimension(:), allocatable, intent(out) :: nameElemSet
integer, dimension(:,:), allocatable, intent(out) :: mapElemSet integer, dimension(:,:), allocatable, intent(out) :: mapElemSet
integer, intent(in) :: fileUnit integer, intent(in) :: fileUnit
character(len=pStringLen), dimension(:), intent(in) :: fileContent !< file content, separated per lines character(len=pStringLen), dimension(:), intent(in) :: fileContent !< file content, separated per lines
integer, allocatable, dimension(:) :: chunkPos integer, allocatable, dimension(:) :: chunkPos
character(len=300) :: line character(len=300) :: line
@ -688,23 +688,23 @@ subroutine inputRead_microstructureAndHomogenization(microstructureAt,homogeniza
allocate(homogenizationAt(nElem),source=0) allocate(homogenizationAt(nElem),source=0)
rewind(fileUnit) rewind(fileUnit)
read (fileUnit,'(A300)',END=630) line read (fileUnit,'(A)',END=630) line
do do
chunkPos = IO_stringPos(line) chunkPos = IO_stringPos(line)
if( (IO_lc(IO_stringValue(line,chunkPos,1)) == 'initial') .and. & if( (IO_lc(IO_stringValue(line,chunkPos,1)) == 'initial') .and. &
(IO_lc(IO_stringValue(line,chunkPos,2)) == 'state') ) then (IO_lc(IO_stringValue(line,chunkPos,2)) == 'state') ) then
if (initialcondTableStyle == 2) read (fileUnit,'(A300)',END=630) line ! read extra line for new style if (initialcondTableStyle == 2) read (fileUnit,'(A)',END=630) line ! read extra line for new style
read (fileUnit,'(A300)',END=630) line ! read line with index of state var read (fileUnit,'(A)',END=630) line ! read line with index of state var
chunkPos = IO_stringPos(line) chunkPos = IO_stringPos(line)
sv = IO_IntValue(line,chunkPos,1) ! figure state variable index sv = IO_IntValue(line,chunkPos,1) ! figure state variable index
if( (sv == 2).or.(sv == 3) ) then ! only state vars 2 and 3 of interest if( (sv == 2).or.(sv == 3) ) then ! only state vars 2 and 3 of interest
read (fileUnit,'(A300)',END=630) line ! read line with value of state var read (fileUnit,'(A)',END=630) line ! read line with value of state var
chunkPos = IO_stringPos(line) chunkPos = IO_stringPos(line)
do while (scan(IO_stringValue(line,chunkPos,1),'+-',back=.true.)>1) ! is noEfloat value? do while (scan(IO_stringValue(line,chunkPos,1),'+-',back=.true.)>1) ! is noEfloat value?
myVal = nint(IO_floatValue(line,chunkPos,1)) myVal = nint(IO_floatValue(line,chunkPos,1))
if (initialcondTableStyle == 2) then if (initialcondTableStyle == 2) then
read (fileUnit,'(A300)',END=630) line ! read extra line read (fileUnit,'(A)',END=630) line ! read extra line
read (fileUnit,'(A300)',END=630) line ! read extra line read (fileUnit,'(A)',END=630) line ! read extra line
endif endif
contInts = IO_continuousIntValues& ! get affected elements contInts = IO_continuousIntValues& ! get affected elements
(fileUnit,nElem,nameElemSet,mapElemSet,size(nameElemSet)) (fileUnit,nElem,nameElemSet,mapElemSet,size(nameElemSet))
@ -713,13 +713,13 @@ subroutine inputRead_microstructureAndHomogenization(microstructureAt,homogeniza
if (sv == 2) microstructureAt(e) = myVal if (sv == 2) microstructureAt(e) = myVal
if (sv == 3) homogenizationAt(e) = myVal if (sv == 3) homogenizationAt(e) = myVal
enddo enddo
if (initialcondTableStyle == 0) read (fileUnit,'(A300)',END=630) line ! ignore IP range for old table style if (initialcondTableStyle == 0) read (fileUnit,'(A)',END=630) line ! ignore IP range for old table style
read (fileUnit,'(A300)',END=630) line read (fileUnit,'(A)',END=630) line
chunkPos = IO_stringPos(line) chunkPos = IO_stringPos(line)
enddo enddo
endif endif
else else
read (fileUnit,'(A300)',END=630) line read (fileUnit,'(A)',END=630) line
endif endif
enddo enddo