From 96cb2a8fb81c9a55205ac50b89dec533d5101a9d Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 4 Jun 2019 20:06:08 +0200 Subject: [PATCH] mesh needs HDF5+results for connectivity --- src/CPFEM.f90 | 4 ++-- src/commercialFEM_fileList.f90 | 8 ++++---- src/mesh_marc.f90 | 7 ++++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/CPFEM.f90 b/src/CPFEM.f90 index 3c9632787..767e86851 100644 --- a/src/CPFEM.f90 +++ b/src/CPFEM.f90 @@ -100,12 +100,12 @@ subroutine CPFEM_initAll(el,ip) call config_init call math_init call FE_init - call mesh_init(ip, el) - call lattice_init #ifdef DAMASK_HDF5 call HDF5_utilities_init call results_init #endif + call mesh_init(ip, el) + call lattice_init call material_init call constitutive_init call crystallite_init diff --git a/src/commercialFEM_fileList.f90 b/src/commercialFEM_fileList.f90 index 5e1cd71eb..5b0c4ec46 100644 --- a/src/commercialFEM_fileList.f90 +++ b/src/commercialFEM_fileList.f90 @@ -16,16 +16,16 @@ #include "FEsolving.f90" #include "element.f90" #include "mesh_base.f90" +#ifdef DAMASK_HDF5 +#include "HDF5_utilities.f90" +#include "results.f90" +#endif #ifdef Abaqus #include "mesh_abaqus.f90" #endif #ifdef Marc4DAMASK #include "mesh_marc.f90" #endif -#ifdef DAMASK_HDF5 -#include "HDF5_utilities.f90" -#include "results.f90" -#endif #include "material.f90" #include "lattice.f90" #include "source_thermal_dissipation.f90" diff --git a/src/mesh_marc.f90 b/src/mesh_marc.f90 index 4c2487297..683bbf3b2 100644 --- a/src/mesh_marc.f90 +++ b/src/mesh_marc.f90 @@ -16,6 +16,10 @@ module mesh use numerics use FEsolving use element +#if defined(DAMASK_HDF5) + use HDF5_utilities + use results +#endif implicit none private @@ -881,6 +885,7 @@ subroutine mesh_get_damaskOptions(periodic_surface,fileUnit) end subroutine mesh_get_damaskOptions + subroutine calcCells(thisMesh,connectivity_elem) class(tMesh) :: thisMesh @@ -888,7 +893,7 @@ subroutine calcCells(thisMesh,connectivity_elem) integer(pInt),dimension(:,:), allocatable :: con_elem,temp,con,parentsAndWeights,candidates_global integer(pInt),dimension(:), allocatable :: l, nodes, candidates_local integer(pInt),dimension(:,:,:), allocatable :: con_cell,connectivity_cell - integer(pInt),dimension(:,:), allocatable :: sorted,test + integer(pInt),dimension(:,:), allocatable :: sorted,test real(pReal), dimension(:,:), allocatable :: coordinates,nodes5 integer(pInt) :: e, n, c, p, s,u,i,m,j,nParentNodes,nCellNode,ierr