From 99fe2dfccd8964e1ade78ac402d09bc2f8579968 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 25 Mar 2014 17:21:47 +0000 Subject: [PATCH] small changes to HDF5, put link to homepage into README not to have double effort --- README | 4 +++- code/IO.f90 | 4 ++-- code/material.f90 | 11 +++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/README b/README index f780905b4..7fd364644 100644 --- a/README +++ b/README @@ -1,3 +1,5 @@ +visit damask.mpie.de for installation and usage instructions + CONTACT INFORMATION Max-Planck-Institut für Eisenforschung GmbH @@ -6,4 +8,4 @@ Max-Planck-Str. 1 Germany Email: DAMASK@mpie.de -http://damask.mpie.de \ No newline at end of file +http://damask.mpie.de diff --git a/code/IO.f90 b/code/IO.f90 index 56768e9b4..13d720147 100644 --- a/code/IO.f90 +++ b/code/IO.f90 @@ -2209,7 +2209,7 @@ subroutine HDF5_mappingHomogenization(mapping) !-------------------------------------------------------------------------------------------------- ! create dataspace - call h5screate_simple_f(2, int([NmatPoints],HSIZE_T), space_id, hdf5err, & + call h5screate_simple_f(1, int([NmatPoints],HSIZE_T), space_id, hdf5err, & int([NmatPoints],HSIZE_T)) if (hdf5err < 0) call IO_error(1_pInt,ext_msg='IO_mappingHomogenization') @@ -2230,7 +2230,7 @@ subroutine HDF5_mappingHomogenization(mapping) !-------------------------------------------------------------------------------------------------- ! create Dataset call h5dcreate_f(mapping_id, "Homogenization", dtype_id, space_id, dset_id, hdf5err) - if (hdf5err < 0) call IO_error(1_pInt,ext_msg='IO_addAttribute') + if (hdf5err < 0) call IO_error(1_pInt,ext_msg='IO_mappingHomogenization') !-------------------------------------------------------------------------------------------------- ! Create memory types (one compound datatype for each member) diff --git a/code/material.f90 b/code/material.f90 index f27765071..efc6c3a75 100644 --- a/code/material.f90 +++ b/code/material.f90 @@ -169,6 +169,9 @@ module material PLASTICITY_nonlocal_ID, & HOMOGENIZATION_none_ID, & HOMOGENIZATION_isostrain_ID, & +#ifdef HDF + material_NconstituentsPhase, & +#endif HOMOGENIZATION_RGC_ID private :: & @@ -1164,4 +1167,12 @@ subroutine material_populateGrains end subroutine material_populateGrains +integer(pInt) pure function material_NconstituentsPhase(matID) + + implicit none + integer(pInt), intent(in) :: matID + + material_NconstituentsPhase = count(microstructure_phase == matID) +end function + end module material