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

consistent order of solver-specific functionality

This commit is contained in:
Martin Diehl 2018-09-23 17:57:48 +02:00
parent 5936397ae7
commit cf6d388a6b
1 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/mesh.f90
View File

@ -335,7 +335,7 @@ integer(pInt), dimension(:,:), allocatable, private :: &
4 & ! element 21 (3D 20node 27ip) 4 & ! element 21 (3D 20node 27ip)
],pInt) ],pInt)
#ifdef Spectral #if defined(Spectral)
integer(pInt), dimension(3), public, protected :: & integer(pInt), dimension(3), public, protected :: &
grid !< (global) grid grid !< (global) grid
integer(pInt), public, protected :: & integer(pInt), public, protected :: &
@ -347,9 +347,7 @@ integer(pInt), dimension(:,:), allocatable, private :: &
real(pReal), public, protected :: & real(pReal), public, protected :: &
size3, & !< (local) size in 3rd direction size3, & !< (local) size in 3rd direction
size3offset !< (local) size offset in 3rd direction size3offset !< (local) size offset in 3rd direction
#endif #elif defined(Marc4DAMASK) || defined(Abaqus)
#if defined(Marc4DAMASK) || defined(Abaqus)
integer(pInt), private :: & integer(pInt), 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_maxNnodes, & !< max number of nodes in any CP element mesh_maxNnodes, & !< max number of nodes in any CP element
@ -364,47 +362,54 @@ integer(pInt), dimension(:,:), allocatable, private :: &
mesh_mapFEtoCPelem, & !< [sorted FEid, corresponding CPid] mesh_mapFEtoCPelem, & !< [sorted FEid, corresponding CPid]
mesh_mapFEtoCPnode !< [sorted FEid, corresponding CPid] mesh_mapFEtoCPnode !< [sorted FEid, corresponding CPid]
#endif #endif
#if defined(Marc4DAMASK)
#ifdef Marc4DAMASK
integer(pInt), private :: & integer(pInt), private :: &
MarcVersion, & !< Version of input file format (Marc only) MarcVersion, & !< Version of input file format (Marc only)
hypoelasticTableStyle, & !< Table style (Marc only) hypoelasticTableStyle, & !< Table style (Marc only)
initialcondTableStyle !< Table style (Marc only) initialcondTableStyle !< Table style (Marc only)
integer(pInt), dimension(:), allocatable, private :: & integer(pInt), dimension(:), allocatable, private :: &
Marc_matNumber !< array of material numbers for hypoelastic material (Marc only) Marc_matNumber !< array of material numbers for hypoelastic material (Marc only)
#endif #elif defined(Abaqus)
#ifdef Abaqus
logical, private :: noPart !< for cases where the ABAQUS input file does not use part/assembly information logical, private :: noPart !< for cases where the ABAQUS input file does not use part/assembly information
#endif #endif
public :: & public :: &
mesh_init, & mesh_init, &
#if defined(Marc4DAMASK) || defined(Abaqus)
mesh_FEasCP, &
#endif
mesh_build_cellnodes, & mesh_build_cellnodes, &
mesh_build_ipVolumes, & mesh_build_ipVolumes, &
mesh_build_ipCoordinates, & mesh_build_ipCoordinates, &
mesh_cellCenterCoordinates, & mesh_cellCenterCoordinates, &
mesh_get_Ncellnodes, & mesh_get_Ncellnodes, &
mesh_get_unitlength, & mesh_get_unitlength, &
mesh_get_nodeAtIP mesh_get_nodeAtIP, &
#ifdef Spectral #if defined(Spectral)
public :: &
mesh_spectral_getGrid, & mesh_spectral_getGrid, &
mesh_spectral_getSize mesh_spectral_getSize
#elif defined(Marc4DAMASK) || defined(Abaqus)
mesh_FEasCP
#endif #endif
private :: & private :: &
#ifdef Spectral mesh_get_damaskOptions, &
mesh_build_cellconnectivity, &
mesh_build_ipAreas, &
mesh_tell_statistics, &
FE_mapElemtype, &
mesh_faceMatch, &
mesh_build_FEdata, &
#if defined(Spectral)
mesh_spectral_getHomogenization, & mesh_spectral_getHomogenization, &
mesh_spectral_count, & mesh_spectral_count, &
mesh_spectral_count_cpSizes, & mesh_spectral_count_cpSizes, &
mesh_spectral_build_nodes, & mesh_spectral_build_nodes, &
mesh_spectral_build_elements, & mesh_spectral_build_elements, &
mesh_spectral_build_ipNeighborhood, & mesh_spectral_build_ipNeighborhood
#elif defined Marc4DAMASK #elif defined(Marc4DAMASK) || defined(Abaqus)
mesh_build_nodeTwins, &
mesh_build_sharedElems, &
mesh_build_ipNeighborhood, &
#endif
#if defined(Marc4DAMASK)
mesh_marc_get_fileFormat, & mesh_marc_get_fileFormat, &
mesh_marc_get_tableStyles, & mesh_marc_get_tableStyles, &
mesh_marc_get_matNumber, & mesh_marc_get_matNumber, &
@ -416,8 +421,8 @@ integer(pInt), dimension(:,:), allocatable, private :: &
mesh_marc_map_nodes, & mesh_marc_map_nodes, &
mesh_marc_build_nodes, & mesh_marc_build_nodes, &
mesh_marc_count_cpSizes, & mesh_marc_count_cpSizes, &
mesh_marc_build_elements, & mesh_marc_build_elements
#elif defined Abaqus #elif defined(Abaqus)
mesh_abaqus_count_nodesAndElements, & mesh_abaqus_count_nodesAndElements, &
mesh_abaqus_count_elementSets, & mesh_abaqus_count_elementSets, &
mesh_abaqus_count_materials, & mesh_abaqus_count_materials, &
@ -428,20 +433,8 @@ integer(pInt), dimension(:,:), allocatable, private :: &
mesh_abaqus_map_nodes, & mesh_abaqus_map_nodes, &
mesh_abaqus_build_nodes, & mesh_abaqus_build_nodes, &
mesh_abaqus_count_cpSizes, & mesh_abaqus_count_cpSizes, &
mesh_abaqus_build_elements, & mesh_abaqus_build_elements
#endif #endif
#if defined(Marc4DAMASK) || defined(Abaqus)
mesh_build_nodeTwins, &
mesh_build_sharedElems, &
mesh_build_ipNeighborhood, &
#endif
mesh_get_damaskOptions, &
mesh_build_cellconnectivity, &
mesh_build_ipAreas, &
mesh_tell_statistics, &
FE_mapElemtype, &
mesh_faceMatch, &
mesh_build_FEdata
contains contains