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

better have explicit arguments

This commit is contained in:
Martin Diehl 2019-10-05 17:18:21 +02:00
parent 0dd14a0652
commit 019f0556e6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mesh_marc.f90
View File

@ -207,7 +207,7 @@ subroutine mesh_init(ip,el)
mesh_element(1,:) = -1 ! DEPRECATED mesh_element(1,:) = -1 ! DEPRECATED
mesh_element(2,:) = elemType ! DEPRECATED mesh_element(2,:) = elemType ! DEPRECATED
call mesh_marc_buildElements(mesh_nElems,initialcondTableStyle,FILEUNIT) call mesh_marc_buildElements(mesh_nElems,theMesh%elem%nNodes,initialcondTableStyle,FILEUNIT)
if (myDebug) write(6,'(a)') ' Built elements'; flush(6) if (myDebug) write(6,'(a)') ' Built elements'; flush(6)
close (FILEUNIT) close (FILEUNIT)
@ -607,7 +607,7 @@ integer function mesh_marc_getElemType(nElem,fileUnit)
endif endif
enddo enddo
contains contains
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief mapping of Marc element types to internal representation !> @brief mapping of Marc element types to internal representation
@ -659,10 +659,11 @@ end function mapElemtype
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief Stores node IDs and homogenization and microstructure ID !> @brief Stores node IDs and homogenization and microstructure ID
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine mesh_marc_buildElements(nElem,initialcondTableStyle,fileUnit) subroutine mesh_marc_buildElements(nElem,nNodes,initialcondTableStyle,fileUnit)
integer, intent(in) :: & integer, intent(in) :: &
nElem, & nElem, &
nNodes, & !< number of nodes per element
initialcondTableStyle, & initialcondTableStyle, &
fileUnit fileUnit
@ -688,7 +689,7 @@ subroutine mesh_marc_buildElements(nElem,initialcondTableStyle,fileUnit)
mesh_element(4+j,e) = mesh_FEasCP('node',IO_IntValue(line,chunkPos,j+2)) ! CP ids of nodes mesh_element(4+j,e) = mesh_FEasCP('node',IO_IntValue(line,chunkPos,j+2)) ! CP ids of nodes
enddo enddo
nNodesAlreadyRead = chunkPos(1) - 2 nNodesAlreadyRead = chunkPos(1) - 2
do while(nNodesAlreadyRead < theMesh%elem%nNodes) ! read on if not all nodes in one line do while(nNodesAlreadyRead < nNodes) ! read on if not all nodes in one line
read (fileUnit,'(A300)',END=620) line read (fileUnit,'(A300)',END=620) line
chunkPos = IO_stringPos(line) chunkPos = IO_stringPos(line)
do j = 1,chunkPos(1) do j = 1,chunkPos(1)