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 2019-10-13 21:45:08 +02:00
parent d03efade06
commit 33e639426a
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/mesh_marc.f90
View File

@ -133,7 +133,7 @@ subroutine mesh_init(ip,el)
allocate(microstructureAt(theMesh%nElems), source=0) allocate(microstructureAt(theMesh%nElems), source=0)
allocate(homogenizationAt(theMesh%nElems), source=0) allocate(homogenizationAt(theMesh%nElems), source=0)
connectivity_elem = mesh_marc_buildElements(theMesh%nElems,theMesh%elem%nNodes,FILEUNIT) connectivity_elem = mesh_marc_buildElements(mesh_nElems,theMesh%elem%nNodes,FILEUNIT)
call mesh_marc_buildElements2(microstructureAt,homogenizationAt, & call mesh_marc_buildElements2(microstructureAt,homogenizationAt, &
mesh_nElems,theMesh%elem%nNodes,mesh_nameElemSet,mesh_mapElemSet,& mesh_nElems,theMesh%elem%nNodes,mesh_nameElemSet,mesh_mapElemSet,&
initialcondTableStyle,FILEUNIT) initialcondTableStyle,FILEUNIT)
@ -148,7 +148,7 @@ subroutine mesh_init(ip,el)
call results_closeJobFile call results_closeJobFile
#endif #endif
call buildCells(theMesh,theMesh%elem,connectivity_elem) call buildCells(mesh_Nnodes,theMesh%elem,connectivity_elem)
allocate(mesh_ipCoordinates(3,theMesh%elem%nIPs,theMesh%nElems),source=0.0_pReal) allocate(mesh_ipCoordinates(3,theMesh%elem%nIPs,theMesh%nElems),source=0.0_pReal)
@ -680,9 +680,9 @@ subroutine mesh_marc_buildElements2(microstructureAt,homogenizationAt, &
630 end subroutine mesh_marc_buildElements2 630 end subroutine mesh_marc_buildElements2
subroutine buildCells(thisMesh,elem,connectivity_elem) subroutine buildCells(nNodes,elem,connectivity_elem)
class(tMesh) :: thisMesh integer, intent(in) :: nNodes
type(tElement), intent(in) :: elem type(tElement), intent(in) :: elem
integer,dimension(:,:), intent(in) :: connectivity_elem integer,dimension(:,:), intent(in) :: connectivity_elem
@ -694,7 +694,7 @@ subroutine buildCells(thisMesh,elem,connectivity_elem)
integer :: e, n, c, p, s,i,m,j,nParentNodes,nCellNode,Nelem,candidateID integer :: e, n, c, p, s,i,m,j,nParentNodes,nCellNode,Nelem,candidateID
Nelem = thisMesh%Nelems Nelem = size(connectivity_elem,1)
!--------------------------------------------------------------------------------------------------- !---------------------------------------------------------------------------------------------------
! initialize global connectivity to negative local connectivity ! initialize global connectivity to negative local connectivity
@ -713,7 +713,7 @@ subroutine buildCells(thisMesh,elem,connectivity_elem)
endif realNode endif realNode
enddo enddo
enddo enddo
nCellNode = thisMesh%nNodes nCellNode = nNodes
allocate(cellNodeDefinition(elem%nNodes-1)) allocate(cellNodeDefinition(elem%nNodes-1))
@ -777,11 +777,9 @@ subroutine buildCells(thisMesh,elem,connectivity_elem)
enddo enddo
i = uniqueRows(candidates_global(1:2*nParentNodes,:)) i = uniqueRows(candidates_global(1:2*nParentNodes,:))
allocate(cellNodeDefinition(nParentNodes-1)%parents(i,nParentNodes)) allocate(cellNodeDefinition(nParentNodes-1)%parents(i,nParentNodes))
allocate(cellNodeDefinition(nParentNodes-1)%weights(i,nParentNodes)) allocate(cellNodeDefinition(nParentNodes-1)%weights(i,nParentNodes))
i = 1 i = 1
n = 1 n = 1
do while(n <= size(candidates_local)*Nelem) do while(n <= size(candidates_local)*Nelem)
@ -807,10 +805,11 @@ subroutine buildCells(thisMesh,elem,connectivity_elem)
enddo enddo
nCellNode = nCellNode + i nCellNode = nCellNode + i
mesh_cell2 = connectivity_cell
enddo enddo
mesh_cell2 = connectivity_cell
contains contains
!------------------------------------------------------------------------------------------------ !------------------------------------------------------------------------------------------------
!> @brief count unique rows (same rows need to be stored consecutively) !> @brief count unique rows (same rows need to be stored consecutively)