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

variable attributes adjusted 

compiles now
This commit is contained in:
navyanthkusam 2019-01-28 14:36:44 +01:00
parent 848a81fd39
commit 09dc1041a5
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/commercialFEM_fileList.f90
View File

@ -13,6 +13,7 @@
#include "math.f90" #include "math.f90"
#include "FEsolving.f90" #include "FEsolving.f90"
#include "element.f90" #include "element.f90"
#include "mesh_base.f90"
#ifdef Abaqus #ifdef Abaqus
#include "mesh_abaqus.f90" #include "mesh_abaqus.f90"
#endif #endif

8
src/mesh_abaqus.f90
View File

@ -406,9 +406,6 @@ integer(pInt), dimension(:,:), allocatable, private :: &
mesh_mapMaterial !< name of elementSet for material mesh_mapMaterial !< name of elementSet for material
integer(pInt), dimension(:,:), allocatable :: & integer(pInt), dimension(:,:), allocatable :: &
mesh_mapElemSet !< list of elements in elementSet mesh_mapElemSet !< list of elements in elementSet
integer(pInt), dimension(:,:), allocatable, target :: &
mesh_mapFEtoCPelem, & !< [sorted FEid, corresponding CPid]
mesh_mapFEtoCPnode !< [sorted FEid, corresponding CPid]
logical:: noPart !< for cases where the ABAQUS input file does not use part/assembly information logical:: noPart !< for cases where the ABAQUS input file does not use part/assembly information
contains contains
@ -419,7 +416,7 @@ integer(pInt), dimension(:,:), allocatable, private :: &
contains contains
subroutine tMesh_abaqus_init subroutine tMesh_abaqus_init(self)
implicit none implicit none
class(tMesh_abaqus) :: self class(tMesh_abaqus) :: self
@ -453,7 +450,8 @@ subroutine mesh_init(ip,el)
numerics_unitlength, & numerics_unitlength, &
worldrank worldrank
use FEsolving, only: & use FEsolving, only: &
FEsolving_execElem, & modelName, &
calcMode, & FEsolving_execElem, &
FEsolving_execIP FEsolving_execIP
implicit none implicit none

11
src/mesh_marc.f90
View File

@ -3,7 +3,7 @@
!> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH !> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH
!> @author Christoph Koords, Max-Planck-Institut für Eisenforschung GmbH !> @author Christoph Koords, Max-Planck-Institut für Eisenforschung GmbH
!> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH !> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH
!> @brief Sets up the mesh for the solvers MSC.Marc, Abaqus and the spectral solver !> @brief Sets up the mesh for the solver MSC.Marc
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
module mesh module mesh
use, intrinsic :: iso_c_binding use, intrinsic :: iso_c_binding
@ -400,8 +400,6 @@ integer(pInt), dimension(:,:), allocatable, private :: &
mesh_marc_count_cpSizes, & mesh_marc_count_cpSizes, &
mesh_marc_build_elements mesh_marc_build_elements
contains
type, public, extends(tMesh) :: tMesh_marc type, public, extends(tMesh) :: tMesh_marc
integer(pInt), public :: & integer(pInt), public :: &
@ -417,10 +415,7 @@ type, public, extends(tMesh) :: tMesh_marc
mapMaterial !< name of elementSet for material mapMaterial !< name of elementSet for material
integer(pInt), dimension(:), allocatable :: & integer(pInt), dimension(:), allocatable :: &
Marc_matNumber !< array of material numbers for hypoelastic material (Marc only) Marc_matNumber !< array of material numbers for hypoelastic material (Marc only)
integer(pInt), dimension(:,:), allocatable, target:: & integer(pInt) :: &
mesh_mapFEtoCPelem, & !< [sorted FEid, corresponding CPid]
mesh_mapFEtoCPnode
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
mesh_NelemSets, & mesh_NelemSets, &
@ -435,6 +430,8 @@ type, public, extends(tMesh) :: tMesh_marc
end type tMesh_marc end type tMesh_marc
type(tMesh_marc), public, protected :: theMesh type(tMesh_marc), public, protected :: theMesh
contains contains
subroutine tMesh_marc_init(self) subroutine tMesh_marc_init(self)