From a6a6519678bdc86524045771cbcac022e965873e Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 24 Nov 2019 07:44:17 +0100 Subject: [PATCH] more local data handling --- src/CPFEM2.f90 | 2 +- src/geometry_plastic_nonlocal.f90 | 2 +- src/grid/DAMASK_grid.f90 | 9 +-------- src/mesh_grid.f90 | 9 +++++++++ 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/CPFEM2.f90 b/src/CPFEM2.f90 index 5e8aad95e..7123602f8 100644 --- a/src/CPFEM2.f90 +++ b/src/CPFEM2.f90 @@ -57,10 +57,10 @@ subroutine CPFEM_initAll call config_init call math_init call rotations_init - call mesh_init call lattice_init call HDF5_utilities_init call results_init + call mesh_init call material_init call constitutive_init call crystallite_init diff --git a/src/geometry_plastic_nonlocal.f90 b/src/geometry_plastic_nonlocal.f90 index 88634c245..408306b2b 100644 --- a/src/geometry_plastic_nonlocal.f90 +++ b/src/geometry_plastic_nonlocal.f90 @@ -122,7 +122,7 @@ subroutine geometry_plastic_nonlocal_results integer, dimension(:), allocatable :: shp -#if defined(DAMASK_HDF5) +#if defined(PETSc) || defined(DAMASK_HDF5) call results_openJobFile writeVolume: block diff --git a/src/grid/DAMASK_grid.f90 b/src/grid/DAMASK_grid.f90 index 24c9da274..e83cf3283 100644 --- a/src/grid/DAMASK_grid.f90 +++ b/src/grid/DAMASK_grid.f90 @@ -27,7 +27,6 @@ program DAMASK_spectral use grid_mech_FEM use grid_damage_spectral use grid_thermal_spectral - use HDF5_utilities use results use rotations @@ -319,15 +318,9 @@ program DAMASK_spectral enddo close(fileUnit) - call results_openJobFile - call HDF5_closeGroup(results_addGroup('geometry')) - call results_addAttribute('grid',grid,'geometry') - call results_addAttribute('size',geomSize,'geometry') - call results_closeJobFile - !-------------------------------------------------------------------------------------------------- ! doing initialization depending on active solvers - call Utilities_init() + call Utilities_init do field = 1, nActiveFields select case (loadCases(1)%ID(field)) case(FIELD_MECH_ID) diff --git a/src/mesh_grid.f90 b/src/mesh_grid.f90 index d09e01793..2b337f047 100644 --- a/src/mesh_grid.f90 +++ b/src/mesh_grid.f90 @@ -14,6 +14,7 @@ module mesh_grid use IO use debug use numerics + use results use discretization use geometry_plastic_nonlocal use FEsolving @@ -99,6 +100,14 @@ subroutine mesh_init(ip,el) FEsolving_execElem = [1,product(myGrid)] ! parallel loop bounds set to comprise all elements allocate(FEsolving_execIP(2,product(myGrid)),source=1) ! parallel loop bounds set to comprise the only IP +!-------------------------------------------------------------------------------------------------- +! store geometry information for post processing + call results_openJobFile + call results_closeGroup(results_addGroup('geometry')) + call results_addAttribute('grid',grid,'geometry') + call results_addAttribute('size',geomSize,'geometry') + call results_closeJobFile + !-------------------------------------------------------------------------------------------------- ! geometry information required by the nonlocal CP model call geometry_plastic_nonlocal_setIPvolume(reshape([(product(mySize/real(myGrid,pReal)),j=1,product(myGrid))], &