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

make public variables visible

This commit is contained in:
Martin Diehl 2019-06-05 20:18:19 +02:00
parent 3990284b63
commit 4b6ff59e49
1 changed files with 47 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/mesh_marc.f90
View File

@ -23,18 +23,14 @@ module mesh
implicit none implicit none
private private
! --------------------------------------------------------------------------------------------------
! public variables (DEPRECATED)
integer, public, protected :: & integer, public, protected :: &
mesh_Ncellnodes !< total number of cell nodes in mesh (including duplicates) mesh_Ncellnodes !< total number of cell nodes in mesh (including duplicates)
integer :: &
mesh_elemType, & !< Element type of the mesh (only support homogeneous meshes)
mesh_Nnodes, & !< total number of nodes in mesh
mesh_Ncells, & !< total number of cells in mesh
mesh_maxNsharedElems !< max number of CP elements sharing a node
integer, dimension(:,:), allocatable, public, protected :: & integer, dimension(:,:), allocatable, public, protected :: &
mesh_element, & !DEPRECATED mesh_element
mesh_sharedElem, & !< entryCount and list of elements containing node
mesh_nodeTwins !< node twins are surface nodes that lie exactly on opposite sides of the mesh (surfaces nodes with equal coordinate values in two dimensions)
integer, dimension(:,:,:,:), allocatable, public, protected :: & integer, dimension(:,:,:,:), allocatable, public, protected :: &
mesh_ipNeighborhood !< 6 or less neighboring IPs as [element_num, IP_index, neighbor_index that points to me] mesh_ipNeighborhood !< 6 or less neighboring IPs as [element_num, IP_index, neighbor_index that points to me]
@ -58,25 +54,48 @@ module mesh
real(pReal),dimension(:,:,:,:), allocatable, public, protected :: & real(pReal),dimension(:,:,:,:), allocatable, public, protected :: &
mesh_ipAreaNormal !< area normal of interface to neighboring IP (initially!) mesh_ipAreaNormal !< area normal of interface to neighboring IP (initially!)
! --------------------------------------------------------------------------------------------------
logical, dimension(3), public, protected :: mesh_periodicSurface !< flag indicating periodic outer surfaces (used for fluxes) type, public, extends(tMesh) :: tMesh_marc
contains
procedure, pass(self) :: tMesh_marc_init
generic, public :: init => tMesh_marc_init
end type tMesh_marc
type(tMesh_marc), public, protected :: theMesh
! --------------------------------------------------------------------------------------------------
integer, dimension(:,:), allocatable, private :: & integer :: &
mesh_elemType, & !< Element type of the mesh (only support homogeneous meshes)
mesh_Nnodes, & !< total number of nodes in mesh
mesh_Ncells, & !< total number of cells in mesh
mesh_maxNsharedElems !< max number of CP elements sharing a node
integer, dimension(:,:), allocatable :: &
mesh_sharedElem, & !< entryCount and list of elements containing node
mesh_nodeTwins !< node twins are surface nodes that lie exactly on opposite sides of the mesh (surfaces nodes with equal coordinate values in two dimensions)
logical, dimension(3) :: mesh_periodicSurface !< flag indicating periodic outer surfaces (used for fluxes)
integer, dimension(:,:), allocatable :: &
mesh_cellnodeParent !< cellnode's parent element ID, cellnode's intra-element ID mesh_cellnodeParent !< cellnode's parent element ID, cellnode's intra-element ID
integer,dimension(:,:,:), allocatable, private :: & integer,dimension(:,:,:), allocatable :: &
mesh_cell2, & !< cell connectivity for each element,ip/cell mesh_cell2, & !< cell connectivity for each element,ip/cell
mesh_cell !< cell connectivity for each element,ip/cell mesh_cell !< cell connectivity for each element,ip/cell
integer, dimension(:,:,:), allocatable, private :: & integer, dimension(:,:,:), allocatable :: &
FE_cellface !< list of intra-cell cell node IDs that constitute the cell faces of a specific type of cell FE_cellface !< list of intra-cell cell node IDs that constitute the cell faces of a specific type of cell
! These definitions should actually reside in the FE-solver specific part (different for MARC/ABAQUS) ! These definitions should actually reside in the FE-solver specific part (different for MARC/ABAQUS)
! Hence, I suggest to prefix with "FE_" ! Hence, I suggest to prefix with "FE_"
integer, parameter, public :: & integer, parameter :: &
FE_Nelemtypes = 13, & FE_Nelemtypes = 13, &
FE_Ngeomtypes = 10, & FE_Ngeomtypes = 10, &
FE_Ncelltypes = 4, & FE_Ncelltypes = 4, &
@ -89,7 +108,7 @@ integer, dimension(:,:), allocatable, private :: &
FE_maxNcellfaces = 6, & FE_maxNcellfaces = 6, &
FE_maxNcellnodesPerCellface = 4 FE_maxNcellnodesPerCellface = 4
integer, dimension(FE_Ngeomtypes), parameter, private :: FE_NmatchingNodes = & !< number of nodes that are needed for face matching in a specific type of element geometry integer, dimension(FE_Ngeomtypes), parameter :: FE_NmatchingNodes = & !< number of nodes that are needed for face matching in a specific type of element geometry
int([ & int([ &
3, & ! element 6 (2D 3node 1ip) 3, & ! element 6 (2D 3node 1ip)
3, & ! element 125 (2D 6node 3ip) 3, & ! element 125 (2D 6node 3ip)
@ -103,8 +122,7 @@ integer, dimension(:,:), allocatable, private :: &
8 & ! element 21 (3D 20node 27ip) 8 & ! element 21 (3D 20node 27ip)
],pInt) ],pInt)
integer, dimension(FE_maxNfaces,FE_Ngeomtypes), parameter, private :: & integer, dimension(FE_maxNfaces,FE_Ngeomtypes), parameter :: FE_NmatchingNodesPerFace = & !< number of matching nodes per face in a specific type of element geometry
FE_NmatchingNodesPerFace = & !< number of matching nodes per face in a specific type of element geometry
reshape(int([ & reshape(int([ &
2,2,2,0,0,0, & ! element 6 (2D 3node 1ip) 2,2,2,0,0,0, & ! element 6 (2D 3node 1ip)
2,2,2,0,0,0, & ! element 125 (2D 6node 3ip) 2,2,2,0,0,0, & ! element 125 (2D 6node 3ip)
@ -118,8 +136,7 @@ integer, dimension(:,:), allocatable, private :: &
4,4,4,4,4,4 & ! element 21 (3D 20node 27ip) 4,4,4,4,4,4 & ! element 21 (3D 20node 27ip)
],pInt),[FE_maxNipNeighbors,FE_Ngeomtypes]) ],pInt),[FE_maxNipNeighbors,FE_Ngeomtypes])
integer, dimension(FE_maxNmatchingNodesPerFace,FE_maxNfaces,FE_Ngeomtypes), & integer, dimension(FE_maxNmatchingNodesPerFace,FE_maxNfaces,FE_Ngeomtypes), parameter :: FE_face = & !< List of node indices on each face of a specific type of element geometry
parameter, private :: FE_face = & !< List of node indices on each face of a specific type of element geometry
reshape(int([& reshape(int([&
1,2,0,0 , & ! element 6 (2D 3node 1ip) 1,2,0,0 , & ! element 6 (2D 3node 1ip)
2,3,0,0 , & 2,3,0,0 , &
@ -184,7 +201,7 @@ integer, dimension(:,:), allocatable, private :: &
],pInt),[FE_maxNmatchingNodesPerFace,FE_maxNfaces,FE_Ngeomtypes]) ],pInt),[FE_maxNmatchingNodesPerFace,FE_maxNfaces,FE_Ngeomtypes])
integer, dimension(FE_Ncelltypes), parameter, private :: FE_NcellnodesPerCellface = & !< number of cell nodes per cell face in a specific cell type integer, dimension(FE_Ncelltypes), parameter :: FE_NcellnodesPerCellface = & !< number of cell nodes per cell face in a specific cell type
int([& int([&
2, & ! (2D 3node) 2, & ! (2D 3node)
2, & ! (2D 4node) 2, & ! (2D 4node)
@ -192,7 +209,7 @@ integer, dimension(:,:), allocatable, private :: &
4 & ! (3D 8node) 4 & ! (3D 8node)
],pInt) ],pInt)
integer, dimension(FE_Ncelltypes), parameter, private :: 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)
4, & ! (2D 4node) 4, & ! (2D 4node)
@ -204,20 +221,20 @@ integer, dimension(:,:), allocatable, private :: &
integer, private :: & integer, private :: &
mesh_Nelems, & !< total number of elements in mesh (including non-DAMASK elements) mesh_Nelems, & !< total number of elements in mesh (including non-DAMASK elements)
mesh_NelemSets mesh_NelemSets
character(len=64), dimension(:), allocatable, private :: & character(len=64), dimension(:), allocatable :: &
mesh_nameElemSet mesh_nameElemSet
integer, dimension(:,:), allocatable, private :: & integer, dimension(:,:), allocatable :: &
mesh_mapElemSet !< list of elements in elementSet mesh_mapElemSet !< list of elements in elementSet
integer, dimension(:,:), allocatable, target, private :: & integer, dimension(:,:), allocatable, target :: &
mesh_mapFEtoCPelem, & !< [sorted FEid, corresponding CPid] mesh_mapFEtoCPelem, & !< [sorted FEid, corresponding CPid]
mesh_mapFEtoCPnode !< [sorted FEid, corresponding CPid] mesh_mapFEtoCPnode !< [sorted FEid, corresponding CPid]
integer, private :: & integer :: &
hypoelasticTableStyle, & !< Table style (Marc only) hypoelasticTableStyle, & !< Table style (Marc only)
initialcondTableStyle !< Table style (Marc only) initialcondTableStyle !< Table style (Marc only)
integer, dimension(:), allocatable, private :: & integer, dimension(:), allocatable :: &
Marc_matNumber !< array of material numbers for hypoelastic material (Marc only) Marc_matNumber !< array of material numbers for hypoelastic material (Marc only)
public :: & public :: &
@ -247,15 +264,6 @@ integer, dimension(:,:), allocatable, private :: &
mesh_marc_build_nodes, & mesh_marc_build_nodes, &
mesh_marc_build_elements mesh_marc_build_elements
type, public, extends(tMesh) :: tMesh_marc
contains
procedure, pass(self) :: tMesh_marc_init
generic, public :: init => tMesh_marc_init
end type tMesh_marc
type(tMesh_marc), public, protected :: theMesh
contains contains