From e3b16639bf10e9f3ad2b67f2ea4808e2973664d9 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 13 Oct 2019 18:20:54 +0200 Subject: [PATCH] native integer needs to match otherwise, results are wrong. Therefore, we need to use our own HDF5 library since MSC provides one for 4 byte integers --- .gitlab-ci.yml | 2 +- src/HDF5_utilities.f90 | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad22c7998..df5a10f60 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,7 +75,7 @@ variables: MSC: "$MSC2019" IntelMarc: "$IntelCompiler17_8" IntelAbaqus: "$IntelCompiler16_4" - HDF5Marc: "HDF5/1.10.4/Intel-17.8" + HDF5Marc: "HDF5/1.10.5/Intel-17.8" # ++++++++++++ Documentation ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Doxygen1_8_15: "Documentation/Doxygen/1.8.15" # ------------ Defaults ---------------------------------------------- diff --git a/src/HDF5_utilities.f90 b/src/HDF5_utilities.f90 index 68281a6a0..e4819431e 100644 --- a/src/HDF5_utilities.f90 +++ b/src/HDF5_utilities.f90 @@ -112,14 +112,10 @@ subroutine HDF5_utilities_init call h5open_f(hdferr) if (hdferr < 0) call IO_error(1,ext_msg='HDF5_Utilities_init: h5open_f') -#ifndef Marc4DAMASK -! This test should ensure that integer size matches. For some reasons, the HDF5 libraries -! that come with MSC.Marc>=2019 seem to be of 4byte even though it is a 8byte Marc version call h5tget_size_f(H5T_NATIVE_INTEGER,typeSize, hdferr) if (hdferr < 0) call IO_error(1,ext_msg='HDF5_Utilities_init: h5tget_size_f (int)') if (int(bit_size(0),SIZE_T)/=typeSize*8) & call IO_error(0,ext_msg='Default integer size does not match H5T_NATIVE_INTEGER') -#endif call h5tget_size_f(H5T_NATIVE_DOUBLE,typeSize, hdferr) if (hdferr < 0) call IO_error(1,ext_msg='HDF5_Utilities_init: h5tget_size_f (double)')