summaryrefslogtreecommitdiffstats
path: root/fortran/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2003-07-01 14:53:37 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2003-07-01 14:53:37 (GMT)
commit93622d0b7a74be940d1ad11c3bf7bc58718055a2 (patch)
tree796656b2b3278e44fdd04a6c67819d3aae823959 /fortran/src
parent732bb9f065b04396254b8a5cd56d38139c2926a8 (diff)
downloadhdf5-93622d0b7a74be940d1ad11c3bf7bc58718055a2.zip
hdf5-93622d0b7a74be940d1ad11c3bf7bc58718055a2.tar.gz
hdf5-93622d0b7a74be940d1ad11c3bf7bc58718055a2.tar.bz2
[svn-r7129] Purpose:
Bug fix Description: Propogate szip flag changes into FORTRAN source & tests Platforms tested: h5committest
Diffstat (limited to 'fortran/src')
-rw-r--r--fortran/src/H5_f.c8
-rw-r--r--fortran/src/H5f90global.f9014
2 files changed, 13 insertions, 9 deletions
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index 82f4d92..e5601b9 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -405,12 +405,14 @@ int_f
nh5init1_flags_c(int_f *h5lib_flags)
{
int ret_value = -1;
- unsigned prm_1 = H5_SZIP_RAW_OPTION_MASK;
- unsigned prm_2 = H5_SZIP_NN_OPTION_MASK;
- unsigned prm_3 = H5_SZIP_RAW_OPTION_MASK | H5_SZIP_NN_OPTION_MASK;
+ unsigned prm_1 = H5_SZIP_ALLOW_K13_OPTION_MASK;
+ unsigned prm_2 = H5_SZIP_CHIP_OPTION_MASK;
+ unsigned prm_3 = H5_SZIP_EC_OPTION_MASK;
+ unsigned prm_4 = H5_SZIP_NN_OPTION_MASK;
h5lib_flags[0] = (int_f)prm_1;
h5lib_flags[1] = (int_f)prm_2;
h5lib_flags[2] = (int_f)prm_3;
+ h5lib_flags[3] = (int_f)prm_4;
ret_value = 0;
return ret_value;
}
diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90
index 7aada3e..6e33a71 100644
--- a/fortran/src/H5f90global.f90
+++ b/fortran/src/H5f90global.f90
@@ -608,19 +608,21 @@
!
! H5 Library flags declaration
!
- INTEGER, PARAMETER :: H5LIB_FLAGS_LEN = 3
+ INTEGER, PARAMETER :: H5LIB_FLAGS_LEN = 4
INTEGER :: H5LIB_flags(H5LIB_FLAGS_LEN)
!DEC$if defined(BUILD_HDF5_DLL)
!DEC$ ATTRIBUTES DLLEXPORT :: /H5LIB_FLAGS/
!DEC$endif
COMMON /H5LIB_FLAGS/ H5LIB_flags
- INTEGER :: H5_SZIP_RAW_OM_F
+ INTEGER :: H5_SZIP_ALLOW_K13_OM_F
+ INTEGER :: H5_SZIP_CHIP_OM_F
+ INTEGER :: H5_SZIP_EC_OM_F
INTEGER :: H5_SZIP_NN_OM_F
- INTEGER :: H5_SZIP_RAWORNN_OM_F
!
- EQUIVALENCE(H5LIB_flags(1), H5_SZIP_RAW_OM_F)
- EQUIVALENCE(H5LIB_flags(2), H5_SZIP_NN_OM_F)
- EQUIVALENCE(H5LIB_flags(3), H5_SZIP_RAWORNN_OM_F)
+ EQUIVALENCE(H5LIB_flags(1), H5_SZIP_ALLOW_K13_OM_F)
+ EQUIVALENCE(H5LIB_flags(2), H5_SZIP_CHIP_OM_F)
+ EQUIVALENCE(H5LIB_flags(3), H5_SZIP_EC_OM_F)
+ EQUIVALENCE(H5LIB_flags(4), H5_SZIP_NN_OM_F)
END MODULE H5GLOBAL