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

enable handling of connectivity that spreads over multiple lines 

same code works also for old style tables, probably some flexibility
regarding non-CP elements is lacking ..
This commit is contained in:
Martin Diehl 2020-01-12 00:58:12 +01:00
parent 46cb787934
commit 8aa13a55ce
1 changed files with 31 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/mesh_marc.f90
View File

@ -209,14 +209,16 @@ subroutine inputRead(elem,node0_elem,connectivity_elem,microstructureAt,homogeni
call inputRead_mapElemSets(nameElemSet,mapElemSet,& call inputRead_mapElemSets(nameElemSet,mapElemSet,&
FILEUNIT) FILEUNIT)
call inputRead_elemType(elem, &
nElems,inputFile)
allocate (mesh_mapFEtoCPelem(2,nElems), source=0) allocate (mesh_mapFEtoCPelem(2,nElems), source=0)
call inputRead_mapElems(hypoelasticTableStyle,nameElemSet,mapElemSet,fileFormatVersion,matNumber,FILEUNIT) call inputRead_mapElems(elem%nNodes,nElems,&
inputFile)
allocate (mesh_mapFEtoCPnode(2,Nnodes), source=0) allocate (mesh_mapFEtoCPnode(2,Nnodes), source=0)
call inputRead_mapNodes(inputFile) call inputRead_mapNodes(inputFile)
call inputRead_elemType(elem, &
nElems,inputFile)
call inputRead_elemNodes(node0_elem, & call inputRead_elemNodes(node0_elem, &
Nnodes,inputFile) Nnodes,inputFile)
@ -411,65 +413,35 @@ subroutine inputRead_mapElemSets(nameElemSet,mapElemSet,fileUnit)
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief Maps elements from FE ID to internal (consecutive) representation. !> @brief Maps elements from FE ID to internal (consecutive) representation.
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine inputRead_mapElems(tableStyle,nameElemSet,mapElemSet,fileFormatVersion,matNumber,fileUnit) subroutine inputRead_mapElems(nNodes,nElem,fileContent)
integer, intent(in) :: fileUnit,tableStyle,fileFormatVersion integer, intent(in) :: &
integer, dimension(:), intent(in) :: matNumber nElem, &
character(len=64), intent(in), dimension(:) :: nameElemSet nNodes !< number of nodes per element
integer, dimension(:,:), intent(in) :: & character(len=pStringLen), dimension(:), intent(in) :: fileContent !< file content, separated per lines
mapElemSet
integer, allocatable, dimension(:) :: chunkPos integer, allocatable, dimension(:) :: chunkPos
character(len=300) :: line, & integer :: i,j,l,nNodesAlreadyRead
tmp
integer, dimension(:), allocatable :: contInts do l = 1, size(fileContent)
integer :: i,cpElem chunkPos = IO_stringPos(fileContent(l))
if( IO_lc(IO_stringValue(fileContent(l),chunkPos,1)) == 'connectivity' ) then
allocate(contInts(size(mesh_mapFEtoCPelem,2)+1)) j = 0
do i = 1,nElem
cpElem = 0 chunkPos = IO_stringPos(fileContent(l+1+i+j))
contInts = 0 mesh_mapFEtoCPelem(:,i) = [IO_intValue(fileContent(l+1+i+j),chunkPos,1),i]
rewind(fileUnit) nNodesAlreadyRead = chunkPos(1) - 2
do do while(nNodesAlreadyRead < nNodes) ! read on if not all nodes in one line
read (fileUnit,'(A300)',END=620) line j = j + 1
chunkPos = IO_stringPos(line) chunkPos = IO_stringPos(fileContent(l+1+i+j))
Marc2016andEarlier: if (fileFormatVersion < 13) then nNodesAlreadyRead = nNodesAlreadyRead + chunkPos(1)
if( IO_lc(IO_stringValue(line,chunkPos,1)) == 'hypoelastic' ) then enddo
skipLines: do i=1,3+TableStyle enddo
read (fileUnit,'(A300)') line exit
enddo skipLines endif
contInts = IO_continuousIntValues(fileUnit,size(mesh_mapFEtoCPelem,2),nameElemSet,&
mapElemSet,size(nameElemSet))
exit
endif
else Marc2016andEarlier
if ( IO_lc(IO_stringValue(line,chunkPos,1)) == 'connectivity') then
read (fileUnit,'(A300)',END=620) line
chunkPos = IO_stringPos(line)
if(any(matNumber==IO_intValue(line,chunkPos,6))) then
do
read (fileUnit,'(A300)',END=620) line
chunkPos = IO_stringPos(line)
tmp = IO_lc(IO_stringValue(line,chunkPos,1))
if (verify(trim(tmp),"0123456789")/=0) then ! found keyword
exit
else
contInts(1) = contInts(1) + 1
read (tmp,*) contInts(contInts(1)+1)
endif
enddo
endif
endif
endif Marc2016andEarlier
enddo
620 do i = 1,contInts(1)
cpElem = cpElem+1
mesh_mapFEtoCPelem(1,cpElem) = contInts(1+i)
mesh_mapFEtoCPelem(2,cpElem) = cpElem
enddo enddo
call math_sort(mesh_mapFEtoCPelem) call math_sort(mesh_mapFEtoCPelem)
end subroutine inputRead_mapElems end subroutine inputRead_mapElems