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

no need for double definition

This commit is contained in:
Martin Diehl 2019-10-08 10:03:03 +02:00
parent a8a0c23d77
commit 5e79c360e9
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/mesh_marc.f90
View File

@ -96,14 +96,6 @@ integer, dimension(:,:), allocatable :: &
],pInt) ],pInt)
integer, dimension(FE_Ncelltypes), parameter :: FE_NcellnodesPerCellface = & !< number of cell nodes per cell face in a specific cell type
int([&
2, & ! (2D 3node)
2, & ! (2D 4node)
3, & ! (3D 4node)
4 & ! (3D 8node)
],pInt)
integer, dimension(FE_Ncelltypes), parameter :: FE_NipNeighbors = & !< number of ip neighbors / cell faces in a specific cell type integer, dimension(FE_Ncelltypes), parameter :: FE_NipNeighbors = & !< number of ip neighbors / cell faces in a specific cell type
int([& int([&
3, & ! (2D 3node) 3, & ! (2D 3node)
@ -1028,7 +1020,7 @@ function IPvolume()
real(pReal), dimension(size(theMesh%elem%cellFace,1),size(theMesh%elem%cellFace,2)) :: subvolume real(pReal), dimension(size(theMesh%elem%cellFace,1),size(theMesh%elem%cellFace,2)) :: subvolume
c = theMesh%elem%cellType c = theMesh%elem%cellType
m = FE_NcellnodesPerCellface(c) m = size(theMesh%elem%cellFace,1)
do e = 1,theMesh%nElems do e = 1,theMesh%nElems
select case (c) select case (c)
@ -1194,7 +1186,7 @@ subroutine mesh_build_ipAreas
case (1,2) ! 2D 3 or 4 node case (1,2) ! 2D 3 or 4 node
do i = 1,theMesh%elem%nIPs do i = 1,theMesh%elem%nIPs
do f = 1,FE_NipNeighbors(c) ! loop over cell faces do f = 1,FE_NipNeighbors(c) ! loop over cell faces
forall(n = 1:FE_NcellnodesPerCellface(c)) & forall(n = 1: size(theMesh%elem%cellface,1)) &
nodePos(1:3,n) = mesh_cellnode(1:3,mesh_cell(theMesh%elem%cellface(n,f),i,e)) nodePos(1:3,n) = mesh_cellnode(1:3,mesh_cell(theMesh%elem%cellface(n,f),i,e))
normal(1) = nodePos(2,2) - nodePos(2,1) ! x_normal = y_connectingVector normal(1) = nodePos(2,2) - nodePos(2,1) ! x_normal = y_connectingVector
normal(2) = -(nodePos(1,2) - nodePos(1,1)) ! y_normal = -x_connectingVector normal(2) = -(nodePos(1,2) - nodePos(1,1)) ! y_normal = -x_connectingVector
@ -1207,7 +1199,7 @@ subroutine mesh_build_ipAreas
case (3) ! 3D 4node case (3) ! 3D 4node
do i = 1,theMesh%elem%nIPs do i = 1,theMesh%elem%nIPs
do f = 1,FE_NipNeighbors(c) ! loop over cell faces do f = 1,FE_NipNeighbors(c) ! loop over cell faces
forall(n = 1:FE_NcellnodesPerCellface(c)) & forall(n = 1: size(theMesh%elem%cellface,1)) &
nodePos(1:3,n) = mesh_cellnode(1:3,mesh_cell(theMesh%elem%cellface(n,f),i,e)) nodePos(1:3,n) = mesh_cellnode(1:3,mesh_cell(theMesh%elem%cellface(n,f),i,e))
normal = math_cross(nodePos(1:3,2) - nodePos(1:3,1), & normal = math_cross(nodePos(1:3,2) - nodePos(1:3,1), &
nodePos(1:3,3) - nodePos(1:3,1)) nodePos(1:3,3) - nodePos(1:3,1))
@ -1221,12 +1213,12 @@ subroutine mesh_build_ipAreas
! four normals of triangular subfaces; since the face consists only of two triangles, ! four normals of triangular subfaces; since the face consists only of two triangles,
! the sum has to be divided by two; this whole prcedure tries to compensate for ! the sum has to be divided by two; this whole prcedure tries to compensate for
! probable non-planar cell surfaces ! probable non-planar cell surfaces
m = FE_NcellnodesPerCellface(c) m = size(theMesh%elem%cellFace,1)
do i = 1,theMesh%elem%nIPs do i = 1,theMesh%elem%nIPs
do f = 1,FE_NipNeighbors(c) ! loop over cell faces do f = 1,FE_NipNeighbors(c) ! loop over cell faces
forall(n = 1:FE_NcellnodesPerCellface(c)) & forall(n = 1: size(theMesh%elem%cellface,1)) &
nodePos(1:3,n) = mesh_cellnode(1:3,mesh_cell(theMesh%elem%cellface(n,f),i,e)) nodePos(1:3,n) = mesh_cellnode(1:3,mesh_cell(theMesh%elem%cellface(n,f),i,e))
forall(n = 1:FE_NcellnodesPerCellface(c)) & forall(n = 1: size(theMesh%elem%cellface,1)) &
normals(1:3,n) = 0.5_pReal & normals(1:3,n) = 0.5_pReal &
* math_cross(nodePos(1:3,1+mod(n ,m)) - nodePos(1:3,n), & * math_cross(nodePos(1:3,1+mod(n ,m)) - nodePos(1:3,n), &
nodePos(1:3,1+mod(n+1,m)) - nodePos(1:3,n)) nodePos(1:3,1+mod(n+1,m)) - nodePos(1:3,n))