From 09dc1041a55124a0acc8607432d91a73be6f323c Mon Sep 17 00:00:00 2001 From: navyanthkusam Date: Mon, 28 Jan 2019 14:36:44 +0100 Subject: [PATCH] variable attributes adjusted compiles now --- src/commercialFEM_fileList.f90 | 1 + src/mesh_abaqus.f90 | 8 +++----- src/mesh_marc.f90 | 11 ++++------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/commercialFEM_fileList.f90 b/src/commercialFEM_fileList.f90 index 7a32e7ade..d2765929f 100644 --- a/src/commercialFEM_fileList.f90 +++ b/src/commercialFEM_fileList.f90 @@ -13,6 +13,7 @@ #include "math.f90" #include "FEsolving.f90" #include "element.f90" +#include "mesh_base.f90" #ifdef Abaqus #include "mesh_abaqus.f90" #endif diff --git a/src/mesh_abaqus.f90 b/src/mesh_abaqus.f90 index bc14cd418..5d225bfb9 100644 --- a/src/mesh_abaqus.f90 +++ b/src/mesh_abaqus.f90 @@ -406,9 +406,6 @@ integer(pInt), dimension(:,:), allocatable, private :: & mesh_mapMaterial !< name of elementSet for material integer(pInt), dimension(:,:), allocatable :: & 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 contains @@ -419,7 +416,7 @@ integer(pInt), dimension(:,:), allocatable, private :: & contains -subroutine tMesh_abaqus_init +subroutine tMesh_abaqus_init(self) implicit none class(tMesh_abaqus) :: self @@ -453,7 +450,8 @@ subroutine mesh_init(ip,el) numerics_unitlength, & worldrank use FEsolving, only: & - FEsolving_execElem, & + modelName, & + calcMode, & FEsolving_execElem, & FEsolving_execIP implicit none diff --git a/src/mesh_marc.f90 b/src/mesh_marc.f90 index 85b4f3e7d..3e0447285 100644 --- a/src/mesh_marc.f90 +++ b/src/mesh_marc.f90 @@ -3,7 +3,7 @@ !> @author Philip Eisenlohr, 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 -!> @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 use, intrinsic :: iso_c_binding @@ -400,8 +400,6 @@ integer(pInt), dimension(:,:), allocatable, private :: & mesh_marc_count_cpSizes, & mesh_marc_build_elements -contains - type, public, extends(tMesh) :: tMesh_marc integer(pInt), public :: & @@ -417,10 +415,7 @@ type, public, extends(tMesh) :: tMesh_marc mapMaterial !< name of elementSet for material integer(pInt), dimension(:), allocatable :: & Marc_matNumber !< array of material numbers for hypoelastic material (Marc only) - integer(pInt), dimension(:,:), allocatable, target:: & - mesh_mapFEtoCPelem, & !< [sorted FEid, corresponding CPid] - mesh_mapFEtoCPnode - integer(pInt), private :: & + integer(pInt) :: & mesh_Nelems, & !< total number of elements in mesh (including non-DAMASK elements) mesh_maxNnodes, & !< max number of nodes in any CP element mesh_NelemSets, & @@ -435,6 +430,8 @@ type, public, extends(tMesh) :: tMesh_marc end type tMesh_marc type(tMesh_marc), public, protected :: theMesh + + contains subroutine tMesh_marc_init(self)