diff options
Diffstat (limited to 'fortran/src')
-rw-r--r-- | fortran/src/H5Dff.F90 | 140 | ||||
-rw-r--r-- | fortran/src/H5Fff.F90 | 65 | ||||
-rw-r--r-- | fortran/src/H5Lff.F90 | 106 | ||||
-rw-r--r-- | fortran/src/H5Pf.c | 141 | ||||
-rw-r--r-- | fortran/src/H5Pff.F90 | 288 | ||||
-rw-r--r-- | fortran/src/H5Sff.F90 | 87 | ||||
-rw-r--r-- | fortran/src/H5_buildiface.F90 | 4 | ||||
-rw-r--r-- | fortran/src/H5_f.c | 41 | ||||
-rw-r--r-- | fortran/src/H5_ff.F90 | 129 | ||||
-rw-r--r-- | fortran/src/H5f90global.F90 | 72 | ||||
-rw-r--r-- | fortran/src/H5f90proto.h | 2 | ||||
-rw-r--r-- | fortran/src/hdf5_fortrandll.def.in | 15 |
12 files changed, 870 insertions, 220 deletions
diff --git a/fortran/src/H5Dff.F90 b/fortran/src/H5Dff.F90 index 6073570..2353ca2 100644 --- a/fortran/src/H5Dff.F90 +++ b/fortran/src/H5Dff.F90 @@ -2283,6 +2283,8 @@ CONTAINS !! \param hdferr \fortran_error !! \param xfer_prp Identifier of a transfer property list for this I/O operation. !! +!! See C API: @ref H5Dread_multi() +!! SUBROUTINE h5dread_multi_f(count, dset_id, mem_type_id, mem_space_id, file_space_id, buf, hdferr, xfer_prp) IMPLICIT NONE @@ -2320,6 +2322,7 @@ CONTAINS hdferr = H5Dread_multi(count, dset_id, mem_type_id, mem_space_id, file_space_id, xfer_prp_default, buf) END SUBROUTINE h5dread_multi_f + !> !! \ingroup FH5D !! @@ -2334,6 +2337,8 @@ CONTAINS !! \param hdferr \fortran_error !! \param xfer_prp Identifier of a transfer property list for this I/O operation. !! +!! See C API: @ref H5Dwrite_multi() +!! SUBROUTINE h5dwrite_multi_f(count, dset_id, mem_type_id, mem_space_id, file_space_id, buf, hdferr, xfer_prp) IMPLICIT NONE @@ -2372,6 +2377,141 @@ CONTAINS END SUBROUTINE h5dwrite_multi_f +!> +!! \ingroup FH5D +!! +!! \brief Reads a raw data chunk directly from a dataset in a file into a buffer. +!! +!! \param dset_id Identifier of the dataset to read from +!! \param offset Logical position of the chunk's first element in the dataspace, \Bold{0-based indices} +!! \param filters Mask for identifying the filters in use +!! \param buf Buffer containing data to be read from the chunk +!! \param hdferr \fortran_error +!! \param dxpl_id Dataset transfer property list identifier +!! +!! See C API: @ref H5Dread_chunk() +!! + SUBROUTINE h5dread_chunk_f(dset_id, offset, filters, buf, hdferr, dxpl_id) + IMPLICIT NONE + + INTEGER(HID_T) , INTENT(IN) :: dset_id + INTEGER(HSIZE_T) , INTENT(IN), DIMENSION(:) :: offset + INTEGER(C_INT32_T), INTENT(INOUT) :: filters + TYPE(C_PTR) :: buf + INTEGER , INTENT(OUT) :: hdferr + INTEGER(HID_T) , INTENT(IN), OPTIONAL :: dxpl_id + + INTEGER(HID_T) :: dxpl_id_default + INTEGER(HSIZE_T), DIMENSION(:), ALLOCATABLE :: offset_c + INTEGER(HSIZE_T) :: i, rank + + INTERFACE + INTEGER(C_INT) FUNCTION H5Dread_chunk(dset_id, dxpl_id, offset, filters, buf) & + BIND(C, NAME='H5Dread_chunk') + IMPORT :: SIZE_T, HSIZE_T, HID_T + IMPORT :: C_PTR, C_INT32_T, C_INT + IMPLICIT NONE + INTEGER(HID_T) , VALUE :: dset_id + INTEGER(HID_T) , VALUE :: dxpl_id + INTEGER(HSIZE_T) , DIMENSION(*) :: offset + INTEGER(C_INT32_T) :: filters + TYPE(C_PTR) , VALUE :: buf + END FUNCTION H5Dread_chunk + END INTERFACE + + dxpl_id_default = H5P_DEFAULT_F + IF (PRESENT(dxpl_id)) dxpl_id_default = dxpl_id + + rank = SIZE(offset, KIND=HSIZE_T) + + ALLOCATE(offset_c(rank), STAT=hdferr) + IF (hdferr .NE. 0 ) THEN + hdferr = -1 + RETURN + ENDIF + + ! + ! Reverse dimensions due to C-FORTRAN storage order + ! + DO i = 1, rank + offset_c(i) = offset(rank - i + 1) + ENDDO + + hdferr = INT(H5Dread_chunk(dset_id, dxpl_id_default, offset_c, filters, buf)) + + DEALLOCATE(offset_c) + + END SUBROUTINE h5dread_chunk_f + +!> +!! \ingroup FH5D +!! +!! \brief Writes a raw data chunk from a buffer directly to a dataset in a file. +!! +!! \param dset_id Identifier of the dataset to write to +!! \param filters Mask for identifying the filters in use +!! \param offset Logical position of the chunk's first element in the dataspace, \Bold{0-based indices} +!! \param data_size Size of the actual data to be written in bytes +!! \param buf Buffer containing data to be written to the chunk +!! \param hdferr \fortran_error +!! \param dxpl_id Dataset transfer property list identifier +!! +!! See C API: @ref H5Dwrite_chunk() +!! + SUBROUTINE h5dwrite_chunk_f(dset_id, filters, offset, data_size, buf, hdferr, dxpl_id) + IMPLICIT NONE + + INTEGER(HID_T) , INTENT(IN) :: dset_id + INTEGER(C_INT32_T), INTENT(IN) :: filters + INTEGER(HSIZE_T) , INTENT(IN), DIMENSION(:) :: offset + INTEGER(SIZE_T) , INTENT(IN) :: data_size + TYPE(C_PTR) :: buf + INTEGER , INTENT(OUT) :: hdferr + INTEGER(HID_T) , INTENT(IN), OPTIONAL :: dxpl_id + + INTEGER(HID_T) :: dxpl_id_default + INTEGER(HSIZE_T), DIMENSION(:), ALLOCATABLE :: offset_c + INTEGER(HSIZE_T) :: i, rank + + INTERFACE + INTEGER(C_INT) FUNCTION H5Dwrite_chunk(dset_id, dxpl_id, filters, offset, data_size, buf) & + BIND(C, NAME='H5Dwrite_chunk') + IMPORT :: SIZE_T, HSIZE_T, HID_T + IMPORT :: C_PTR, C_INT32_T, C_INT + IMPLICIT NONE + INTEGER(HID_T) , VALUE :: dset_id + INTEGER(HID_T) , VALUE :: dxpl_id + INTEGER(C_INT32_T), VALUE :: filters + INTEGER(HSIZE_T), DIMENSION(*) :: offset + INTEGER(SIZE_T) , VALUE :: data_size + TYPE(C_PTR) , VALUE :: buf + END FUNCTION H5Dwrite_chunk + END INTERFACE + + dxpl_id_default = H5P_DEFAULT_F + IF (PRESENT(dxpl_id)) dxpl_id_default = dxpl_id + + rank = SIZE(offset, KIND=HSIZE_T) + + ALLOCATE(offset_c(rank), STAT=hdferr) + IF (hdferr .NE. 0 ) THEN + hdferr = -1 + RETURN + ENDIF + + ! + ! Reverse dimensions due to C-FORTRAN storage order + ! + DO i = 1, rank + offset_c(i) = offset(rank - i + 1) + ENDDO + + hdferr = INT(H5Dwrite_chunk(dset_id, dxpl_id_default, filters, offset_c, data_size, buf)) + + DEALLOCATE(offset_c) + + END SUBROUTINE h5dwrite_chunk_f + END MODULE H5D diff --git a/fortran/src/H5Fff.F90 b/fortran/src/H5Fff.F90 index f8a7405..e053874 100644 --- a/fortran/src/H5Fff.F90 +++ b/fortran/src/H5Fff.F90 @@ -43,7 +43,6 @@ MODULE H5F ! Number of objects opened in H5open_f INTEGER(SIZE_T) :: H5OPEN_NUM_OBJ - #ifndef H5_DOXYGEN INTERFACE INTEGER(C_INT) FUNCTION h5fis_accessible(name, & @@ -58,6 +57,40 @@ MODULE H5F END INTERFACE #endif +!> @brief H5F_info_t_super derived type. + TYPE, BIND(C) :: H5F_info_super_t + INTEGER(C_INT) :: version !< Superblock version number + INTEGER(HSIZE_T) :: super_size !< Superblock size + INTEGER(HSIZE_T) :: super_ext_size !< Superblock extension size + END TYPE H5F_info_super_t + +!> @brief H5F_info_t_free derived type. + TYPE, BIND(C) :: H5F_info_free_t + INTEGER(C_INT) :: version !< Version # of file free space management + INTEGER(HSIZE_T) :: meta_size !< Free space manager metadata size + INTEGER(HSIZE_T) :: tot_space !< Amount of free space in the file + END TYPE H5F_info_free_t + +!> @brief H5_ih_info_t derived type. + TYPE, BIND(C) :: H5_ih_info_t + INTEGER(HSIZE_T) :: heap_size !< Heap size + INTEGER(HSIZE_T) :: index_size !< btree and/or list + END TYPE H5_ih_info_t + +!> @brief H5F_info_t_sohm derived type. + TYPE, BIND(C) :: H5F_info_sohm_t + INTEGER(C_INT) :: version !< Version # of shared object header info + INTEGER(HSIZE_T) :: hdr_size !< Shared object header message header size + TYPE(H5_ih_info_t) :: msgs_info !< Shared object header message index & heap size + END TYPE H5F_info_sohm_t + +!> @brief h5f_info_t derived type. + TYPE, BIND(C) :: h5f_info_t + TYPE(H5F_info_super_t) :: super + TYPE(H5F_info_free_t) :: free + TYPE(H5F_info_sohm_t) :: sohm + END TYPE h5f_info_t + CONTAINS !> !! \ingroup FH5F @@ -1093,5 +1126,35 @@ CONTAINS END SUBROUTINE h5fset_dset_no_attrs_hint_f +!> +!! \ingroup FH5F +!! +!! \brief Retrieves global file information +!! +!! \param obj_id Object identifier. The identifier may be that of a file, group, dataset, named datatype, or attribute. +!! \param file_info Buffer for global file information +!! \param hdferr \fortran_error +!! +!! See C API: @ref H5Fget_info2() +!! + SUBROUTINE H5Fget_info_f(obj_id, file_info, hdferr) + IMPLICIT NONE + INTEGER(HID_T) , INTENT(IN) :: obj_id + TYPE(H5F_INFO_T), INTENT(OUT) :: file_info + INTEGER , INTENT(OUT) :: hdferr + + INTERFACE + INTEGER(C_INT) FUNCTION H5Fget_info(obj_id, file_info) BIND(C, NAME='H5Fget_info2') + IMPORT :: HID_T, C_INT, H5F_INFO_T + IMPLICIT NONE + INTEGER(HID_T) , VALUE :: obj_id + TYPE(H5F_INFO_T), VALUE :: file_info + END FUNCTION H5Fget_info + END INTERFACE + + hdferr = INT(H5Fget_info(obj_id, file_info)) + + END SUBROUTINE H5Fget_info_f + END MODULE H5F diff --git a/fortran/src/H5Lff.F90 b/fortran/src/H5Lff.F90 index c474754..f61af02 100644 --- a/fortran/src/H5Lff.F90 +++ b/fortran/src/H5Lff.F90 @@ -748,10 +748,10 @@ CONTAINS link_exists_c = H5Lexists(loc_id, c_name, lapl_id_default) link_exists = .FALSE. - IF(link_exists_c.GT.0) link_exists = .TRUE. + IF(link_exists_c.GT.0_C_INT) link_exists = .TRUE. hdferr = 0 - IF(link_exists_c.LT.0) hdferr = -1 + IF(link_exists_c.LT.0_C_INT) hdferr = -1 END SUBROUTINE h5lexists_f @@ -1462,7 +1462,7 @@ CONTAINS !! SUBROUTINE h5literate_by_name_f(loc_id, group_name, index_type, order, & idx, op, op_data, return_value, hdferr, lapl_id) - USE, INTRINSIC :: ISO_C_BINDING, ONLY : C_PTR, C_FUNPTR + IMPLICIT NONE INTEGER(HID_T) , INTENT(IN) :: loc_id CHARACTER(LEN=*), INTENT(IN) :: group_name @@ -1509,4 +1509,104 @@ CONTAINS END SUBROUTINE h5literate_by_name_f +!> +!! \ingroup FH5L +!! +!! \brief Recursively visits all links starting from a specified group. +!! +!! \param grp_id Group identifier +!! \param idx_type Index type +!! \param order Iteration order +!! \param op Callback function +!! \param op_data User-defined callback function context +!! \param hdferr \fortran_error +!! +!! See C API: @ref H5Lvisit2() +!! + SUBROUTINE H5Lvisit_f(grp_id, idx_type, order, op, op_data, hdferr) + + IMPLICIT NONE + + INTEGER(hid_t), INTENT(IN) :: grp_id + INTEGER , INTENT(IN) :: idx_type + INTEGER , INTENT(IN) :: order + TYPE(C_FUNPTR) :: op + TYPE(C_PTR) :: op_data + INTEGER , INTENT(OUT) :: hdferr + + INTERFACE + INTEGER(C_INT) FUNCTION H5Lvisit(grp_id, idx_type, order, op, op_data) BIND(C, NAME='H5Lvisit2') + IMPORT :: c_char, c_int, c_ptr, c_funptr + IMPORT :: HID_T, SIZE_T, HSIZE_T + IMPLICIT NONE + INTEGER(hid_t), VALUE :: grp_id + INTEGER , VALUE :: idx_type + INTEGER , VALUE :: order + TYPE(C_FUNPTR), VALUE :: op + TYPE(C_PTR) , VALUE :: op_data + END FUNCTION H5Lvisit + END INTERFACE + + hdferr = INT(H5Lvisit(grp_id, INT(idx_type, C_INT), INT(order, C_INT), op, op_data)) + + END SUBROUTINE H5Lvisit_f + +!> +!! \ingroup FH5L +!! +!! \brief Recursively visits all links starting from a specified group. +!! +!! \param loc_id Location identifier +!! \param group_name Group name +!! \param idx_type Index type +!! \param order Iteration order +!! \param op Callback function +!! \param op_data User-defined callback function context +!! \param hdferr \fortran_error +!! \param lapl_id Link access property list +!! +!! +!! See C API: @ref H5Lvisit_by_name2() +!! + SUBROUTINE H5Lvisit_by_name_f(loc_id, group_name, idx_type, order, op, op_data, hdferr, lapl_id) + + IMPLICIT NONE + + INTEGER(hid_t), INTENT(IN) :: loc_id + CHARACTER(LEN=*), INTENT(IN) :: group_name + INTEGER , INTENT(IN) :: idx_type + INTEGER , INTENT(IN) :: order + TYPE(C_FUNPTR) :: op + TYPE(C_PTR) :: op_data + INTEGER , INTENT(OUT) :: hdferr + INTEGER(HID_T), INTENT(IN), OPTIONAL :: lapl_id + + INTEGER(HID_T) :: lapl_id_default + CHARACTER(LEN=LEN_TRIM(group_name)+1,KIND=C_CHAR) :: c_name + + INTERFACE + INTEGER(C_INT) FUNCTION H5Lvisit_by_name(loc_id, group_name, idx_type, order, op, op_data, lapl_id_default) & + BIND(C, NAME='H5Lvisit_by_name2') + IMPORT :: C_CHAR, C_INT, C_PTR, C_FUNPTR + IMPORT :: HID_T, SIZE_T, HSIZE_T + IMPLICIT NONE + INTEGER(hid_t), VALUE :: loc_id + CHARACTER(KIND=C_CHAR), DIMENSION(*) :: group_name + INTEGER , VALUE :: idx_type + INTEGER , VALUE :: order + TYPE(C_FUNPTR), VALUE :: op + TYPE(C_PTR) , VALUE :: op_data + INTEGER(HID_T), VALUE :: lapl_id_default + END FUNCTION H5Lvisit_by_name + END INTERFACE + + c_name = TRIM(group_name)//C_NULL_CHAR + + lapl_id_default = H5P_DEFAULT_F + IF(PRESENT(lapl_id)) lapl_id_default = lapl_id + + hdferr = INT(H5Lvisit_by_name(loc_id, c_name, INT(idx_type, C_INT), INT(order, C_INT), op, op_data, lapl_id_default)) + + END SUBROUTINE H5Lvisit_by_name_f + END MODULE H5L diff --git a/fortran/src/H5Pf.c b/fortran/src/H5Pf.c index 0efd205..3a97d7e 100644 --- a/fortran/src/H5Pf.c +++ b/fortran/src/H5Pf.c @@ -358,76 +358,6 @@ h5pget_chunk_c(hid_t_f *prp_id, int_f *max_rank, hsize_t_f *dims) return ret_value; } -/****if* H5Pf/h5pset_fill_value_c - * NAME - * h5pset_fill_value_c - * PURPOSE - * Call H5Pset_fill_value to set a fillvalue for a dataset - * INPUTS - * prp_id - property list identifier - * type_id - datatype identifier (fill value is of type type_id) - * fillvalue - fillvalue - * RETURNS - * 0 on success, -1 on failure - * SOURCE - */ -int_f -h5pset_fill_value_c(hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue) -/******/ -{ - int ret_value = -1; - hid_t c_prp_id; - hid_t c_type_id; - herr_t ret; - - /* - * Call H5Pset_fill_value function. - */ - c_prp_id = (hid_t)*prp_id; - c_type_id = (hid_t)*type_id; - ret = H5Pset_fill_value(c_prp_id, c_type_id, fillvalue); - - if (ret < 0) - return ret_value; - ret_value = 0; - return ret_value; -} - -/****if* H5Pf/h5pget_fill_value_c - * NAME - * h5pget_fill_value_c - * PURPOSE - * Call H5Pget_fill_value to set a fillvalue for a dataset - * INPUTS - * prp_id - property list identifier - * type_id - datatype identifier (fill value is of type type_id) - * fillvalue - fillvalue - * RETURNS - * 0 on success, -1 on failure - * SOURCE - */ -int_f -h5pget_fill_value_c(hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue) -/******/ -{ - int ret_value = -1; - hid_t c_prp_id; - hid_t c_type_id; - herr_t ret; - - /* - * Call H5Pget_fill_value function. - */ - c_prp_id = (hid_t)*prp_id; - c_type_id = (hid_t)*type_id; - ret = H5Pget_fill_value(c_prp_id, c_type_id, fillvalue); - - if (ret < 0) - return ret_value; - ret_value = 0; - return ret_value; -} - /****if* H5Pf/h5pget_version_c * NAME * h5pget_version_c @@ -487,77 +417,6 @@ h5pget_version_c(hid_t_f *prp_id, int_f *boot, int_f *freelist, int_f *stab, int } #endif /* H5_NO_DEPRECATED_SYMBOLS */ -/****if* H5Pf/h5pget_userblock_c - * NAME - * h5pget_userblock_c - * PURPOSE - * Call H5Pget_userblock to get the size of a user block in - * a file creation property list - * INPUTS - * prp_id - property list identifier - * Outputs size - Size of the user-block in bytes - * RETURNS - * 0 on success, -1 on failure - * SOURCE - */ -int_f -h5pget_userblock_c(hid_t_f *prp_id, hsize_t_f *size) -/******/ -{ - int ret_value = -1; - hid_t c_prp_id; - herr_t ret; - hsize_t c_size; - - /* - * Call H5Pget_userblock function. - */ - c_prp_id = (hid_t)*prp_id; - ret = H5Pget_userblock(c_prp_id, &c_size); - if (ret < 0) - return ret_value; - - *size = (hsize_t_f)c_size; - ret_value = 0; - - return ret_value; -} - -/****if* H5Pf/h5pset_userblock_c - * NAME - * h5pset_userblock_c - * PURPOSE - * Call H5Pset_userblock to set the size of a user block in - * a file creation property list - * INPUTS - * prp_id - property list identifier - * size - Size of the user-block in bytes - * RETURNS - * 0 on success, -1 on failure - * SOURCE - */ -int_f -h5pset_userblock_c(hid_t_f *prp_id, hsize_t_f *size) -/******/ -{ - int ret_value = -1; - hid_t c_prp_id; - herr_t ret; - hsize_t c_size; - c_size = (hsize_t)*size; - - /* - * Call H5Pset_userblock function. - */ - c_prp_id = (hid_t)*prp_id; - ret = H5Pset_userblock(c_prp_id, c_size); - - if (ret < 0) - return ret_value; - ret_value = 0; - return ret_value; -} - /****if* H5Pf/h5pget_sizes_c * NAME * h5pget_sizes_c diff --git a/fortran/src/H5Pff.F90 b/fortran/src/H5Pff.F90 index 5f76b6c..87da5d5 100644 --- a/fortran/src/H5Pff.F90 +++ b/fortran/src/H5Pff.F90 @@ -101,28 +101,29 @@ MODULE H5P MODULE PROCEDURE h5pinsert_ptr END INTERFACE + INTERFACE - INTEGER FUNCTION h5pget_fill_value_c(prp_id, type_id, fillvalue) & - BIND(C, NAME='h5pget_fill_value_c') - IMPORT :: c_ptr + INTEGER(C_INT) FUNCTION H5Pset_fill_value(prp_id, type_id, fillvalue) & + BIND(C, NAME='H5Pset_fill_value') + IMPORT :: C_INT, C_PTR IMPORT :: HID_T IMPLICIT NONE - INTEGER(HID_T), INTENT(IN) :: prp_id - INTEGER(HID_T), INTENT(IN) :: type_id - TYPE(C_PTR), VALUE :: fillvalue - END FUNCTION h5pget_fill_value_c + INTEGER(hid_t), VALUE :: prp_id + INTEGER(hid_t), VALUE :: type_id + TYPE(C_PTR) , VALUE :: fillvalue + END FUNCTION H5Pset_fill_value END INTERFACE INTERFACE - INTEGER FUNCTION h5pset_fill_value_c(prp_id, type_id, fillvalue) & - BIND(C, NAME='h5pset_fill_value_c') - IMPORT :: c_ptr + INTEGER(C_INT) FUNCTION H5Pget_fill_value(prp_id, type_id, fillvalue) & + BIND(C, NAME='H5Pget_fill_value') + IMPORT :: C_INT, C_PTR IMPORT :: HID_T IMPLICIT NONE - INTEGER(HID_T), INTENT(IN) :: prp_id - INTEGER(HID_T), INTENT(IN) :: type_id - TYPE(C_PTR), VALUE :: fillvalue - END FUNCTION h5pset_fill_value_c + INTEGER(hid_t), VALUE :: prp_id + INTEGER(hid_t), VALUE :: type_id + TYPE(C_PTR) , VALUE :: fillvalue + END FUNCTION H5Pget_fill_value END INTERFACE INTERFACE @@ -514,7 +515,7 @@ CONTAINS !! !! \brief Retrieves the version information of various objects for a file creation property list. !! -!! \param prp_id File createion property list identifier. +!! \param prp_id File creation property list identifier. !! \param boot Super block version number. !! \param freelist Global freelist version number. !! \param stab Symbol table version number. @@ -565,16 +566,17 @@ CONTAINS INTEGER(HSIZE_T), INTENT(IN) :: size INTEGER, INTENT(OUT) :: hdferr INTERFACE - INTEGER FUNCTION h5pset_userblock_c(prp_id, size) & - BIND(C,NAME='h5pset_userblock_c') + INTEGER FUNCTION H5Pset_userblock(prp_id, size) & + BIND(C,NAME='H5Pset_userblock') IMPORT :: HID_T, HSIZE_T IMPLICIT NONE - INTEGER(HID_T), INTENT(IN) :: prp_id - INTEGER(HSIZE_T), INTENT(IN) :: size - END FUNCTION h5pset_userblock_c + INTEGER(HID_T) , VALUE :: prp_id + INTEGER(HSIZE_T), VALUE :: size + END FUNCTION H5Pset_userblock END INTERFACE - hdferr = h5pset_userblock_c(prp_id, size) + hdferr = H5Pset_userblock(prp_id, size) + END SUBROUTINE h5pset_userblock_f !> @@ -594,15 +596,17 @@ CONTAINS INTEGER(HSIZE_T), INTENT(OUT) :: block_size INTEGER, INTENT(OUT) :: hdferr INTERFACE - INTEGER FUNCTION h5pget_userblock_c(prp_id, block_size) & - BIND(C,NAME='h5pget_userblock_c') + INTEGER FUNCTION H5Pget_userblock(prp_id, block_size) & + BIND(C,NAME='H5Pget_userblock') IMPORT :: HID_T, HSIZE_T IMPLICIT NONE - INTEGER(HID_T), INTENT(IN) :: prp_id - INTEGER(HSIZE_T), INTENT(OUT) :: block_size - END FUNCTION h5pget_userblock_c + INTEGER(HID_T) , VALUE :: prp_id + INTEGER(HSIZE_T) :: block_size + END FUNCTION H5Pget_userblock END INTERFACE - hdferr = h5pget_userblock_c(prp_id, block_size) + + hdferr = H5Pget_userblock(prp_id, block_size) + END SUBROUTINE h5pget_userblock_f !> @@ -4592,11 +4596,12 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr) INTEGER(HID_T), INTENT(IN) :: type_id INTEGER, INTENT(IN), TARGET :: fillvalue INTEGER, INTENT(OUT) :: hdferr + TYPE(C_PTR) :: f_ptr ! C address f_ptr = C_LOC(fillvalue) - hdferr = h5pset_fill_value_c(prp_id, type_id, f_ptr) + hdferr = INT(H5Pset_fill_value(prp_id, type_id, f_ptr)) END SUBROUTINE h5pset_fill_value_integer @@ -4610,7 +4615,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr) f_ptr = C_LOC(fillvalue) - hdferr = h5pget_fill_value_c(prp_id, type_id, f_ptr) + hdferr = INT(H5Pget_fill_value(prp_id, type_id, f_ptr)) END SUBROUTINE h5pget_fill_value_integer @@ -4623,7 +4628,7 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr) TYPE(C_PTR) :: f_ptr ! C address f_ptr = C_LOC(fillvalue(1:1)) - hdferr = h5pset_fill_value_c(prp_id, type_id, f_ptr) + hdferr = INT(H5Pset_fill_value(prp_id, type_id, f_ptr)) END SUBROUTINE h5pset_fill_value_char @@ -4650,7 +4655,8 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr) ENDIF f_ptr = C_LOC(chr(1)(1:1)) - hdferr = h5pget_fill_value_c(prp_id, type_id, f_ptr) + + hdferr = INT(H5Pget_fill_value(prp_id, type_id, f_ptr)) DO i = 1, chr_len fillvalue(i:i) = chr(i) @@ -4663,10 +4669,10 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr) IMPLICIT NONE INTEGER(HID_T), INTENT(IN) :: prp_id INTEGER(HID_T), INTENT(IN) :: type_id - TYPE(C_PTR), INTENT(IN) :: fillvalue + TYPE(C_PTR) :: fillvalue INTEGER, INTENT(OUT) :: hdferr - hdferr = h5pset_fill_value_c(prp_id, type_id, fillvalue) + hdferr = INT(H5Pset_fill_value(prp_id, type_id, fillvalue)) END SUBROUTINE h5pset_fill_value_ptr @@ -4674,10 +4680,10 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr) IMPLICIT NONE INTEGER(HID_T), INTENT(IN) :: prp_id INTEGER(HID_T), INTENT(IN) :: type_id - TYPE(C_PTR) , INTENT(IN) :: fillvalue + TYPE(C_PTR) :: fillvalue INTEGER , INTENT(OUT) :: hdferr - hdferr = h5pget_fill_value_c(prp_id, type_id, fillvalue) + hdferr = INT(H5Pget_fill_value(prp_id, type_id, fillvalue)) END SUBROUTINE h5pget_fill_value_ptr @@ -5322,11 +5328,46 @@ SUBROUTINE h5pset_attr_phase_change_f(ocpl_id, max_compact, min_dense, hdferr) hdferr = h5pget_fapl_ioc(prp_id, f_ptr) END SUBROUTINE h5pget_fapl_ioc_f + #endif !> !! \ingroup FH5P !! +!! \brief Retrieves local and global causes that broke collective I/O on the last parallel I/O call. +!! +!! \param plist_id Dataset transfer property list identifier +!! \param local_no_collective_cause An enumerated set value indicating the causes that prevented collective I/O in the local process +!! \param global_no_collective_cause An enumerated set value indicating the causes across all processes that prevented collective I/O +!! \param hdferr \fortran_error +!! +!! See C API: @ref H5Pget_mpio_no_collective_cause() +!! + SUBROUTINE h5pget_mpio_no_collective_cause_f(plist_id, local_no_collective_cause, global_no_collective_cause, hdferr) + IMPLICIT NONE + INTEGER(HID_T) , INTENT(IN) :: plist_id + INTEGER(C_INT32_T), INTENT(OUT) :: local_no_collective_cause + INTEGER(C_INT32_T), INTENT(OUT) :: global_no_collective_cause + INTEGER , INTENT(OUT) :: hdferr + + INTERFACE + INTEGER(C_INT) FUNCTION H5Pget_mpio_no_collective_cause(plist_id, local_no_collective_cause, global_no_collective_cause) & + BIND(C, NAME='H5Pget_mpio_no_collective_cause') + IMPORT :: HID_T, C_INT, C_INT32_T + IMPLICIT NONE + INTEGER(HID_T) , VALUE :: plist_id + INTEGER(C_INT32_T) :: local_no_collective_cause + INTEGER(C_INT32_T) :: global_no_collective_cause + END FUNCTION H5Pget_mpio_no_collective_cause + END INTERFACE + + hdferr = INT(H5Pget_mpio_no_collective_cause(plist_id, local_no_collective_cause, global_no_collective_cause)) + + END SUBROUTINE h5pget_mpio_no_collective_cause_f + +!> +!! \ingroup FH5P +!! !! \brief Set the MPI communicator and info. !! !! \param prp_id File access property list identifier. @@ -6274,5 +6315,182 @@ END SUBROUTINE h5pget_virtual_dsetname_f END SUBROUTINE h5pset_file_locking_f +!> +!! \ingroup FH5P +!! +!! \brief Retrieves the cause for not performing selection or vector I/O on the last parallel I/O call. +!! +!! \param plist_id Dataset transfer property list identifier +!! \param no_selection_io_cause A bitwise set value indicating the relevant causes that prevented selection I/O from being performed +!! \param hdferr \fortran_error +!! +!! See C API: @ref H5Pget_no_selection_io_cause() +!! + SUBROUTINE h5pget_no_selection_io_cause_f(plist_id, no_selection_io_cause, hdferr) + IMPLICIT NONE + INTEGER(HID_T) , INTENT(IN) :: plist_id + INTEGER(C_INT32_T), INTENT(OUT) :: no_selection_io_cause + INTEGER , INTENT(OUT) :: hdferr + + INTERFACE + INTEGER(C_INT) FUNCTION H5Pget_no_selection_io_cause(plist_id, no_selection_io_cause) & + BIND(C, NAME='H5Pget_no_selection_io_cause') + IMPORT :: HID_T, C_INT, C_INT32_T + IMPLICIT NONE + INTEGER(HID_T) , VALUE :: plist_id + INTEGER(C_INT32_T) :: no_selection_io_cause + END FUNCTION H5Pget_no_selection_io_cause + END INTERFACE + + hdferr = INT( H5Pget_no_selection_io_cause(plist_id, no_selection_io_cause)) + + END SUBROUTINE h5pget_no_selection_io_cause_f + + +!> +!! \ingroup FH5P +!! +!! \brief Sets the file space handling strategy and persisting free-space values for a file creation property list. +!! +!! \param plist_id File creation property list identifier +!! \param strategy The file space handling strategy to be used. See: H5F_fspace_strategy_t +!! \param persist Indicates whether free space should be persistent or not +!! \param threshold The smallest free-space section size that the free space manager will track +!! \param hdferr \fortran_error +!! +!! See C API: @ref H5Pset_file_space_strategy() +!! + SUBROUTINE H5Pset_file_space_strategy_f(plist_id, strategy, persist, threshold, hdferr) + IMPLICIT NONE + INTEGER(HID_T) , INTENT(IN) :: plist_id + INTEGER(C_INT) , INTENT(IN) :: strategy + LOGICAL , INTENT(IN) :: persist + INTEGER(HSIZE_T), INTENT(IN) :: threshold + INTEGER , INTENT(OUT) :: hdferr + + LOGICAL(C_BOOL) :: c_persist + + INTERFACE + INTEGER(C_INT) FUNCTION H5Pset_file_space_strategy(plist_id, strategy, persist, threshold) & + BIND(C, NAME='H5Pset_file_space_strategy') + IMPORT :: HID_T, HSIZE_T, C_INT, C_INT32_T, C_BOOL + IMPLICIT NONE + INTEGER(HID_T) , VALUE :: plist_id + INTEGER(C_INT) , VALUE :: strategy + LOGICAL(C_BOOL) , VALUE :: persist + INTEGER(HSIZE_T), VALUE :: threshold + END FUNCTION H5Pset_file_space_strategy + END INTERFACE + + ! Transfer value of Fortran LOGICAL to C C_BOOL type + c_persist = persist + + hdferr = INT( H5Pset_file_space_strategy(plist_id, strategy, c_persist, threshold) ) + + END SUBROUTINE H5Pset_file_space_strategy_f + +!> +!! \ingroup FH5P +!! +!! \brief Gets the file space handling strategy and persisting free-space values for a file creation property list. +!! +!! \param plist_id File creation property list identifier +!! \param strategy The file space handling strategy to be used. +!! \param persist Indicate whether free space should be persistent or not +!! \param threshold The free-space section size threshold value +!! \param hdferr \fortran_error +!! +!! See C API: @ref H5Pget_file_space_strategy() +!! + SUBROUTINE h5pget_file_space_strategy_f(plist_id, strategy, persist, threshold, hdferr) + IMPLICIT NONE + INTEGER(HID_T) , INTENT(IN) :: plist_id + INTEGER(C_INT) , INTENT(OUT) :: strategy + LOGICAL , INTENT(OUT) :: persist + INTEGER(HSIZE_T), INTENT(OUT) :: threshold + INTEGER , INTENT(OUT) :: hdferr + + LOGICAL(C_BOOL) :: c_persist + + INTERFACE + INTEGER(C_INT) FUNCTION H5Pget_file_space_strategy(plist_id, strategy, persist, threshold) & + BIND(C, NAME='H5Pget_file_space_strategy') + IMPORT :: HID_T, HSIZE_T, C_INT, C_INT32_T, C_BOOL + IMPLICIT NONE + INTEGER(HID_T), VALUE :: plist_id + INTEGER(C_INT) :: strategy + LOGICAL(C_BOOL) :: persist + INTEGER(HSIZE_T) :: threshold + END FUNCTION H5Pget_file_space_strategy + END INTERFACE + + hdferr = INT( H5Pget_file_space_strategy(plist_id, strategy, c_persist, threshold) ) + + ! Transfer value of Fortran LOGICAL and C C_BOOL type + persist = .FALSE. + IF(hdferr .GE. 0) persist = c_persist + + END SUBROUTINE h5pget_file_space_strategy_f + +!> +!! \ingroup FH5P +!! +!! \brief Sets the file space page size for a file creation property list. +!! +!! \param prp_id File creation property list identifier +!! \param fsp_size File space page size +!! \param hdferr \fortran_error +!! +!! See C API: @ref H5Pset_file_space_page_size() +!! + SUBROUTINE h5pset_file_space_page_size_f(prp_id, fsp_size, hdferr) + IMPLICIT NONE + INTEGER(HID_T), INTENT(IN) :: prp_id + INTEGER(HSIZE_T), INTENT(IN) :: fsp_size + INTEGER, INTENT(OUT) :: hdferr + INTERFACE + INTEGER(C_INT) FUNCTION H5Pset_file_space_page_size(prp_id, fsp_size) & + BIND(C,NAME='H5Pset_file_space_page_size') + IMPORT :: C_INT, HID_T, HSIZE_T + IMPLICIT NONE + INTEGER(HID_T) , VALUE :: prp_id + INTEGER(HSIZE_T), VALUE :: fsp_size + END FUNCTION H5Pset_file_space_page_size + END INTERFACE + + hdferr = INT(h5pset_file_space_page_size(prp_id, fsp_size)) + + END SUBROUTINE h5pset_file_space_page_size_f + +!> +!! \ingroup FH5P +!! +!! \brief Gets the file space page size for a file creation property list. +!! +!! \param prp_id File creation property list identifier +!! \param fsp_size File space page size +!! \param hdferr \fortran_error +!! +!! See C API: @ref H5Pget_file_space_page_size() +!! + SUBROUTINE h5pget_file_space_page_size_f(prp_id, fsp_size, hdferr) + IMPLICIT NONE + INTEGER(HID_T), INTENT(IN) :: prp_id + INTEGER(HSIZE_T), INTENT(OUT) :: fsp_size + INTEGER, INTENT(OUT) :: hdferr + INTERFACE + INTEGER(C_INT) FUNCTION H5Pget_file_space_page_size(prp_id, fsp_size) & + BIND(C,NAME='H5Pget_file_space_page_size') + IMPORT :: C_INT, HID_T, HSIZE_T + IMPLICIT NONE + INTEGER(HID_T), VALUE :: prp_id + INTEGER(HSIZE_T) :: fsp_size + END FUNCTION H5Pget_file_space_page_size + END INTERFACE + + hdferr = INT(h5pget_file_space_page_size(prp_id, fsp_size)) + + END SUBROUTINE h5pget_file_space_page_size_f + END MODULE H5P diff --git a/fortran/src/H5Sff.F90 b/fortran/src/H5Sff.F90 index fff32c0..5a1ca53 100644 --- a/fortran/src/H5Sff.F90 +++ b/fortran/src/H5Sff.F90 @@ -439,6 +439,91 @@ CONTAINS !> !! \ingroup FH5S !! +!! \brief Checks if two selections are the same shape. +!! +!! \param space1_id Dataspace identifier +!! \param space2_id Dataspace identifier +!! \param same Value of check +!! \param hdferr \fortran_error +!! +!! See C API: @ref H5Sselect_shape_same() +!! + SUBROUTINE H5Sselect_shape_same_f(space1_id, space2_id, same, hdferr) + IMPLICIT NONE + INTEGER(HID_T), INTENT(IN) :: space1_id + INTEGER(HID_T), INTENT(IN) :: space2_id + LOGICAL , INTENT(OUT) :: same + INTEGER , INTENT(OUT) :: hdferr + + INTEGER(C_INT) :: c_same + + INTERFACE + INTEGER(C_INT) FUNCTION H5Sselect_shape_same(space1_id, space2_id) BIND(C,NAME='H5Sselect_shape_same') + IMPORT :: C_INT, HID_T + IMPLICIT NONE + INTEGER(HID_T), VALUE :: space1_id + INTEGER(HID_T), VALUE :: space2_id + END FUNCTION H5Sselect_shape_same + END INTERFACE + + c_same = H5Sselect_shape_same(space1_id, space2_id) + + same = .FALSE. + IF(c_same .GT. 0_C_INT) same = .TRUE. + + hdferr = 0 + IF(c_same .LT. 0_C_INT) hdferr = -1 + + END SUBROUTINE H5Sselect_shape_same_f + +!> +!! \ingroup FH5S +!! +!! \brief Checks if current selection intersects with a block. +!! +!! \param space_id Dataspace identifier +!! \param istart Starting coordinate of the block +!! \param iend Opposite ("ending") coordinate of the block +!! \param intersects Dataspace intersects with the block specified +!! \param hdferr \fortran_error +!! +!! See C API: @ref H5Sselect_intersect_block() +!! + + SUBROUTINE H5Sselect_intersect_block_f(space_id, istart, iend, intersects, hdferr) + IMPLICIT NONE + INTEGER(HID_T) , INTENT(IN) :: space_id + INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: istart + INTEGER(HSIZE_T), DIMENSION(*), INTENT(IN) :: iend + LOGICAL, INTENT(OUT) :: intersects + INTEGER, INTENT(OUT) :: hdferr + + INTEGER(C_INT) :: c_intersects + + INTERFACE + INTEGER(C_INT) FUNCTION H5Sselect_intersect_block(space_id, istart, iend) & + BIND(C,NAME='H5Sselect_intersect_block') + IMPORT :: C_INT, HID_T, HSIZE_T + IMPLICIT NONE + INTEGER(HID_T), VALUE :: space_id + INTEGER(HSIZE_T), DIMENSION(*) :: istart + INTEGER(HSIZE_T), DIMENSION(*) :: iend + END FUNCTION H5Sselect_intersect_block + END INTERFACE + + c_intersects = H5Sselect_intersect_block(space_id, istart, iend) + + intersects = .FALSE. + IF(c_intersects .GT. 0_C_INT) intersects = .TRUE. + + hdferr = 0 + IF(c_intersects .LT. 0_C_INT) hdferr = -1 + + END SUBROUTINE H5Sselect_intersect_block_f + +!> +!! \ingroup FH5S +!! !! \brief Resets the selection region to include no elements. !! !! \param space_id The identifier for the dataspace in which the selection is being reset. @@ -808,7 +893,7 @@ CONTAINS !! \param operator Flag, valid values are: !! \li H5S_SELECT_SET_F !! \li H5S_SELECT_OR_F -!! \param start Array with hyperslab offsets. +!! \param start Array with hyperslab offsets, \Bold{0-based indices}. !! \param count Number of blocks included in the hyperslab. !! \param hdferr \fortran_error !! \param stride Array with hyperslab strides. diff --git a/fortran/src/H5_buildiface.F90 b/fortran/src/H5_buildiface.F90 index 1827204..cd4580b 100644 --- a/fortran/src/H5_buildiface.F90 +++ b/fortran/src/H5_buildiface.F90 @@ -890,7 +890,7 @@ PROGRAM H5_buildiface WRITE(11,'(A)') ' INTEGER, INTENT(OUT) :: hdferr ' WRITE(11,'(A)') ' TYPE(C_PTR) :: f_ptr ' WRITE(11,'(A)') ' f_ptr = C_LOC(fillvalue)' - WRITE(11,'(A)') ' hdferr = h5pset_fill_value_c(prp_id, type_id, f_ptr)' + WRITE(11,'(A)') ' hdferr = INT(h5pset_fill_value(prp_id, type_id, f_ptr))' WRITE(11,'(A)') ' END SUBROUTINE h5pset_fill_value_kind_'//TRIM(ADJUSTL(chr2)) ENDDO @@ -912,7 +912,7 @@ PROGRAM H5_buildiface WRITE(11,'(A)') ' INTEGER, INTENT(OUT) :: hdferr' WRITE(11,'(A)') ' TYPE(C_PTR) :: f_ptr' WRITE(11,'(A)') ' f_ptr = C_LOC(fillvalue)' - WRITE(11,'(A)') ' hdferr = h5pget_fill_value_c(prp_id, type_id, f_ptr)' + WRITE(11,'(A)') ' hdferr = INT(h5pget_fill_value(prp_id, type_id, f_ptr))' WRITE(11,'(A)') ' END SUBROUTINE h5pget_fill_value_kind_'//TRIM(ADJUSTL(chr2)) ENDDO diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c index da2b5d9..067cd3e 100644 --- a/fortran/src/H5_f.c +++ b/fortran/src/H5_f.c @@ -449,6 +449,34 @@ h5init_flags_c(int_f *h5d_flags, size_t_f *h5d_size_flags, int_f *h5e_flags, hid h5d_flags[30] = (int_f)H5D_SELECTION_IO_MODE_OFF; h5d_flags[31] = (int_f)H5D_SELECTION_IO_MODE_ON; + h5d_flags[32] = H5D_MPIO_COLLECTIVE; + h5d_flags[33] = H5D_MPIO_SET_INDEPENDENT; + h5d_flags[34] = H5D_MPIO_DATATYPE_CONVERSION; + h5d_flags[35] = H5D_MPIO_DATA_TRANSFORMS; + h5d_flags[36] = H5D_MPIO_MPI_OPT_TYPES_ENV_VAR_DISABLED; + h5d_flags[37] = H5D_MPIO_NOT_SIMPLE_OR_SCALAR_DATASPACES; + h5d_flags[38] = H5D_MPIO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET; + h5d_flags[39] = H5D_MPIO_PARALLEL_FILTERED_WRITES_DISABLED; + h5d_flags[40] = H5D_MPIO_ERROR_WHILE_CHECKING_COLLECTIVE_POSSIBLE; + h5d_flags[41] = H5D_MPIO_NO_SELECTION_IO; + h5d_flags[42] = H5D_MPIO_NO_COLLECTIVE_MAX_CAUSE; + + h5d_flags[43] = H5D_SEL_IO_DISABLE_BY_API; + h5d_flags[44] = H5D_SEL_IO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET; + h5d_flags[45] = H5D_SEL_IO_CONTIGUOUS_SIEVE_BUFFER; + h5d_flags[46] = H5D_SEL_IO_NO_VECTOR_OR_SELECTION_IO_CB; + h5d_flags[47] = H5D_SEL_IO_PAGE_BUFFER; + h5d_flags[48] = H5D_SEL_IO_DATASET_FILTER; + h5d_flags[49] = H5D_SEL_IO_CHUNK_CACHE; + h5d_flags[50] = H5D_SEL_IO_TCONV_BUF_TOO_SMALL; + h5d_flags[51] = H5D_SEL_IO_BKG_BUF_TOO_SMALL; + h5d_flags[52] = H5D_SEL_IO_DEFAULT_OFF; + h5d_flags[53] = H5D_MPIO_NO_SELECTION_IO_CAUSES; + + h5d_flags[54] = H5D_MPIO_NO_CHUNK_OPTIMIZATION; + h5d_flags[55] = H5D_MPIO_LINK_CHUNK; + h5d_flags[56] = H5D_MPIO_MULTI_CHUNK; + /* * H5E flags */ @@ -497,10 +525,15 @@ h5init_flags_c(int_f *h5d_flags, size_t_f *h5d_size_flags, int_f *h5e_flags, hid h5f_flags[18] = (int_f)H5F_LIBVER_ERROR; h5f_flags[19] = (int_f)H5F_LIBVER_NBOUNDS; h5f_flags[20] = (int_f)H5F_UNLIMITED; - h5f_flags[21] = (int_f)H5F_LIBVER_V18; - h5f_flags[22] = (int_f)H5F_LIBVER_V110; - h5f_flags[23] = (int_f)H5F_LIBVER_V112; - h5f_flags[24] = (int_f)H5F_LIBVER_V114; + h5f_flags[21] = (int_f)H5F_FSPACE_STRATEGY_FSM_AGGR; + h5f_flags[22] = (int_f)H5F_FSPACE_STRATEGY_PAGE; + h5f_flags[23] = (int_f)H5F_FSPACE_STRATEGY_AGGR; + h5f_flags[24] = (int_f)H5F_FSPACE_STRATEGY_NONE; + h5f_flags[25] = (int_f)H5F_FSPACE_STRATEGY_NTYPES; + h5f_flags[26] = (int_f)H5F_LIBVER_V18; + h5f_flags[27] = (int_f)H5F_LIBVER_V110; + h5f_flags[28] = (int_f)H5F_LIBVER_V112; + h5f_flags[29] = (int_f)H5F_LIBVER_V114; /* * H5FD flags diff --git a/fortran/src/H5_ff.F90 b/fortran/src/H5_ff.F90 index 42e7058..7bd2e26 100644 --- a/fortran/src/H5_ff.F90 +++ b/fortran/src/H5_ff.F90 @@ -58,7 +58,7 @@ MODULE H5LIB ! ! H5F flags declaration ! - INTEGER, PARAMETER :: H5F_FLAGS_LEN = 25 + INTEGER, PARAMETER :: H5F_FLAGS_LEN = 30 INTEGER, DIMENSION(1:H5F_FLAGS_LEN) :: H5F_flags ! ! H5generic flags declaration @@ -76,7 +76,7 @@ MODULE H5LIB ! ! H5D flags declaration ! - INTEGER, PARAMETER :: H5D_FLAGS_LEN = 32 + INTEGER, PARAMETER :: H5D_FLAGS_LEN = 57 INTEGER, DIMENSION(1:H5D_FLAGS_LEN) :: H5D_flags INTEGER, PARAMETER :: H5D_SIZE_FLAGS_LEN = 2 INTEGER(SIZE_T), DIMENSION(1:H5D_SIZE_FLAGS_LEN) :: H5D_size_flags @@ -168,7 +168,7 @@ MODULE H5LIB INTEGER, DIMENSION(1:H5LIB_FLAGS_LEN) :: H5LIB_flags PUBLIC :: h5open_f, h5close_f, h5get_libversion_f, h5dont_atexit_f, h5kind_to_type, h5offsetof, h5gmtime - PUBLIC :: h5garbage_collect_f, h5check_version_f + PUBLIC :: h5garbage_collect_f, h5check_version_f, h5get_free_list_sizes_f CONTAINS !> @@ -350,31 +350,36 @@ CONTAINS ! ! H5F flags ! - H5F_ACC_RDWR_F = H5F_flags(1) - H5F_ACC_RDONLY_F = H5F_flags(2) - H5F_ACC_TRUNC_F = H5F_flags(3) - H5F_ACC_EXCL_F = H5F_flags(4) - H5F_ACC_DEBUG_F = H5F_flags(5) - H5F_SCOPE_LOCAL_F = H5F_flags(6) - H5F_SCOPE_GLOBAL_F = H5F_flags(7) - H5F_CLOSE_DEFAULT_F = H5F_flags(8) - H5F_CLOSE_WEAK_F = H5F_flags(9) - H5F_CLOSE_SEMI_F = H5F_flags(10) - H5F_CLOSE_STRONG_F = H5F_flags(11) - H5F_OBJ_FILE_F = H5F_flags(12) - H5F_OBJ_DATASET_F = H5F_flags(13) - H5F_OBJ_GROUP_F = H5F_flags(14) - H5F_OBJ_DATATYPE_F = H5F_flags(15) - H5F_OBJ_ALL_F = H5F_flags(16) - H5F_LIBVER_EARLIEST_F = H5F_flags(17) - H5F_LIBVER_LATEST_F = H5F_flags(18) - H5F_LIBVER_ERROR_F = H5F_flags(19) - H5F_LIBVER_NBOUNDS_F = H5F_flags(20) - H5F_UNLIMITED_F = H5F_flags(21) - H5F_LIBVER_V18_F = H5F_flags(22) - H5F_LIBVER_V110_F = H5F_flags(23) - H5F_LIBVER_V112_F = H5F_flags(24) - H5F_LIBVER_V114_F = H5F_flags(25) + H5F_ACC_RDWR_F = H5F_flags(1) + H5F_ACC_RDONLY_F = H5F_flags(2) + H5F_ACC_TRUNC_F = H5F_flags(3) + H5F_ACC_EXCL_F = H5F_flags(4) + H5F_ACC_DEBUG_F = H5F_flags(5) + H5F_SCOPE_LOCAL_F = H5F_flags(6) + H5F_SCOPE_GLOBAL_F = H5F_flags(7) + H5F_CLOSE_DEFAULT_F = H5F_flags(8) + H5F_CLOSE_WEAK_F = H5F_flags(9) + H5F_CLOSE_SEMI_F = H5F_flags(10) + H5F_CLOSE_STRONG_F = H5F_flags(11) + H5F_OBJ_FILE_F = H5F_flags(12) + H5F_OBJ_DATASET_F = H5F_flags(13) + H5F_OBJ_GROUP_F = H5F_flags(14) + H5F_OBJ_DATATYPE_F = H5F_flags(15) + H5F_OBJ_ALL_F = H5F_flags(16) + H5F_LIBVER_EARLIEST_F = H5F_flags(17) + H5F_LIBVER_LATEST_F = H5F_flags(18) + H5F_LIBVER_ERROR_F = H5F_flags(19) + H5F_LIBVER_NBOUNDS_F = H5F_flags(20) + H5F_UNLIMITED_F = H5F_flags(21) + H5F_FSPACE_STRATEGY_FSM_AGGR_F = H5F_flags(22) + H5F_FSPACE_STRATEGY_PAGE_F = H5F_flags(23) + H5F_FSPACE_STRATEGY_AGGR_F = H5F_flags(24) + H5F_FSPACE_STRATEGY_NONE_F = H5F_flags(25) + H5F_FSPACE_STRATEGY_NTYPES_F = H5F_flags(26) + H5F_LIBVER_V18_F = H5F_flags(27) + H5F_LIBVER_V110_F = H5F_flags(28) + H5F_LIBVER_V112_F = H5F_flags(29) + H5F_LIBVER_V114_F = H5F_flags(30) ! ! H5generic flags ! @@ -439,6 +444,31 @@ CONTAINS H5D_SELECTION_IO_MODE_DEFAULT_F = H5D_flags(30) H5D_SELECTION_IO_MODE_OFF_F = H5D_flags(31) H5D_SELECTION_IO_MODE_ON_F = H5D_flags(32) + H5D_MPIO_COLLECTIVE_F = H5D_flags(33) + H5D_MPIO_SET_INDEPENDENT_F = H5D_flags(34) + H5D_MPIO_DATATYPE_CONVERSION_F = H5D_flags(35) + H5D_MPIO_DATA_TRANSFORMS_F = H5D_flags(36) + H5D_MPIO_MPI_OPT_TYPES_ENV_VAR_DISABLED_F = H5D_flags(37) + H5D_MPIO_NOT_SIMPLE_OR_SCALAR_DATASPACES_F = H5D_flags(38) + H5D_MPIO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_F = H5D_flags(39) + H5D_MPIO_PARALLEL_FILTERED_WRITES_DISABLED_F = H5D_flags(40) + H5D_MPIO_ERROR_WHILE_CHECKING_COLLECTIVE_POSSIBLE_F = H5D_flags(41) + H5D_MPIO_NO_SELECTION_IO_F = H5D_flags(42) + H5D_MPIO_NO_COLLECTIVE_MAX_CAUSE_F = H5D_flags(43) + H5D_SEL_IO_DISABLE_BY_API_F = H5D_flags(44) + H5D_SEL_IO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_F = H5D_flags(45) + H5D_SEL_IO_CONTIGUOUS_SIEVE_BUFFER_F = H5D_flags(46) + H5D_SEL_IO_NO_VECTOR_OR_SELECTION_IO_CB_F = H5D_flags(47) + H5D_SEL_IO_PAGE_BUFFER_F = H5D_flags(48) + H5D_SEL_IO_DATASET_FILTER_F = H5D_flags(49) + H5D_SEL_IO_CHUNK_CACHE_F = H5D_flags(50) + H5D_SEL_IO_TCONV_BUF_TOO_SMALL_F = H5D_flags(51) + H5D_SEL_IO_BKG_BUF_TOO_SMALL_F = H5D_flags(52) + H5D_SEL_IO_DEFAULT_OFF_F = H5D_flags(53) + H5D_MPIO_NO_SELECTION_IO_CAUSES_F = H5D_flags(54) + H5D_MPIO_NO_CHUNK_OPTIMIZATION_F = H5D_flags(55) + H5D_MPIO_LINK_CHUNK_F = H5D_flags(56) + H5D_MPIO_MULTI_CHUNK_F = H5D_flags(57) H5D_CHUNK_CACHE_NSLOTS_DFLT_F = H5D_size_flags(1) H5D_CHUNK_CACHE_NBYTES_DFLT_F = H5D_size_flags(2) @@ -801,6 +831,8 @@ CONTAINS !! \param relnum Release version of the library. !! \param error \fortran_error !! +!! See C API: @ref H5get_libversion() +!! SUBROUTINE h5get_libversion_f(majnum, minnum, relnum, error) IMPLICIT NONE INTEGER, INTENT(OUT) :: majnum, minnum, relnum, error @@ -826,6 +858,8 @@ CONTAINS !! \param relnum Release version of the library. !! \param error \fortran_error !! +!! See C API: @ref H5check_version() +!! SUBROUTINE h5check_version_f(majnum, minnum, relnum, error) IMPLICIT NONE INTEGER, INTENT(IN) :: majnum, minnum, relnum @@ -848,6 +882,8 @@ CONTAINS !! !! \param error \fortran_error !! +!! See C API: @ref H5garbage_collect() +!! SUBROUTINE h5garbage_collect_f(error) IMPLICIT NONE INTEGER, INTENT(OUT) :: error @@ -867,6 +903,8 @@ CONTAINS !! !! \param error \fortran_error !! +!! See C API: @ref H5dont_atexit() +!! SUBROUTINE h5dont_atexit_f(error) IMPLICIT NONE INTEGER, INTENT(OUT) :: error @@ -882,6 +920,41 @@ CONTAINS !> !! \ingroup FH5 +!! \brief Gets the current size of the free lists used to manage memory +!! +!! \param reg_size The current size of all "regular" free list memory used +!! \param arr_size The current size of all "array" free list memory used +!! \param blk_size The current size of all "block" free list memory used +!! \param fac_size The current size of all "factory" free list memory used +!! \param error \fortran_error +!! +!! See C API: @ref H5get_free_list_sizes() +!! + SUBROUTINE h5get_free_list_sizes_f(reg_size, arr_size, blk_size, fac_size, error) + IMPLICIT NONE + INTEGER(C_SIZE_T), INTENT(OUT) :: reg_size + INTEGER(C_SIZE_T), INTENT(OUT) :: arr_size + INTEGER(C_SIZE_T), INTENT(OUT) :: blk_size + INTEGER(C_SIZE_T), INTENT(OUT) :: fac_size + INTEGER, INTENT(OUT) :: error + + INTERFACE + INTEGER(C_INT) FUNCTION H5get_free_list_sizes(reg_size, arr_size, blk_size, fac_size) BIND(C,NAME='H5get_free_list_sizes') + IMPORT :: C_INT, C_SIZE_T + IMPLICIT NONE + INTEGER(C_SIZE_T), INTENT(OUT) :: reg_size + INTEGER(C_SIZE_T), INTENT(OUT) :: arr_size + INTEGER(C_SIZE_T), INTENT(OUT) :: blk_size + INTEGER(C_SIZE_T), INTENT(OUT) :: fac_size + END FUNCTION H5get_free_list_sizes + END INTERFACE + + error = INT(H5get_free_list_sizes(reg_size, arr_size, blk_size, fac_size)) + + END SUBROUTINE h5get_free_list_sizes_f + +!> +!! \ingroup FH5 !! !! \brief Converts the KIND to the correct HDF type !! diff --git a/fortran/src/H5f90global.F90 b/fortran/src/H5f90global.F90 index 62b107c..e60f1e8 100644 --- a/fortran/src/H5f90global.F90 +++ b/fortran/src/H5f90global.F90 @@ -227,6 +227,11 @@ MODULE H5GLOBAL !DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_V110_F !DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_V112_F !DEC$ATTRIBUTES DLLEXPORT :: H5F_LIBVER_V114_F + !DEC$ATTRIBUTES DLLEXPORT :: H5F_FSPACE_STRATEGY_FSM_AGGR_F + !DEC$ATTRIBUTES DLLEXPORT :: H5F_FSPACE_STRATEGY_PAGE_F + !DEC$ATTRIBUTES DLLEXPORT :: H5F_FSPACE_STRATEGY_AGGR_F + !DEC$ATTRIBUTES DLLEXPORT :: H5F_FSPACE_STRATEGY_NONE_F + !DEC$ATTRIBUTES DLLEXPORT :: H5F_FSPACE_STRATEGY_NTYPES_F !DEC$endif !> \addtogroup FH5F !> @{ @@ -255,6 +260,11 @@ MODULE H5GLOBAL INTEGER :: H5F_LIBVER_V110_F !< H5F_LIBVER_V110 INTEGER :: H5F_LIBVER_V112_F !< H5F_LIBVER_V112 INTEGER :: H5F_LIBVER_V114_F !< H5F_LIBVER_V114 + INTEGER :: H5F_FSPACE_STRATEGY_FSM_AGGR_F !< H5F_FSPACE_STRATEGY_FSM_AGGR + INTEGER :: H5F_FSPACE_STRATEGY_PAGE_F !< H5F_FSPACE_STRATEGY_PAGE + INTEGER :: H5F_FSPACE_STRATEGY_AGGR_F !< H5F_FSPACE_STRATEGY_AGGR + INTEGER :: H5F_FSPACE_STRATEGY_NONE_F !< H5F_FSPACE_STRATEGY_NONE + INTEGER :: H5F_FSPACE_STRATEGY_NTYPES_F !< H5F_FSPACE_STRATEGY_NTYPES !> @} ! ! H5G flags declaration @@ -330,6 +340,34 @@ MODULE H5GLOBAL !DEC$ATTRIBUTES DLLEXPORT :: H5D_SELECTION_IO_MODE_DEFAULT_F !DEC$ATTRIBUTES DLLEXPORT :: H5D_SELECTION_IO_MODE_OFF_F !DEC$ATTRIBUTES DLLEXPORT :: H5D_SELECTION_IO_MODE_ON_F + + !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_COLLECTIVE_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_SET_INDEPENDENT_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_DATATYPE_CONVERSION_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_DATA_TRANSFORMS_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_MPI_OPT_TYPES_ENV_VAR_DISABLED_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_NOT_SIMPLE_OR_SCALAR_DATASPACES_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_PARALLEL_FILTERED_WRITES_DISABLED_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_ERROR_WHILE_CHECKING_COLLECTIVE_POSSIBLE_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_NO_SELECTION_IO_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_NO_COLLECTIVE_MAX_CAUSE_F + + !DEC$ATTRIBUTES DLLEXPORT :: H5D_SEL_IO_DISABLE_BY_API_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_SEL_IO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_SEL_IO_CONTIGUOUS_SIEVE_BUFFER_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_SEL_IO_NO_VECTOR_OR_SELECTION_IO_CB_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_SEL_IO_PAGE_BUFFER_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_SEL_IO_DATASET_FILTER_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_SEL_IO_CHUNK_CACHE_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_SEL_IO_TCONV_BUF_TOO_SMALL_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_SEL_IO_BKG_BUF_TOO_SMALL_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_SEL_IO_DEFAULT_OFF_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_NO_SELECTION_IO_CAUSES_F + + !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_NO_CHUNK_OPTIMIZATION_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_LINK_CHUNK_F + !DEC$ATTRIBUTES DLLEXPORT :: H5D_MPIO_MULTI_CHUNK_F !DEC$endif !> \addtogroup FH5D !> @{ @@ -375,9 +413,37 @@ MODULE H5GLOBAL INTEGER :: H5D_VDS_FIRST_MISSING_F !< H5D_VDS_FIRST_MISSING INTEGER :: H5D_VDS_LAST_AVAILABLE_F !< H5D_VDS_LAST_AVAILABLE INTEGER :: H5D_VIRTUAL_F !< H5D_VIRTUAL - INTEGER :: H5D_SELECTION_IO_MODE_DEFAULT_F !< H5D_SELECTION_IO_MODE_DEFAULT_F - INTEGER :: H5D_SELECTION_IO_MODE_OFF_F !< H5D_SELECTION_IO_MODE_OFF_F - INTEGER :: H5D_SELECTION_IO_MODE_ON_F !< H5D_SELECTION_IO_MODE_ON_F + INTEGER :: H5D_SELECTION_IO_MODE_DEFAULT_F !< H5D_SELECTION_IO_MODE_DEFAULT + INTEGER :: H5D_SELECTION_IO_MODE_OFF_F !< H5D_SELECTION_IO_MODE_OFF + INTEGER :: H5D_SELECTION_IO_MODE_ON_F !< H5D_SELECTION_IO_MODE_ON + + INTEGER :: H5D_MPIO_COLLECTIVE_F !< H5D_MPIO_COLLECTIVE + INTEGER :: H5D_MPIO_SET_INDEPENDENT_F !< H5D_MPIO_SET_INDEPENDENT + INTEGER :: H5D_MPIO_DATATYPE_CONVERSION_F !< H5D_MPIO_DATATYPE_CONVERSION + INTEGER :: H5D_MPIO_DATA_TRANSFORMS_F !< H5D_MPIO_DATA_TRANSFORMS + INTEGER :: H5D_MPIO_MPI_OPT_TYPES_ENV_VAR_DISABLED_F !< H5D_MPIO_MPI_OPT_TYPES_ENV_VAR_DISABLED + INTEGER :: H5D_MPIO_NOT_SIMPLE_OR_SCALAR_DATASPACES_F !< H5D_MPIO_NOT_SIMPLE_OR_SCALAR_DATASPACES + INTEGER :: H5D_MPIO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_F !< H5D_MPIO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET + INTEGER :: H5D_MPIO_PARALLEL_FILTERED_WRITES_DISABLED_F !< H5D_MPIO_PARALLEL_FILTERED_WRITES_DISABLED + INTEGER :: H5D_MPIO_ERROR_WHILE_CHECKING_COLLECTIVE_POSSIBLE_F !< H5D_MPIO_ERROR_WHILE_CHECKING_COLLECTIVE_POSSIBLE + INTEGER :: H5D_MPIO_NO_SELECTION_IO_F !< H5D_MPIO_NO_SELECTION_IO + INTEGER :: H5D_MPIO_NO_COLLECTIVE_MAX_CAUSE_F !< H5D_MPIO_NO_COLLECTIVE_MAX_CAUSE + + INTEGER :: H5D_SEL_IO_DISABLE_BY_API_F !< H5D_SEL_IO_DISABLE_BY_API + INTEGER :: H5D_SEL_IO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET_F !< H5D_SEL_IO_NOT_CONTIGUOUS_OR_CHUNKED_DATASET + INTEGER :: H5D_SEL_IO_CONTIGUOUS_SIEVE_BUFFER_F !< H5D_SEL_IO_CONTIGUOUS_SIEVE_BUFFER + INTEGER :: H5D_SEL_IO_NO_VECTOR_OR_SELECTION_IO_CB_F !< H5D_SEL_IO_NO_VECTOR_OR_SELECTION_IO_CB + INTEGER :: H5D_SEL_IO_PAGE_BUFFER_F !< H5D_SEL_IO_PAGE_BUFFER + INTEGER :: H5D_SEL_IO_DATASET_FILTER_F !< H5D_SEL_IO_DATASET_FILTER + INTEGER :: H5D_SEL_IO_CHUNK_CACHE_F !< H5D_SEL_IO_CHUNK_CACHE + INTEGER :: H5D_SEL_IO_TCONV_BUF_TOO_SMALL_F !< H5D_SEL_IO_TCONV_BUF_TOO_SMALL + INTEGER :: H5D_SEL_IO_BKG_BUF_TOO_SMALL_F !< H5D_SEL_IO_BKG_BUF_TOO_SMALL + INTEGER :: H5D_SEL_IO_DEFAULT_OFF_F !< H5D_SEL_IO_DEFAULT_OFF + INTEGER :: H5D_MPIO_NO_SELECTION_IO_CAUSES_F !< H5D_MPIO_NO_SELECTION_IO_CAUSES + + INTEGER :: H5D_MPIO_NO_CHUNK_OPTIMIZATION_F !< H5D_MPIO_NO_CHUNK_OPTIMIZATION + INTEGER :: H5D_MPIO_LINK_CHUNK_F !< H5D_MPIO_LINK_CHUNK + INTEGER :: H5D_MPIO_MULTI_CHUNK_F !< H5D_MPIO_MULTI_CHUNK ! ! H5E flags declaration ! diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h index 5b34dd6..28a4fa6 100644 --- a/fortran/src/H5f90proto.h +++ b/fortran/src/H5f90proto.h @@ -376,9 +376,7 @@ H5_FCDLL int_f h5pset_deflate_c(hid_t_f *prp_id, int_f *level); H5_FCDLL int_f h5pset_chunk_c(hid_t_f *prp_id, int_f *rank, hsize_t_f *dims); H5_FCDLL int_f h5pget_chunk_c(hid_t_f *prp_id, int_f *max_rank, hsize_t_f *dims); H5_FCDLL int_f h5pset_file_image_c(hid_t_f *fapl_id, void *buf_ptr, size_t_f *buf_len); -H5_FCDLL int_f h5pset_fill_value_c(hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue); H5_FCDLL int_f h5pget_file_image_c(hid_t_f *fapl_id, void **buf_ptr, size_t_f *buf_len); -H5_FCDLL int_f h5pget_fill_value_c(hid_t_f *prp_id, hid_t_f *type_id, void *fillvalue); H5_FCDLL int_f h5pset_preserve_c(hid_t_f *prp_id, int_f *flag); H5_FCDLL int_f h5pget_preserve_c(hid_t_f *prp_id, int_f *flag); H5_FCDLL int_f h5pget_version_c(hid_t_f *prp_id, int_f *boot, int_f *freelist, int_f *stab, int_f *shhdr); diff --git a/fortran/src/hdf5_fortrandll.def.in b/fortran/src/hdf5_fortrandll.def.in index 9e1bb2e..e6bb95a 100644 --- a/fortran/src/hdf5_fortrandll.def.in +++ b/fortran/src/hdf5_fortrandll.def.in @@ -9,6 +9,7 @@ H5LIB_mp_H5DONT_ATEXIT_F H5LIB_mp_H5KIND_TO_TYPE H5LIB_mp_H5OFFSETOF H5LIB_mp_H5GMTIME +H5LIB_mp_H5GET_FREE_LIST_SIZES_F ; H5A H5A_mp_H5AWRITE_CHAR_SCALAR H5A_mp_H5AREAD_CHAR_SCALAR @@ -101,6 +102,8 @@ H5D_mp_H5DREAD_MULTI_F H5D_mp_H5DWRITE_MULTI_F H5D_mp_H5DWRITE_ASYNC_F H5D_mp_H5DREAD_ASYNC_F +H5D_mp_H5DWRITE_CHUNK_F +H5D_mp_H5DREAD_CHUNK_F ; H5E H5E_mp_H5ECLEAR_F H5E_mp_H5EPRINT_F @@ -142,6 +145,7 @@ H5F_mp_H5FGET_FILESIZE_F H5F_mp_H5FGET_FILE_IMAGE_F H5F_mp_H5FGET_DSET_NO_ATTRS_HINT_F H5F_mp_H5FSET_DSET_NO_ATTRS_HINT_F +H5F_mp_H5FGET_INFO_F ; H5G H5G_mp_H5GOPEN_F H5G_mp_H5GOPEN_ASYNC_F @@ -220,6 +224,9 @@ H5L_mp_H5LGET_NAME_BY_IDX_F H5L_mp_H5LITERATE_F H5L_mp_H5LITERATE_ASYNC_F H5L_mp_H5LITERATE_BY_NAME_F +H5L_mp_H5VISIT_F +H5L_mp_H5VISIT_BY_NAME_F + ; H5O H5O_mp_H5OCLOSE_F H5O_mp_H5OCLOSE_ASYNC_F @@ -405,6 +412,11 @@ H5P_mp_H5PSET_SELECTION_IO_F H5P_mp_H5PGET_SELECTION_IO_F H5P_mp_H5PSET_MODIFY_WRITE_BUF_F H5P_mp_H5PGET_MODIFY_WRITE_BUF_F +H5P_mp_H5PGET_NO_SELECTION_IO_CAUSE_F +H5P_mp_H5PSET_FILE_SPACE_STRATEGY_F +H5P_mp_H5PGET_FILE_SPACE_STRATEGY_F +H5P_mp_H5PSET_FILE_SPACE_PAGE_SIZE_F +H5P_mp_H5PGET_FILE_SPACE_PAGE_SIZE_F ; Parallel @H5_NOPAREXP@H5P_mp_H5PSET_FAPL_MPIO_F @H5_NOPAREXP@H5P_mp_H5PGET_FAPL_MPIO_F @@ -421,6 +433,7 @@ H5P_mp_H5PGET_MODIFY_WRITE_BUF_F @H5_NOPAREXP@H5P_mp_H5PGET_ALL_COLL_METADATA_OPS_F @H5_NOPAREXP@H5P_mp_H5PSET_COLL_METADATA_WRITE_F @H5_NOPAREXP@H5P_mp_H5PGET_COLL_METADATA_WRITE_F +@H5_NOPAREXP@H5P_mp_H5PGET_MPIO_NO_COLLECTIVE_CAUSE_F ; H5R H5R_mp_H5RCREATE_OBJECT_F H5R_mp_H5RCREATE_REGION_F @@ -449,6 +462,8 @@ H5S_mp_H5SSELECT_ELEMENTS_F H5S_mp_H5SSELECT_ALL_F H5S_mp_H5SSELECT_NONE_F H5S_mp_H5SSELECT_VALID_F +H5S_mp_H5SSELECT_SHAPE_SAME_F +H5S_mp_H5SSELECT_INTERSECT_BLOCK_F H5S_mp_H5SGET_SIMPLE_EXTENT_NPOINTS_F H5S_mp_H5SGET_SELECT_NPOINTS_F H5S_mp_H5SGET_SIMPLE_EXTENT_NDIMS_F |