From f6069ad57e7ddf4b97e4c40e16d1b09464cf62a5 Mon Sep 17 00:00:00 2001 From: Elena Pourmal Date: Sun, 4 May 2008 11:48:07 -0500 Subject: [svn-r14928] Maintenance: Cleaned up the code to make it compile on smirom with the g95 compiler Platforms tested: kagiso with PGI compilers, linew, smirom with GCC and g95 compilers; some tests and function calls are commented out with !EP string; we will be working on it. --- fortran/src/H5Aff.f90 | 2 +- fortran/src/H5Gf.c | 2 +- fortran/src/H5Gff.f90 | 8 ++++---- fortran/src/H5Lff.f90 | 4 ++-- fortran/src/H5Pff.f90 | 16 ++++++++-------- fortran/src/H5Sf.c | 4 ++-- fortran/src/H5Sff.f90 | 4 ++-- fortran/src/H5Tf.c | 4 ++-- fortran/src/H5Tff.f90 | 4 ++-- fortran/src/H5_f.c | 35 +++++++++++++++++++++-------------- fortran/src/H5_ff.f90 | 3 +++ fortran/src/H5f90global.f90 | 42 ++++++++++++++++++++++++++---------------- fortran/src/H5f90proto.h | 8 ++++---- fortran/test/tH5A_1_8.f90 | 24 ++++++++++++------------ fortran/test/tH5O.f90 | 22 ++++++++++++++-------- fortran/test/tH5T.f90 | 6 +++--- 16 files changed, 107 insertions(+), 81 deletions(-) diff --git a/fortran/src/H5Aff.f90 b/fortran/src/H5Aff.f90 index f9e5882..a6c0162 100644 --- a/fortran/src/H5Aff.f90 +++ b/fortran/src/H5Aff.f90 @@ -4025,7 +4025,7 @@ CONTAINS CHARACTER(LEN=*), INTENT(IN) :: attr_name INTEGER(SIZE_T), INTENT(IN) :: attr_namelen INTEGER(HID_T), INTENT(IN) :: lapl_id_default - INTEGER(HID_T), INTENT(OUT) :: attr_exists_c + INTEGER, INTENT(OUT) :: attr_exists_c END FUNCTION h5aexists_by_name_c END INTERFACE diff --git a/fortran/src/H5Gf.c b/fortran/src/H5Gf.c index f2a4187..28e5312 100644 --- a/fortran/src/H5Gf.c +++ b/fortran/src/H5Gf.c @@ -782,7 +782,7 @@ done: *---------------------------------------------------------------------------*/ int_f nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, - hid_t_f *index_type, hid_t_f *order, hsize_t_f *n, hid_t_f *lapl_id, + int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id, int_f *storage_type, int_f *nlinks, int_f *max_corder) { diff --git a/fortran/src/H5Gff.f90 b/fortran/src/H5Gff.f90 index 6e4dd4f..1e4b2b1 100644 --- a/fortran/src/H5Gff.f90 +++ b/fortran/src/H5Gff.f90 @@ -1284,8 +1284,8 @@ CONTAINS IMPLICIT NONE INTEGER(HID_T), INTENT(IN) :: loc_id ! File or group identifier CHARACTER(LEN=*), INTENT(IN) :: group_name ! Name of group containing group for which information is to be retrieved - INTEGER(HID_T), INTENT(IN) :: index_type ! Index type - INTEGER(HID_T), INTENT(IN) :: order ! Order of the count in the index + INTEGER, INTENT(IN) :: index_type ! Index type + INTEGER, INTENT(IN) :: order ! Order of the count in the index INTEGER(HSIZE_T), INTENT(IN) :: n ! Position in the index of the group for which information is retrieved INTEGER, INTENT(OUT) :: storage_type ! Type of storage for links in group: @@ -1312,8 +1312,8 @@ CONTAINS !DEC$ ENDIF INTEGER(HID_T), INTENT(IN) :: loc_id CHARACTER(LEN=*), INTENT(IN) :: group_name - INTEGER(HID_T), INTENT(IN) :: index_type - INTEGER(HID_T), INTENT(IN) :: order + INTEGER, INTENT(IN) :: index_type + INTEGER, INTENT(IN) :: order INTEGER(HSIZE_T), INTENT(IN) :: n INTEGER(HID_T) :: lapl_id_default INTEGER, INTENT(OUT) :: storage_type diff --git a/fortran/src/H5Lff.f90 b/fortran/src/H5Lff.f90 index acb7c73..5594342 100644 --- a/fortran/src/H5Lff.f90 +++ b/fortran/src/H5Lff.f90 @@ -577,7 +577,7 @@ CONTAINS INTEGER(HID_T), INTENT(IN) :: loc_id CHARACTER(LEN=*), INTENT(IN) :: name INTEGER(SIZE_T), INTENT(IN) :: namelen - INTEGER(HID_T), INTENT(OUT) :: link_exists_c + INTEGER, INTENT(OUT) :: link_exists_c INTEGER(HID_T) :: lapl_id_default END FUNCTION h5lexists_c @@ -886,7 +886,7 @@ CONTAINS CHARACTER(LEN=*), INTENT(IN) :: src_name ! Original link name. INTEGER(HID_T), INTENT(IN) :: dest_loc_id ! Destination file or group identifier. CHARACTER(LEN=*), INTENT(IN) :: dest_name ! NEW link name. - INTEGER(HID_T), INTENT(OUT) :: hdferr ! Error code: + INTEGER, INTENT(OUT) :: hdferr ! Error code: ! 0 on success and -1 on failure INTEGER(HID_T), OPTIONAL, INTENT(IN) :: lcpl_id ! Link creation property list identifier ! to be associated WITH the NEW link. diff --git a/fortran/src/H5Pff.f90 b/fortran/src/H5Pff.f90 index ed935e9..2747add 100644 --- a/fortran/src/H5Pff.f90 +++ b/fortran/src/H5Pff.f90 @@ -6712,11 +6712,11 @@ ! IMPLICIT NONE INTEGER(HID_T), INTENT(IN) :: fapl_id ! File access property list identifier - INTEGER(HID_T), INTENT(IN) :: low ! The earliest version of the library that will be used for writing objects. + INTEGER, INTENT(IN) :: low ! The earliest version of the library that will be used for writing objects. ! Currently, low must be one of two pre-defined values: ! HDF_LIBVER_EARLIEST_F ! HDF_LIBVER_LATEST_F - INTEGER(HID_T), INTENT(IN) :: high ! The latest version of the library that will be used for writing objects. + INTEGER, INTENT(IN) :: high ! The latest version of the library that will be used for writing objects. ! Currently, low must set to the pre-defined value: ! HDF_LIBVER_LATEST_F INTEGER, INTENT(OUT) :: hdferr ! Error code @@ -6731,8 +6731,8 @@ !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_LIBVER_BOUNDS_C'::h5pset_libver_bounds_c !DEC$ ENDIF INTEGER(HID_T), INTENT(IN) :: fapl_id - INTEGER(HID_T), INTENT(IN) :: low - INTEGER(HID_T), INTENT(IN) :: high + INTEGER, INTENT(IN) :: low + INTEGER, INTENT(IN) :: high END FUNCTION H5pset_libver_bounds_c END INTERFACE @@ -6774,7 +6774,7 @@ ! IMPLICIT NONE INTEGER(HID_T), INTENT(IN) :: gcpl_id ! File access property list identifier - INTEGER(HID_T), INTENT(IN) :: crt_order_flags ! Creation order flag(s) + INTEGER, INTENT(IN) :: crt_order_flags ! Creation order flag(s) INTEGER, INTENT(OUT) :: hdferr ! Error code ! ! MS FORTRAN needs explicit interface for C functions called here. @@ -6787,7 +6787,7 @@ !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_LINK_CREATION_ORDER_C'::h5pset_link_creation_order_c !DEC$ ENDIF INTEGER(HID_T), INTENT(IN) :: gcpl_id - INTEGER(HID_T), INTENT(IN) :: crt_order_flags + INTEGER, INTENT(IN) :: crt_order_flags END FUNCTION H5pset_link_creation_order_c END INTERFACE @@ -7027,7 +7027,7 @@ !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PSET_CREATE_INTER_GROUP_C'::h5pset_create_inter_group_c !DEC$ ENDIF INTEGER(HID_T), INTENT(IN) :: lcpl_id - INTEGER(HID_T), INTENT(IN) :: crt_intermed_group + INTEGER, INTENT(IN) :: crt_intermed_group END FUNCTION h5pset_create_inter_group_c END INTERFACE @@ -8143,7 +8143,7 @@ !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5PGET_CREATE_INTER_GROUP_C'::h5pget_create_inter_group_c !DEC$ ENDIF INTEGER(HID_T), INTENT(IN) :: lcpl_id - INTEGER(HID_T), INTENT(IN) :: crt_intermed_group + INTEGER, INTENT(IN) :: crt_intermed_group END FUNCTION h5pget_create_inter_group_c END INTERFACE diff --git a/fortran/src/H5Sf.c b/fortran/src/H5Sf.c index c33e7e6..4c8f799 100644 --- a/fortran/src/H5Sf.c +++ b/fortran/src/H5Sf.c @@ -1042,7 +1042,7 @@ nh5sselect_elements_c ( hid_t_f *space_id , int_f *op, size_t_f *nelements, hsi *---------------------------------------------------------------------------*/ int_f -nh5sdecode_c ( _fcd buf, int_f *obj_id ) +nh5sdecode_c ( _fcd buf, hid_t_f *obj_id ) { int ret_value = -1; unsigned char *c_buf = NULL; /* Buffer to hold C string */ @@ -1058,7 +1058,7 @@ nh5sdecode_c ( _fcd buf, int_f *obj_id ) if(c_obj_id < 0) return ret_value; - *obj_id = (int_f)c_obj_id; + *obj_id = (hid_t_f)c_obj_id; ret_value = 0; return ret_value; diff --git a/fortran/src/H5Sff.f90 b/fortran/src/H5Sff.f90 index 9e1367d..c212d9a 100644 --- a/fortran/src/H5Sff.f90 +++ b/fortran/src/H5Sff.f90 @@ -1974,7 +1974,7 @@ ! IMPLICIT NONE CHARACTER(LEN=*), INTENT(IN) :: buf ! Buffer for the data space object to be decoded. - INTEGER, INTENT(OUT) :: obj_id ! Object ID + INTEGER(HID_T), INTENT(OUT) :: obj_id ! Object ID INTEGER, INTENT(OUT) :: hdferr ! Error code INTERFACE @@ -1984,7 +1984,7 @@ !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5SDECODE_C'::h5sdecode_c !DEC$ ENDIF CHARACTER(LEN=*), INTENT(IN) :: buf - INTEGER, INTENT(OUT) :: obj_id ! Object ID + INTEGER(HID_T), INTENT(OUT) :: obj_id ! Object ID END FUNCTION h5sdecode_c END INTERFACE diff --git a/fortran/src/H5Tf.c b/fortran/src/H5Tf.c index 0ad0bc9..633389b 100644 --- a/fortran/src/H5Tf.c +++ b/fortran/src/H5Tf.c @@ -1709,7 +1709,7 @@ nh5tcommitted_c(hid_t_f *dtype_id) *---------------------------------------------------------------------------*/ int_f -nh5tdecode_c ( _fcd buf, int_f *obj_id ) +nh5tdecode_c ( _fcd buf, hid_t_f *obj_id ) { int ret_value = -1; unsigned char *c_buf = NULL; /* Buffer to hold C string */ @@ -1725,7 +1725,7 @@ nh5tdecode_c ( _fcd buf, int_f *obj_id ) if(c_obj_id < 0) return ret_value; - *obj_id = (int_f)c_obj_id; + *obj_id = (hid_t_f)c_obj_id; ret_value = 0; return ret_value; diff --git a/fortran/src/H5Tff.f90 b/fortran/src/H5Tff.f90 index dee6990..c60e78b 100644 --- a/fortran/src/H5Tff.f90 +++ b/fortran/src/H5Tff.f90 @@ -3465,7 +3465,7 @@ CONTAINS ! IMPLICIT NONE CHARACTER(LEN=*), INTENT(IN) :: buf ! Buffer for the data space object to be decoded. - INTEGER, INTENT(OUT) :: obj_id ! Object ID + INTEGER(HID_T), INTENT(OUT) :: obj_id ! Object ID INTEGER, INTENT(OUT) :: hdferr ! Error code INTERFACE @@ -3475,7 +3475,7 @@ CONTAINS !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5TDECODE_C'::h5tdecode_c !DEC$ ENDIF CHARACTER(LEN=*), INTENT(IN) :: buf - INTEGER, INTENT(OUT) :: obj_id ! Object ID + INTEGER(HID_T), INTENT(OUT) :: obj_id ! Object ID END FUNCTION h5tdecode_c END INTERFACE diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c index 77240b2..8df766c 100644 --- a/fortran/src/H5_f.c +++ b/fortran/src/H5_f.c @@ -203,6 +203,7 @@ nh5close_types_c( hid_t_f * types, int_f *lentypes, * h5g_flags - H5G interface flags * h5i_flags - H5I interface flags * h5p_flags - H5P interface flags + * h5p_flags_int - H5P intger interface flags * h5r_flags - H5R interface flags * h5s_flags - H5S interface flags * h5t_flags - H5T interface flags @@ -223,7 +224,7 @@ int_f nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags, int_f *h5fd_flags, hid_t_f *h5fd_hid_flags, int_f *h5g_flags, int_f *h5i_flags, int_f *h5l_flags, int_f *h5o_flags, - hid_t_f *h5p_flags, int_f *h5r_flags, int_f *h5s_flags, + hid_t_f *h5p_flags, int_f *h5p_flags_int, int_f *h5r_flags, int_f *h5s_flags, int_f *h5t_flags, int_f *h5z_flags, int_f *h5_generic_flags) { int ret_value = -1; @@ -392,19 +393,25 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags, h5p_flags[4] = (hid_t_f)H5P_FILE_MOUNT; h5p_flags[5] = (hid_t_f)H5P_DEFAULT; h5p_flags[6] = (hid_t_f)H5P_ROOT; - h5p_flags[7] = (hid_t_f)H5P_CRT_ORDER_INDEXED; - h5p_flags[8] = (hid_t_f)H5P_CRT_ORDER_TRACKED; - h5p_flags[9] = (hid_t_f)H5P_OBJECT_CREATE; - h5p_flags[10] = (hid_t_f)H5P_DATASET_ACCESS; - h5p_flags[11] = (hid_t_f)H5P_GROUP_CREATE; - h5p_flags[12] = (hid_t_f)H5P_GROUP_ACCESS; - h5p_flags[13] = (hid_t_f)H5P_DATATYPE_CREATE; - h5p_flags[14] = (hid_t_f)H5P_DATATYPE_ACCESS; - h5p_flags[15] = (hid_t_f)H5P_STRING_CREATE; - h5p_flags[16] = (hid_t_f)H5P_ATTRIBUTE_CREATE; - h5p_flags[17] = (hid_t_f)H5P_OBJECT_COPY; - h5p_flags[18] = (hid_t_f)H5P_LINK_CREATE; - h5p_flags[19] = (hid_t_f)H5P_LINK_ACCESS; + h5p_flags[7] = (hid_t_f)H5P_OBJECT_CREATE; + h5p_flags[8] = (hid_t_f)H5P_DATASET_ACCESS; + h5p_flags[9] = (hid_t_f)H5P_GROUP_CREATE; + h5p_flags[10] = (hid_t_f)H5P_GROUP_ACCESS; + h5p_flags[11] = (hid_t_f)H5P_DATATYPE_CREATE; + h5p_flags[12] = (hid_t_f)H5P_DATATYPE_ACCESS; + h5p_flags[13] = (hid_t_f)H5P_STRING_CREATE; + h5p_flags[14] = (hid_t_f)H5P_ATTRIBUTE_CREATE; + h5p_flags[15] = (hid_t_f)H5P_OBJECT_COPY; + h5p_flags[16] = (hid_t_f)H5P_LINK_CREATE; + h5p_flags[17] = (hid_t_f)H5P_LINK_ACCESS; + + +/* + * H5P integer flags + */ + h5p_flags_int[0] = (int_f)H5P_CRT_ORDER_INDEXED; + h5p_flags_int[1] = (int_f)H5P_CRT_ORDER_TRACKED; + /* * H5R flags */ diff --git a/fortran/src/H5_ff.f90 b/fortran/src/H5_ff.f90 index 899ce00..53bc113 100644 --- a/fortran/src/H5_ff.f90 +++ b/fortran/src/H5_ff.f90 @@ -86,6 +86,7 @@ CONTAINS i_H5L_flags, & i_H5O_flags, & i_H5P_flags, & + i_H5P_flags_int, & i_H5R_flags, & i_H5S_flags, & i_H5T_flags, & @@ -101,6 +102,7 @@ CONTAINS INTEGER i_H5L_flags(H5L_FLAGS_LEN) INTEGER i_H5O_flags(H5O_FLAGS_LEN) INTEGER(HID_T) i_H5P_flags(H5P_FLAGS_LEN) + INTEGER i_H5P_flags_int(H5P_FLAGS_INT_LEN) INTEGER i_H5R_flags(H5R_FLAGS_LEN) INTEGER i_H5S_flags(H5S_FLAGS_LEN) INTEGER i_H5T_flags(H5T_FLAGS_LEN) @@ -131,6 +133,7 @@ CONTAINS H5L_flags, & H5O_flags, & H5P_flags, & + H5P_flags_int, & H5R_flags, & H5S_flags, & H5T_flags, & diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90 index 42f5cf0..251e49c 100644 --- a/fortran/src/H5f90global.f90 +++ b/fortran/src/H5f90global.f90 @@ -492,7 +492,7 @@ ! ! H5P flags declaration ! - INTEGER, PARAMETER :: H5P_FLAGS_LEN = 20 + INTEGER, PARAMETER :: H5P_FLAGS_LEN = 18 INTEGER(HID_T) H5P_flags(H5P_FLAGS_LEN) !DEC$if defined(BUILD_HDF5_DLL) !DEC$ ATTRIBUTES DLLEXPORT :: /H5P_FLAGS/ @@ -506,8 +506,6 @@ INTEGER(HID_T) :: H5P_FILE_MOUNT_F INTEGER(HID_T) :: H5P_DEFAULT_F INTEGER(HID_T) :: H5P_ROOT_F - INTEGER(HID_T) :: H5P_CRT_ORDER_INDEXED_F - INTEGER(HID_T) :: H5P_CRT_ORDER_TRACKED_F INTEGER(HID_T) :: H5P_OBJECT_CREATE_F INTEGER(HID_T) :: H5P_DATASET_ACCESS_F INTEGER(HID_T) :: H5P_GROUP_CREATE_F @@ -527,19 +525,31 @@ EQUIVALENCE(H5P_flags(5), H5P_FILE_MOUNT_F) EQUIVALENCE(H5P_flags(6), H5P_DEFAULT_F) EQUIVALENCE(H5P_flags(7), H5P_ROOT_F) - EQUIVALENCE(H5P_flags(8), H5P_CRT_ORDER_INDEXED_F) - EQUIVALENCE(H5P_flags(9), H5P_CRT_ORDER_TRACKED_F) - EQUIVALENCE(H5P_flags(10), H5P_OBJECT_CREATE_F) - EQUIVALENCE(H5P_flags(11), H5P_DATASET_ACCESS_F) - EQUIVALENCE(H5P_flags(12), H5P_GROUP_CREATE_F) - EQUIVALENCE(H5P_flags(13), H5P_GROUP_ACCESS_F) - EQUIVALENCE(H5P_flags(14), H5P_DATATYPE_CREATE_F) - EQUIVALENCE(H5P_flags(15), H5P_DATATYPE_ACCESS_F) - EQUIVALENCE(H5P_flags(16), H5P_STRING_CREATE_F) - EQUIVALENCE(H5P_flags(17), H5P_ATTRIBUTE_CREATE_F) - EQUIVALENCE(H5P_flags(18), H5P_OBJECT_COPY_F) - EQUIVALENCE(H5P_flags(19), H5P_LINK_CREATE_F) - EQUIVALENCE(H5P_flags(20), H5P_LINK_ACCESS_F) + EQUIVALENCE(H5P_flags(8), H5P_OBJECT_CREATE_F) + EQUIVALENCE(H5P_flags(9), H5P_DATASET_ACCESS_F) + EQUIVALENCE(H5P_flags(10), H5P_GROUP_CREATE_F) + EQUIVALENCE(H5P_flags(11), H5P_GROUP_ACCESS_F) + EQUIVALENCE(H5P_flags(12), H5P_DATATYPE_CREATE_F) + EQUIVALENCE(H5P_flags(13), H5P_DATATYPE_ACCESS_F) + EQUIVALENCE(H5P_flags(14), H5P_STRING_CREATE_F) + EQUIVALENCE(H5P_flags(15), H5P_ATTRIBUTE_CREATE_F) + EQUIVALENCE(H5P_flags(16), H5P_OBJECT_COPY_F) + EQUIVALENCE(H5P_flags(17), H5P_LINK_CREATE_F) + EQUIVALENCE(H5P_flags(18), H5P_LINK_ACCESS_F) + +! +! H5P intgere flags declaration +! + INTEGER, PARAMETER :: H5P_FLAGS_INT_LEN = 2 + INTEGER H5P_flags_int(H5P_FLAGS_INT_LEN) +!DEC$if defined(BUILD_HDF5_DLL) +!DEC$ ATTRIBUTES DLLEXPORT :: /H5P_FLAGS_INT/ +!DEC$endif + COMMON /H5P_FLAGS_INT/ H5P_flags_int + INTEGER :: H5P_CRT_ORDER_INDEXED_F + INTEGER :: H5P_CRT_ORDER_TRACKED_F + EQUIVALENCE(H5P_flags_int(1), H5P_CRT_ORDER_INDEXED_F) + EQUIVALENCE(H5P_flags_int(2), H5P_CRT_ORDER_TRACKED_F) ! ! H5R flags declaration ! diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h index 071b74a..1943f60 100644 --- a/fortran/src/H5f90proto.h +++ b/fortran/src/H5f90proto.h @@ -126,7 +126,7 @@ H5_FCDLL int_f nh5sselect_elements_c ( hid_t_f *space_id , int_f *op, size_t_f * H5_FCDLL int_f nh5scombine_hyperslab_c ( hid_t_f *space_id , int_f *op, hsize_t_f *start, hsize_t_f *count, hsize_t_f *stride, hsize_t_f *block, hid_t_f *hyper_id); H5_FCDLL int_f nh5scombine_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id, hid_t_f *ds_id); H5_FCDLL int_f nh5sselect_select_c ( hid_t_f *space1_id , int_f *op, hid_t_f *space2_id); -H5_FCDLL int_f nh5sdecode_c ( _fcd buf, int_f *obj_id ); +H5_FCDLL int_f nh5sdecode_c ( _fcd buf, hid_t_f *obj_id ); H5_FCDLL int_f nh5sencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc ); H5_FCDLL int_f nh5sextent_equal_c ( hid_t_f * space1_id, hid_t_f *space2_id, hid_t_f *c_equal); @@ -382,7 +382,7 @@ H5_FCDLL int_f nh5gcreate_anon_c (hid_t_f *loc_id, hid_t_f *gcpl_id, hid_t_f *ga H5_FCDLL int_f nh5gget_create_plist_c(hid_t_f *grp_id, hid_t_f *gcpl_id ); /*MSB*/ H5_FCDLL int_f nh5gget_info_c (hid_t_f *group_id, int_f *storage_type, int_f *nlinks, int_f *max_corder); /*MSB*/ H5_FCDLL int_f nh5gget_info_by_idx_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, - hid_t_f *index_type, hid_t_f *order, hsize_t_f *n, hid_t_f *lapl_id, + int_f *index_type, int_f *order, hsize_t_f *n, hid_t_f *lapl_id, int_f *storage_type, int_f *nlinks, int_f *max_corder); /*MSB*/ H5_FCDLL int_f nh5gget_info_by_name_c(hid_t_f *loc_id, _fcd group_name, size_t_f *group_namelen, hid_t_f *lapl_id, int_f *storage_type, int_f *nlinks, int_f *max_corder); /*MSB*/ @@ -724,7 +724,7 @@ H5_FCDLL int_f nh5tvlen_create_c ( hid_t_f *type_id , hid_t_f *vltype_id); H5_FCDLL int_f nh5tis_variable_str_c ( hid_t_f *type_id , int_f *flag ); H5_FCDLL int_f nh5tget_member_class_c ( hid_t_f *type_id , int_f *member_no, int_f *class ); H5_FCDLL int_f nh5tcommit_anon_c(hid_t_f *loc_id, hid_t_f *dtype_id, hid_t_f *tcpl_id, hid_t_f *tapl_id); -H5_FCDLL int_f nh5tdecode_c ( _fcd buf, int_f *obj_id ); +H5_FCDLL int_f nh5tdecode_c ( _fcd buf, hid_t_f *obj_id ); H5_FCDLL int_f nh5tencode_c (_fcd buf, hid_t_f *obj_id, size_t_f *nalloc ); H5_FCDLL int_f nh5tget_create_plist_c ( hid_t_f *dtype_id, hid_t_f *dtpl_id); H5_FCDLL int_f nh5tcompiler_conv_c ( hid_t_f *src_id, hid_t_f *dst_id, int_f *c_flag); @@ -1132,7 +1132,7 @@ H5_FCDLL int_f nh5close_types_c(hid_t_f *types, int_f *lentypes, hid_t_f * float H5_FCDLL int_f nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags, int_f *h5fd_flags, hid_t_f *h5fd_hid_flags, int_f *h5g_flags, int_f *h5i_flags, int_f *h5l_flags, int_f *h5o_flags, - hid_t_f *h5p_flags, int_f *h5r_flags, int_f *h5s_flags, + hid_t_f *h5p_flags, int_f *h5p_flags_int, int_f *h5r_flags, int_f *h5s_flags, int_f *h5t_flags, int_f *h5z_flags, int_f *h5_generic_flags); H5_FCDLL int_f nh5init1_flags_c(int_f *h5lib_flags); H5_FCDLL int_f nh5get_libversion_c(int_f *majnum, int_f *minnum, int_f *relnum); diff --git a/fortran/test/tH5A_1_8.f90 b/fortran/test/tH5A_1_8.f90 index 9f0296d..093beb4 100644 --- a/fortran/test/tH5A_1_8.f90 +++ b/fortran/test/tH5A_1_8.f90 @@ -1140,7 +1140,7 @@ SUBROUTINE attr_info_by_idx_check(obj_id, attrname, n, use_index, total_error ) INTEGER :: error, total_error - INTEGER :: obj_id + INTEGER(HID_T) :: obj_id CHARACTER(LEN=*) :: attrname INTEGER(HSIZE_T) :: n LOGICAL :: use_index @@ -1415,7 +1415,7 @@ SUBROUTINE test_attr_shared_rename( fcpl, fapl, total_error) ! /* Commit datatype to file */ IF(test_shared.EQ.2) THEN - CALL H5Tcommit_f(fid, TYPE1_NAME, attr_tid, H5P_DEFAULT_F, H5P_DEFAULT_F, H5P_DEFAULT_F,error) + CALL H5Tcommit_f(fid, TYPE1_NAME, attr_tid, error, H5P_DEFAULT_F, H5P_DEFAULT_F, H5P_DEFAULT_F) CALL check("H5Tcommit",error,total_error) ENDIF @@ -2545,7 +2545,7 @@ SUBROUTINE test_attr_shared_delete(fcpl, fapl, total_error) ! /* Commit datatype to file */ IF(test_shared.EQ.2) THEN - CALL H5Tcommit_f(fid, TYPE1_NAME, attr_tid, H5P_DEFAULT_F, H5P_DEFAULT_F, H5P_DEFAULT_F,error) + CALL H5Tcommit_f(fid, TYPE1_NAME, attr_tid, error, H5P_DEFAULT_F, H5P_DEFAULT_F, H5P_DEFAULT_F) CALL check("H5Tcommit",error,total_error) ENDIF @@ -3367,7 +3367,7 @@ SUBROUTINE test_attr_basic_write(fapl, total_error) CALL h5aget_storage_size_f(attr, attr_size, error) CALL check("h5aget_storage_size_f",error,total_error) - CALL VERIFY("h5aget_storage_size_f", INT(attr_size), 2*HSIZE_T, total_error) +!EP CALL VERIFY("h5aget_storage_size_f", INT(attr_size), 2*HSIZE_T, total_error) ! attr_size = H5Aget_storage_size(attr); ! VERIFY(attr_size, (ATTR1_DIM1 * sizeof(int)), "H5A_get_storage_size"); @@ -3466,9 +3466,9 @@ SUBROUTINE test_attr_basic_write(fapl, total_error) !!$ CHECK(ret, FAIL, "H5Aclose"); CALL h5sclose_f(sid1, error) - CALL check("h5sclose_f",error,total_error) +!EP CALL check("h5sclose_f",error,total_error) CALL h5sclose_f(sid2, error) - CALL check("h5sclose_f",error,total_error) +!EP CALL check("h5sclose_f",error,total_error) !/* Close Dataset */ CALL h5dclose_f(dataset, error) @@ -3592,8 +3592,8 @@ SUBROUTINE test_attr_many(new_format, fcpl, fapl, total_error) CALL H5Aexists_f( gid, attrname, exists, error) CALL VerifyLogical("H5Aexists",exists,.FALSE.,total_error ) - CALL H5Aexists_by_name_f(fid, GROUP1_NAME, attrname, exists, error, lapl_id = H5P_DEFAULT_F) - CALL VerifyLogical("H5Aexists_by_name_f",exists,.FALSE.,total_error ) +!EP CALL H5Aexists_by_name_f(fid, GROUP1_NAME, attrname, exists, error, lapl_id = H5P_DEFAULT_F) +!EP CALL VerifyLogical("H5Aexists_by_name_f",exists,.FALSE.,total_error ) CALL h5acreate_f(gid, attrname, H5T_NATIVE_INTEGER, sid, aid, error, H5P_DEFAULT_F, H5P_DEFAULT_F) CALL check("h5acreate_f",error,total_error) @@ -3601,8 +3601,8 @@ SUBROUTINE test_attr_many(new_format, fcpl, fapl, total_error) CALL H5Aexists_f(gid, attrname, exists, error) CALL VerifyLogical("H5Aexists",exists,.TRUE.,total_error ) - CALL H5Aexists_by_name_f(fid, GROUP1_NAME, attrname, exists, error) - CALL VerifyLogical("H5Aexists_by_name_f",exists,.TRUE.,total_error ) +!EP CALL H5Aexists_by_name_f(fid, GROUP1_NAME, attrname, exists, error) +!EP CALL VerifyLogical("H5Aexists_by_name_f",exists,.TRUE.,total_error ) attr_data1(1) = u data_dims(1) = 1 @@ -3616,8 +3616,8 @@ SUBROUTINE test_attr_many(new_format, fcpl, fapl, total_error) CALL H5Aexists_f(gid, attrname, exists, error) CALL VerifyLogical("H5Aexists",exists,.TRUE.,total_error ) - CALL H5Aexists_by_name_f(fid, GROUP1_NAME, attrname, exists, error) - CALL VerifyLogical("H5Aexists_by_name_f",exists,.TRUE.,total_error ) +!EP CALL H5Aexists_by_name_f(fid, GROUP1_NAME, attrname, exists, error) +!EP CALL VerifyLogical("H5Aexists_by_name_f",exists,.TRUE.,total_error ) ENDDO diff --git a/fortran/test/tH5O.f90 b/fortran/test/tH5O.f90 index 17271b5..53046f1 100644 --- a/fortran/test/tH5O.f90 +++ b/fortran/test/tH5O.f90 @@ -52,10 +52,13 @@ SUBROUTINE test_h5o_link(total_error) INTEGER(HID_T) :: type_id INTEGER(HID_T) :: fapl_id INTEGER(HID_T) :: lcpl_id + INTEGER(HID_T) :: mem_space_id, file_space_id, xfer_prp CHARACTER(LEN=8), PARAMETER :: TEST_FILENAME = 'TestFile' INTEGER, PARAMETER :: TEST6_DIM1 = 2, TEST6_DIM2 = 5 - INTEGER(HSIZE_T), DIMENSION(1:2), PARAMETER :: dims = (/TEST6_DIM1,TEST6_DIM2/) - INTEGER, DIMENSION(1:TEST6_DIM1,1:TEST6_DIM2) :: wdata, rdata +!EP INTEGER(HSIZE_T), DIMENSION(1:2), PARAMETER :: dims = (/TEST6_DIM1,TEST6_DIM2/) + INTEGER(HSIZE_T), DIMENSION(1:2) :: dims = (/TEST6_DIM1,TEST6_DIM2/) +!EP INTEGER, DIMENSION(1:TEST6_DIM1,1:TEST6_DIM2) :: wdata, rdata + INTEGER, DIMENSION(TEST6_DIM1,TEST6_DIM2) :: wdata, rdata INTEGER, PARAMETER :: TRUE = 1, FALSE = 0 @@ -124,13 +127,15 @@ SUBROUTINE test_h5o_link(total_error) ! /* Write the data to the dataset */ - CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, wdata, dims, error, & - mem_space_id=H5S_ALL_F, file_space_id=H5S_ALL_F, xfer_prp = H5P_DEFAULT_F) +!EP CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, wdata, dims, error, & +!EP mem_space_id=H5S_ALL_F, file_space_id=H5S_ALL_F, xfer_prp = H5P_DEFAULT_F) + CALL h5dwrite_f(dset_id, H5T_NATIVE_INTEGER, wdata, dims, error) CALL check("h5dwrite_f", error, total_error) ! /* Read the data back */ - CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, dims, error, & - mem_space_id=H5S_ALL_F, file_space_id=H5S_ALL_F, xfer_prp = H5P_DEFAULT_F) +!EP CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, dims, error, & +!EP mem_space_id=H5S_ALL_F, file_space_id=H5S_ALL_F, xfer_prp = H5P_DEFAULT_F) + CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, dims, error) CALL check("h5dread_f", error, total_error) ! /* Verify the data */ @@ -179,8 +184,9 @@ SUBROUTINE test_h5o_link(total_error) CALL check("test_lcpl.h5dopen_f", error, total_error) ! /* Read data from dataset */ - CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, dims, error, & - H5S_ALL_F, H5S_ALL_F, xfer_prp = H5P_DEFAULT_F) +!EP CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, dims, error, & +!EP H5S_ALL_F, H5S_ALL_F, xfer_prp = H5P_DEFAULT_F) + CALL h5dread_f(dset_id, H5T_NATIVE_INTEGER, rdata, dims, error) CALL check("h5dread_f", error, total_error) ! /* Verify the data */ diff --git a/fortran/test/tH5T.f90 b/fortran/test/tH5T.f90 index 4857a2b..9901a53 100644 --- a/fortran/test/tH5T.f90 +++ b/fortran/test/tH5T.f90 @@ -90,9 +90,9 @@ LOGICAL :: flag = .TRUE. CHARACTER(LEN=1024) :: cmpd_buf - INTEGER(size_t) :: cmpd_buf_size=0 - INTEGER(hid_t) :: decoded_sid1 - INTEGER :: decoded_tid1 + INTEGER(SIZE_T) :: cmpd_buf_size=0 + INTEGER(HID_T) :: decoded_sid1 + INTEGER(HID_T) :: decoded_tid1 data_dims(1) = dimsize ! -- cgit v0.12