diff options
| author | Elena Pourmal <epourmal@hdfgroup.org> | 2004-07-03 02:37:59 (GMT) |
|---|---|---|
| committer | Elena Pourmal <epourmal@hdfgroup.org> | 2004-07-03 02:37:59 (GMT) |
| commit | 513012e673fa2e6feb98ab564c7524298927bbb7 (patch) | |
| tree | e140dee42d4ba694e1c2a0e1bd72bc2cecc455ab /fortran | |
| parent | e29eb9c99d4cd891060fb78df47ce2982996c401 (diff) | |
| download | hdf5-513012e673fa2e6feb98ab564c7524298927bbb7.zip hdf5-513012e673fa2e6feb98ab564c7524298927bbb7.tar.gz hdf5-513012e673fa2e6feb98ab564c7524298927bbb7.tar.bz2 | |
[svn-r8798]
Purpose: Maintenance
Description: H5_SZIP_CHIP_OPTION_MASK was deleted from the list
of the available parameters for the H5Pset_szip function.
Solution: Updated Fortran source, tests and documentation
to reflect this change.
Platforms tested: arabica (too small for h5committest)
Misc. update:
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/src/H5_f.c | 10 | ||||
| -rw-r--r-- | fortran/src/H5f90global.f90 | 10 | ||||
| -rw-r--r-- | fortran/test/tH5Z.f90 | 2 |
3 files changed, 7 insertions, 15 deletions
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c index ad8d6aa..22ad763 100644 --- a/fortran/src/H5_f.c +++ b/fortran/src/H5_f.c @@ -407,14 +407,10 @@ int_f nh5init1_flags_c(int_f *h5lib_flags) { int ret_value = -1; - 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; + unsigned prm_1 = H5_SZIP_EC_OPTION_MASK; + unsigned prm_2 = 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; + h5lib_flags[1] = (int_f)prm_2; ret_value = 0; return ret_value; } diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90 index 5f6f91e..83d8f9c 100644 --- a/fortran/src/H5f90global.f90 +++ b/fortran/src/H5f90global.f90 @@ -611,21 +611,17 @@ ! ! H5 Library flags declaration ! - INTEGER, PARAMETER :: H5LIB_FLAGS_LEN = 4 + INTEGER, PARAMETER :: H5LIB_FLAGS_LEN = 2 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_AK13_OM_F - INTEGER :: H5_SZIP_CHIP_OM_F INTEGER :: H5_SZIP_EC_OM_F INTEGER :: H5_SZIP_NN_OM_F ! - EQUIVALENCE(H5LIB_flags(1), H5_SZIP_AK13_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) + EQUIVALENCE(H5LIB_flags(1), H5_SZIP_EC_OM_F) + EQUIVALENCE(H5LIB_flags(2), H5_SZIP_NN_OM_F) END MODULE H5GLOBAL diff --git a/fortran/test/tH5Z.f90 b/fortran/test/tH5Z.f90 index 4216d1b..8d6ba8c 100644 --- a/fortran/test/tH5Z.f90 +++ b/fortran/test/tH5Z.f90 @@ -168,7 +168,7 @@ endif endif - options_mask = H5_SZIP_NN_OM_F + H5_SZIP_CHIP_OM_F + options_mask = H5_SZIP_NN_OM_F pix_per_block = 32 ! ! Initialize the dset_data array. |