tjh.dev
fork
Configure Feed
Select the types of activity you want to include in your feed.
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
fork
Configure Feed
Select the types of activity you want to include in your feed.
1--- a/config/cmake_files/medMacros.cmake
2+++ b/config/cmake_files/medMacros.cmake
3@@ -447,7 +447,7 @@ MACRO(MED_FIND_HDF5)
4 ##
5 ## Requires 1.10.x version
6 ##
7- IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1)
8+ IF (HDF5_VERSION VERSION_LESS 1.10.2)
9 MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.")
10 ENDIF()
11 ##
12--- a/src/ci/MEDfileCompatibility.c
13+++ b/src/ci/MEDfileCompatibility.c
14@@ -71,7 +71,7 @@ MEDfileCompatibility(const char* const filename,
15 _hversionMMR=10000*_hmajeur+100*_hmineur+_hrelease;
16 /* ISCRUTE(_hversionMMR); */
17 /* ISCRUTE(HDF_VERSION_NUM_REF); */
18- if ( (_hversionMMR >= HDF_VERSION_NUM_REF) && (_hmineur == HDF_VERSION_MINOR_REF) ) *hdfok = MED_TRUE;
19+ if ( ((_hversionMMR >= HDF_VERSION_NUM_REF) && (_hmineur == HDF_VERSION_MINOR_REF)) || _hversionMMR > HDF_VERSION_NUM_REF ) *hdfok = MED_TRUE;
20
21 /* TODO : Vérifier si la version mineure HDF du fichier est supérieure
22 à la version mineure de la bibliothèque HDF utilisée :
23@@ -113,7 +113,7 @@ MEDfileCompatibility(const char* const filename,
24 #if MED_NUM_MAJEUR != 4
25 #error "Don't forget to update the test version here when you change the major version of the library !"
26 #endif
27-#if H5_VERS_MINOR > 10
28+#if H5_VERS_MINOR > 12
29 #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !"
30 #error "Cf. _MEDfileCreate ..."
31 #endif
32--- a/src/hdfi/_MEDfileCreate.c
33+++ b/src/hdfi/_MEDfileCreate.c
34@@ -159,7 +159,7 @@ med_idt _MEDfileCreate(const char * const filename, const med_access_mode access
35 * En HDF5-1.10.0p1 cela n'a aucun effet !
36 * Un test autoconf permet de fixer un intervalle de version HDF à MED.
37 */
38-#if H5_VERS_MINOR > 10
39+#if H5_VERS_MINOR > 12
40 #error "Don't forget to change the compatibility version of the library !"
41 #endif
42
43--- a/src/hdfi/_MEDfileOpen.c
44+++ b/src/hdfi/_MEDfileOpen.c
45@@ -72,7 +72,7 @@ med_idt _MEDfileOpen(const char * const filename,const med_access_mode accessmod
46
47 • The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order).
48 */
49-#if H5_VERS_MINOR > 10
50+#if H5_VERS_MINOR > 12
51 #error "Don't forget to change the compatibility version of the library !"
52 #endif
53 /* L'avantage de bloquer le modèle interne HDF5
54--- a/src/hdfi/_MEDmemFileOpen.c
55+++ b/src/hdfi/_MEDmemFileOpen.c
56@@ -434,7 +434,7 @@ med_idt _MEDmemFileOpen(const char * const filename, med_memfile * const memfile
57 goto ERROR;
58 }
59
60-#if H5_VERS_MINOR > 10
61+#if H5_VERS_MINOR > 12
62 #error "Don't forget to change the compatibility version of the library !"
63 #endif
64 if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) {
65--- a/src/hdfi/_MEDparFileCreate.c
66+++ b/src/hdfi/_MEDparFileCreate.c
67@@ -64,7 +64,7 @@ med_idt _MEDparFileCreate(const char * const filename, const med_access_mode acc
68 * En HDF5-1.10.0p1 cela n'a aucun effet !
69 * Un test autoconf permet de fixer un intervalle de version HDF à MED.
70 */
71-#if H5_VERS_MINOR > 10
72+#if H5_VERS_MINOR > 12
73 #error "Don't forget to change the compatibility version of the library !"
74 #endif
75
76--- a/src/hdfi/_MEDparFileOpen.c
77+++ b/src/hdfi/_MEDparFileOpen.c
78@@ -55,7 +55,7 @@ med_idt _MEDparFileOpen(const char * const filename,const med_access_mode access
79 MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG);
80 goto ERROR;
81 }
82-#if H5_VERS_MINOR > 10
83+#if H5_VERS_MINOR > 12
84 #error "Don't forget to change the compatibility version of the library !"
85 #endif
86 if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) {