mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-21 01:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r6602] Purpose:

Browse Source 
Code cleanup

Description:
    Adjusted parameters for fortran wrappers of H5Pset_shuffle to match the
changes to the C API function.

Solution:

Platforms tested:
    FreeBSD 4.8 (sleipnir) w/szip
    Linux 2.4 (sleipnir) w/szip
    Solaris 2.7 (arabica) w/FORTRAN
    IRIX64 6.5 (modi4) w/szip, FORTRAN & parallel

Misc. update:
This commit is contained in:
Quincey Koziol 2003-04-08 20:47:03 -05:00
parent c319d5813a
commit 5f94cb8141
4 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fortran/src/H5Pf.c
View File

@ -2819,16 +2819,14 @@ DONE:
*---------------------------------------------------------------------------*/ *---------------------------------------------------------------------------*/
int_f int_f
nh5pset_shuffle_c ( hid_t_f *prp_id , int_f *type_size) nh5pset_shuffle_c ( hid_t_f *prp_id )
{ {
int ret_value = 0; int ret_value = 0;
hid_t c_prp_id; hid_t c_prp_id;
int c_type_size;
herr_t status; herr_t status;
c_prp_id = (hid_t)*prp_id; c_prp_id = (hid_t)*prp_id;
c_type_size = (int)*type_size ; status = H5Pset_shuffle(c_prp_id);
status = H5Pset_shuffle(c_prp_id, c_type_size);
if ( status < 0 ) ret_value = -1; if ( status < 0 ) ret_value = -1;
return ret_value; return ret_value;
} }

9
fortran/src/H5Pff.f90
View File

@ -5691,7 +5691,6 @@
! !
! Inputs: ! Inputs:
! prp_id - dataset creation property list identifier ! prp_id - dataset creation property list identifier
! type_size - size of the datatype
! Outputs: ! Outputs:
! hdferr: - error code ! hdferr: - error code
! Success: 0 ! Success: 0
@ -5708,7 +5707,7 @@
!---------------------------------------------------------------------- !----------------------------------------------------------------------
SUBROUTINE h5pset_shuffle_f(prp_id, type_size, hdferr) SUBROUTINE h5pset_shuffle_f(prp_id, hdferr)
! !
!This definition is needed for Windows DLLs !This definition is needed for Windows DLLs
!DEC$if defined(BUILD_HDF5_DLL) !DEC$if defined(BUILD_HDF5_DLL)
@ -5717,23 +5716,21 @@
! !
IMPLICIT NONE IMPLICIT NONE
INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier
INTEGER, INTENT(IN) :: type_size ! iSize in bytes of the datatype
INTEGER, INTENT(OUT) :: hdferr ! Error code INTEGER, INTENT(OUT) :: hdferr ! Error code
! INTEGER, EXTERNAL :: h5pset_shuffle_c ! INTEGER, EXTERNAL :: h5pset_shuffle_c
! MS FORTRAN needs explicit interface for C functions called here. ! MS FORTRAN needs explicit interface for C functions called here.
! !
INTERFACE INTERFACE
INTEGER FUNCTION h5pset_shuffle_c(prp_id, type_size) INTEGER FUNCTION h5pset_shuffle_c(prp_id)
USE H5GLOBAL USE H5GLOBAL
!DEC$ IF DEFINED(HDF5F90_WINDOWS) !DEC$ IF DEFINED(HDF5F90_WINDOWS)
!MS$ATTRIBUTES C,reference,alias:'_H5PSET_SHUFFLE_C'::h5pset_shuffle_c !MS$ATTRIBUTES C,reference,alias:'_H5PSET_SHUFFLE_C'::h5pset_shuffle_c
!DEC$ ENDIF !DEC$ ENDIF
INTEGER(HID_T), INTENT(IN) :: prp_id INTEGER(HID_T), INTENT(IN) :: prp_id
INTEGER, INTENT(IN) :: type_size
END FUNCTION h5pset_shuffle_c END FUNCTION h5pset_shuffle_c
END INTERFACE END INTERFACE
hdferr = h5pset_shuffle_c(prp_id, type_size) hdferr = h5pset_shuffle_c(prp_id)
END SUBROUTINE h5pset_shuffle_f END SUBROUTINE h5pset_shuffle_f

2
fortran/src/H5f90proto.h
View File

@ -1054,7 +1054,7 @@ H5_DLL int_f nh5premove_c(hid_t_f *plid, _fcd name, int_f *name_len);
H5_DLL int_f nh5punregister_c(hid_t_f *class, _fcd name, int_f *name_len); H5_DLL int_f nh5punregister_c(hid_t_f *class, _fcd name, int_f *name_len);
H5_DLL int_f nh5pclose_class_c(hid_t_f * class); H5_DLL int_f nh5pclose_class_c(hid_t_f * class);
H5_DLL int_f nh5pget_class_name_c(hid_t_f *prp_id, _fcd name, int_f *name_len); H5_DLL int_f nh5pget_class_name_c(hid_t_f *prp_id, _fcd name, int_f *name_len);
H5_DLL int_f nh5pset_shuffle_c ( hid_t_f *prp_id , int_f *type_size); H5_DLL int_f nh5pset_shuffle_c ( hid_t_f *prp_id);
H5_DLL int_f nh5pset_fletcher32_c ( hid_t_f *prp_id ); H5_DLL int_f nh5pset_fletcher32_c ( hid_t_f *prp_id );
H5_DLL int_f nh5pset_edc_check_c ( hid_t_f *prp_id, int_f *flag ); H5_DLL int_f nh5pset_edc_check_c ( hid_t_f *prp_id, int_f *flag );
H5_DLL int_f nh5pget_edc_check_c ( hid_t_f *prp_id, int_f *flag ); H5_DLL int_f nh5pget_edc_check_c ( hid_t_f *prp_id, int_f *flag );

3
fortran/test/tH5Z.f90
View File

@ -14,7 +14,6 @@
INTEGER(HSIZE_T) :: ch_dims(2) INTEGER(HSIZE_T) :: ch_dims(2)
INTEGER :: RANK = 2 INTEGER :: RANK = 2
INTEGER :: dlevel = 6 INTEGER :: dlevel = 6
INTEGER :: tsize = 4
INTEGER :: edc_flag INTEGER :: edc_flag
ch_dims(1) = 10 ch_dims(1) = 10
@ -45,7 +44,7 @@
CALL check("h5pcreate_f", error, total_error) CALL check("h5pcreate_f", error, total_error)
CALL h5pset_chunk_f(crtpr_id, RANK, ch_dims, error) CALL h5pset_chunk_f(crtpr_id, RANK, ch_dims, error)
CALL check("h5pset_chunk_f",error, total_error) CALL check("h5pset_chunk_f",error, total_error)
CALL h5pset_shuffle_f(crtpr_id, tsize, error) CALL h5pset_shuffle_f(crtpr_id, error)
CALL check("h5pset_shuffle_f", error, total_error) CALL check("h5pset_shuffle_f", error, total_error)
CALL h5pclose_f(crtpr_id,error) CALL h5pclose_f(crtpr_id,error)
CALL check("h5pclose_f", error, total_error) CALL check("h5pclose_f", error, total_error)