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

left over jump marks

This commit is contained in:
Martin Diehl 2019-02-02 17:19:12 +01:00
parent 3edbfc1cb5
commit 07cca77fce
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/mesh_abaqus.f90
View File

@ -1288,7 +1288,7 @@ subroutine mesh_abaqus_map_nodes(fileUnit)
backspace(fileUnit) backspace(fileUnit)
enddo enddo
do i = 1_pInt,c do i = 1_pInt,c
read (fileUnit,610,END=650) line read (fileUnit,'(a300)') line
chunkPos = IO_stringPos(line) chunkPos = IO_stringPos(line)
cpNode = cpNode + 1_pInt cpNode = cpNode + 1_pInt
mesh_mapFEtoCPnode(1_pInt,cpNode) = IO_intValue(line,chunkPos,1_pInt) mesh_mapFEtoCPnode(1_pInt,cpNode) = IO_intValue(line,chunkPos,1_pInt)
@ -1352,7 +1352,7 @@ subroutine mesh_abaqus_build_nodes(fileUnit)
backspace(fileUnit) ! rewind to first entry backspace(fileUnit) ! rewind to first entry
enddo enddo
do i = 1_pInt,c do i = 1_pInt,c
read (fileUnit,'(a300)',END=670) line read (fileUnit,'(a300)') line
chunkPos = IO_stringPos(line) chunkPos = IO_stringPos(line)
m = mesh_FEasCP('node',IO_intValue(line,chunkPos,1_pInt)) m = mesh_FEasCP('node',IO_intValue(line,chunkPos,1_pInt))
do j=1_pInt, 3_pInt do j=1_pInt, 3_pInt
@ -1448,9 +1448,8 @@ subroutine mesh_abaqus_build_elements(fileUnit)
integer(pInt), allocatable, dimension(:) :: chunkPos integer(pInt), allocatable, dimension(:) :: chunkPos
character(len=300) :: line character(len=300) :: line
integer :: myStat integer :: myStat
logical :: inPart logical :: inPart, materialFound
integer(pInt) :: i,j,k,c,e,t,homog,micro, nNodesAlreadyRead integer(pInt) :: i,j,k,c,e,t,homog,micro, nNodesAlreadyRead
logical inPart,materialFound
character (len=64) :: materialName,elemSetName character (len=64) :: materialName,elemSetName
allocate(mesh_element (4_pInt+mesh_maxNnodes,mesh_NcpElems), source=0_pInt) allocate(mesh_element (4_pInt+mesh_maxNnodes,mesh_NcpElems), source=0_pInt)
@ -1478,7 +1477,7 @@ subroutine mesh_abaqus_build_elements(fileUnit)
backspace(fileUnit) backspace(fileUnit)
enddo enddo
do i = 1_pInt,c do i = 1_pInt,c
read (fileUnit,'(a300)',END=620) line read (fileUnit,'(a300)') line
chunkPos = IO_stringPos(line) ! limit to 64 nodes max chunkPos = IO_stringPos(line) ! limit to 64 nodes max
e = mesh_FEasCP('elem',IO_intValue(line,chunkPos,1_pInt)) e = mesh_FEasCP('elem',IO_intValue(line,chunkPos,1_pInt))
if (e /= 0_pInt) then ! disregard non CP elems if (e /= 0_pInt) then ! disregard non CP elems
@ -1493,7 +1492,7 @@ subroutine mesh_abaqus_build_elements(fileUnit)
enddo enddo
nNodesAlreadyRead = chunkPos(1) - 1_pInt nNodesAlreadyRead = chunkPos(1) - 1_pInt
do while(nNodesAlreadyRead < FE_Nnodes(t)) ! read on if not all nodes in one line do while(nNodesAlreadyRead < FE_Nnodes(t)) ! read on if not all nodes in one line
read (fileUnit,610,END=620) line read (fileUnit,'(a300)') line
chunkPos = IO_stringPos(line) chunkPos = IO_stringPos(line)
do j = 1_pInt,chunkPos(1) do j = 1_pInt,chunkPos(1)
mesh_element(4_pInt+nNodesAlreadyRead+j,e) & mesh_element(4_pInt+nNodesAlreadyRead+j,e) &
@ -1522,7 +1521,7 @@ subroutine mesh_abaqus_build_elements(fileUnit)
case('*user') case('*user')
if ( IO_lc(IO_StringValue(line,chunkPos,2_pInt)) == 'material' .and. & if ( IO_lc(IO_StringValue(line,chunkPos,2_pInt)) == 'material' .and. &
materialFound ) then materialFound ) then
read (fileUnit,'(a300)',END=630) line ! read homogenization and microstructure read (fileUnit,'(a300)') line ! read homogenization and microstructure
chunkPos = IO_stringPos(line) chunkPos = IO_stringPos(line)
homog = nint(IO_floatValue(line,chunkPos,1_pInt),pInt) homog = nint(IO_floatValue(line,chunkPos,1_pInt),pInt)
micro = nint(IO_floatValue(line,chunkPos,2_pInt),pInt) micro = nint(IO_floatValue(line,chunkPos,2_pInt),pInt)