mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r8799]

Browse Source 
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:
This commit is contained in:
Elena Pourmal 2004-07-02 21:39:24 -05:00
parent 0f7e776650
commit 3a6668b2f9
4 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/html/RM_H5P.html
View File

@ -9162,15 +9162,8 @@ SUBROUTINE h5pset_szip_f(prp_id, hdferr)
! A bit-mask conveying the desired
! SZIP options
! Current valid values in Fortran are:
! H5_SZIP_AK13_OM_F
! H5_SZIP_CHIP_OM_F
! H5_SZIP_EC_OM_F
! H5_SZIP_NN_OM_F
! Or the sum of any combination
! of the above, e.g.,
! (H5_SZIP_AK13_OM_F + H5_SZIP_NN_OM_F)
! Check C reference manual regarding
! mutually-exclusive options
INTEGER, INTENT(IN) :: pixels_per_block
! The number of pixels or data elements
! in each data block

10
fortran/src/H5_f.c
View File

@ -381,14 +381,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;
}

10
fortran/src/H5f90global.f90
View File

@ -555,21 +555,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

2
fortran/test/tH5Z.f90
View File

@ -212,7 +212,7 @@
return
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.