diff options
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/src/H5Pf_parallel.c | 70 | ||||
| -rw-r--r-- | fortran/src/H5Pff_parallel.f90 | 42 | ||||
| -rw-r--r-- | fortran/src/H5f90.h | 5 | ||||
| -rw-r--r-- | fortran/src/H5f90proto.h | 24 | ||||
| -rw-r--r-- | fortran/src/H5fortran_flags.f90 | 5 |
5 files changed, 67 insertions, 79 deletions
diff --git a/fortran/src/H5Pf_parallel.c b/fortran/src/H5Pf_parallel.c index 6dc0850..395ae03 100644 --- a/fortran/src/H5Pf_parallel.c +++ b/fortran/src/H5Pf_parallel.c @@ -2,19 +2,19 @@ #include <mpi.h> /*---------------------------------------------------------------------------- - * Name: h5pset_mpi_c - * Purpose: Call H5Pset_mpi to set mode for parallel I/O and the user + * Name: h5pset_fapl_mpio_c + * Purpose: Call H5Pset_fapl_mpio to set mode for parallel I/O and the user * supplied communicator and info object * Inputs: prp_id - property list identifier * comm - MPI communicator * info - MPI info object * Returns: 0 on success, -1 on failure * Programmer: Elena Pourmal - * Thursday, June 8, 2000 + * Thursday, October 26, 2000 * Modifications: *---------------------------------------------------------------------------*/ int_f -nh5pset_mpi_c(hid_t_f *prp_id, int_f* comm, int_f* info) +nh5pset_fapl_mpio_c(hid_t_f *prp_id, int_f* comm, int_f* info) { int ret_value = -1; hid_t c_prp_id; @@ -28,25 +28,25 @@ nh5pset_mpi_c(hid_t_f *prp_id, int_f* comm, int_f* info) * Call H5Pset_mpi function. */ c_prp_id = *prp_id; - ret = H5Pset_mpi(c_prp_id, c_comm, c_info); + ret = H5Pset_fapl_mpio(c_prp_id, c_comm, c_info); if (ret < 0) return ret_value; ret_value = 0; return ret_value; } /*---------------------------------------------------------------------------- - * Name: h5pget_mpi_c - * Purpose: Call H5Pget_mpi to retrieve communicator and info object + * Name: h5pget_fapl_mpio_c + * Purpose: Call H5Pget_fapl_mpio to retrieve communicator and info object * Inputs: prp_id - property list identifier * comm - buffer to return MPI communicator * info - buffer to return MPI info object * Returns: 0 on success, -1 on failure * Programmer: Elena Pourmal - * Thursday, June 8, 2000 + * Thursday, October 26, 2000 * Modifications: *---------------------------------------------------------------------------*/ int_f -nh5pget_mpi_c(hid_t_f *prp_id, int_f* comm, int_f* info) +nh5pget_fapl_mpio_c(hid_t_f *prp_id, int_f* comm, int_f* info) { int ret_value = -1; hid_t c_prp_id; @@ -58,7 +58,7 @@ nh5pget_mpi_c(hid_t_f *prp_id, int_f* comm, int_f* info) * Call H5Pget_mpi function. */ c_prp_id = *prp_id; - ret = H5Pget_mpi(c_prp_id, &c_comm, &c_info); + ret = H5Pget_fapl_mpio(c_prp_id, &c_comm, &c_info); if (ret < 0) return ret_value; *comm = (int_f) c_comm; *info = (int_f) c_info; @@ -66,54 +66,50 @@ nh5pget_mpi_c(hid_t_f *prp_id, int_f* comm, int_f* info) return ret_value; } /*---------------------------------------------------------------------------- - * Name: h5pset_xfer_c - * Purpose: Call H5Pset_xfer to set transfer mode of the dataset + * Name: h5pset_dxpl_mpio_c + * Purpose: Call H5Pset_dxpl_mpio to set transfer mode of the dataset * trasfer property list * Inputs: prp_id - property list identifier * data_xfer_mode - transfer mode * Returns: 0 on success, -1 on failure * Programmer: Elena Pourmal - * Thursday, June 15, 2000 + * Thursday, October 26, 2000 * Modifications: *---------------------------------------------------------------------------*/ int_f -nh5pset_xfer_c(hid_t_f *prp_id, int_f* data_xfer_mode) +nh5pset_dxpl_mpio_c(hid_t_f *prp_id, int_f* data_xfer_mode) { int ret_value = -1; hid_t c_prp_id; herr_t ret; - H5D_transfer_t c_data_xfer_mode; + H5FD_mpio_xfer_t c_data_xfer_mode; int CASE; CASE = *data_xfer_mode; switch (CASE) { - case H5D_XFER_INDEPENDENT_F: - c_data_xfer_mode = H5D_XFER_INDEPENDENT; - break; - - case H5D_XFER_COLLECTIVE_F: - c_data_xfer_mode = H5D_XFER_COLLECTIVE; + case H5FD_MPIO_INDEPENDENT_F: + c_data_xfer_mode = H5FD_MPIO_INDEPENDENT; break; - case H5D_XFER_DFLT_F: - c_data_xfer_mode = H5D_XFER_DFLT; + case H5FD_MPIO_COLLECTIVE_F: + c_data_xfer_mode = H5FD_MPIO_COLLECTIVE; break; default: return ret_value; } /* - * Call H5Pset_xfer function. + * Call H5Pset_dxpl_mpio function. */ c_prp_id = *prp_id; - ret = H5Pset_xfer(c_prp_id, c_data_xfer_mode); + ret = H5Pset_dxpl_mpio(c_prp_id, c_data_xfer_mode); if (ret < 0) return ret_value; ret_value = 0; return ret_value; } /*---------------------------------------------------------------------------- - * Name: h5pget_xfer_c - * Purpose: Call H5Pget_xfer to get transfer mode of the dataset + * Name: h5pget_dxpl_mpio_c + * Purpose: Call H5Pget_dxpl_mpio to get transfer mode of the dataset * trasfer property list * Inputs: prp_id - property list identifier * data_xfer_mode - buffer to retrieve transfer mode @@ -123,34 +119,30 @@ nh5pset_xfer_c(hid_t_f *prp_id, int_f* data_xfer_mode) * Modifications: *---------------------------------------------------------------------------*/ int_f -nh5pget_xfer_c(hid_t_f *prp_id, int_f* data_xfer_mode) +nh5pget_dxpl_mpio_c(hid_t_f *prp_id, int_f* data_xfer_mode) { int ret_value = -1; hid_t c_prp_id; herr_t ret; - H5D_transfer_t c_data_xfer_mode; + H5FD_mpio_xfer_t c_data_xfer_mode; int CASE; /* * Call H5Pget_xfer function. */ c_prp_id = *prp_id; - ret = H5Pget_xfer(c_prp_id, &c_data_xfer_mode); + ret = H5Pget_dxpl_mpio(c_prp_id, &c_data_xfer_mode); if (ret < 0) return ret_value; - CASE = (int)c_data_xfer_mode; + CASE = c_data_xfer_mode; switch (CASE) { - case H5D_XFER_INDEPENDENT: - *data_xfer_mode = H5D_XFER_INDEPENDENT_F; - break; - - case H5D_XFER_COLLECTIVE: - *data_xfer_mode = H5D_XFER_COLLECTIVE_F; + case H5FD_MPIO_INDEPENDENT: + *data_xfer_mode = H5FD_MPIO_INDEPENDENT_F; break; - case H5D_XFER_DFLT: - *data_xfer_mode = H5D_XFER_DFLT_F; + case H5FD_MPIO_COLLECTIVE: + *data_xfer_mode = H5FD_MPIO_COLLECTIVE_F; break; default: diff --git a/fortran/src/H5Pff_parallel.f90 b/fortran/src/H5Pff_parallel.f90 index 488b7a0..d5e60fc 100644 --- a/fortran/src/H5Pff_parallel.f90 +++ b/fortran/src/H5Pff_parallel.f90 @@ -5,7 +5,7 @@ USE H5FORTRAN_TYPES USE H5FORTRAN_FLAGS CONTAINS - SUBROUTINE h5pset_mpi_f(prp_id, comm, info, hdferr) + SUBROUTINE h5pset_fapl_mpio_f(prp_id, comm, info, hdferr) IMPLICIT NONE INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier INTEGER, INTENT(IN) :: comm ! MPI communicator to be used for file open @@ -14,11 +14,11 @@ ! as defined in MPI_FILE_OPEN of MPI-2 INTEGER, INTENT(OUT) :: hdferr ! Error code - INTEGER, EXTERNAL :: h5pset_mpi_c - hdferr = h5pset_mpi_c(prp_id, comm, info) - END SUBROUTINE h5pset_mpi_f + INTEGER, EXTERNAL :: h5pset_fapl_mpio_c + hdferr = h5pset_fapl_mpio_c(prp_id, comm, info) + END SUBROUTINE h5pset_fapl_mpio_f - SUBROUTINE h5pget_mpi_f(prp_id, comm, info, hdferr) + SUBROUTINE h5pget_fapl_mpio_f(prp_id, comm, info, hdferr) IMPLICIT NONE INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier INTEGER, INTENT(OUT) :: comm ! buffer to return communicator @@ -26,34 +26,32 @@ ! as defined in MPI_FILE_OPEN of MPI-2 INTEGER, INTENT(OUT) :: hdferr ! Error code - INTEGER, EXTERNAL :: h5pget_mpi_c - hdferr = h5pget_mpi_c(prp_id, comm, info) - END SUBROUTINE h5pget_mpi_f + INTEGER, EXTERNAL :: h5pget_fapl_mpio_c + hdferr = h5pget_fapl_mpio_c(prp_id, comm, info) + END SUBROUTINE h5pget_fapl_mpio_f - SUBROUTINE h5pset_xfer_f(prp_id, data_xfer_mode, hdferr) + SUBROUTINE h5pset_dxpl_mpio_f(prp_id, data_xfer_mode, hdferr) IMPLICIT NONE INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier INTEGER, INTENT(IN) :: data_xfer_mode ! Data transfer mode. Possible values are: - ! H5D_XFER_INDEPENDENT_F (0) - ! H5D_XFER_COLLECTIVE_F (1) - ! H5D_XFER_DFLT_F (2) + ! H5FD_MPIO_INDEPENDENT_F (0) + ! H5FD_MPIO_COLLECTIVE_F (1) INTEGER, INTENT(OUT) :: hdferr ! Error code - INTEGER, EXTERNAL :: h5pset_xfer_c - hdferr = h5pset_xfer_c(prp_id, data_xfer_mode) - END SUBROUTINE h5pset_xfer_f + INTEGER, EXTERNAL :: h5pset_dxpl_mpio_c + hdferr = h5pset_dxpl_mpio_c(prp_id, data_xfer_mode) + END SUBROUTINE h5pset_dxpl_mpio_f - SUBROUTINE h5pget_xfer_f(prp_id, data_xfer_mode, hdferr) + SUBROUTINE h5pget_dxpl_mpio_f(prp_id, data_xfer_mode, hdferr) IMPLICIT NONE INTEGER(HID_T), INTENT(IN) :: prp_id ! Property list identifier INTEGER, INTENT(OUT) :: data_xfer_mode ! Data transfer mode. Possible values are: - ! H5D_XFER_INDEPENDENT_F (0) - ! H5D_XFER_COLLECTIVE_F (1) - ! H5D_XFER_DFLT_F (2) + ! H5FD_MPIO_INDEPENDENT_F (0) + ! H5FD_MPIO_COLLECTIVE_F (1) INTEGER, INTENT(OUT) :: hdferr ! Error code - INTEGER, EXTERNAL :: h5pget_xfer_c - hdferr = h5pget_xfer_c(prp_id, data_xfer_mode) - END SUBROUTINE h5pget_xfer_f + INTEGER, EXTERNAL :: h5pget_dxpl_mpio_c + hdferr = h5pget_dxpl_mpio_c(prp_id, data_xfer_mode) + END SUBROUTINE h5pget_dxpl_mpio_f END MODULE H5P_parallel diff --git a/fortran/src/H5f90.h b/fortran/src/H5f90.h index 68ff0ad..14b70ac 100644 --- a/fortran/src/H5f90.h +++ b/fortran/src/H5f90.h @@ -75,8 +75,7 @@ #define H5P_MOUNT_F 4 /* Constants used in H5Pf_parallel.c and H5Pff_parallel.f90 files */ -#define H5D_XFER_INDEPENDENT_F 0 -#define H5D_XFER_COLLECTIVE_F 1 -#define H5D_XFER_DFLT_F 2 +#define H5FD_MPIO_INDEPENDENT_F 0 +#define H5FD_MPIO_COLLECTIVE_F 1 #endif /* _H5f90_H */ diff --git a/fortran/src/H5f90proto.h b/fortran/src/H5f90proto.h index eec43d1..2a7ce92 100644 --- a/fortran/src/H5f90proto.h +++ b/fortran/src/H5f90proto.h @@ -608,10 +608,10 @@ nh5tget_tag_c(hid_t_f* type_id, _fcd tag, int_f* namelen); # define nh5pget_hyper_cache_c FNAME(H5PGET_HYPER_CACHE_C) # define nh5pget_btree_ratios_c FNAME(H5PGET_BTREE_RATIOS_C) # define nh5pset_btree_ratios_c FNAME(H5PSET_BTREE_RATIOS_C) -# define nh5pset_mpi_c FNAME(H5PSET_MPI_C) -# define nh5pget_mpi_c FNAME(H5PGET_MPI_C) -# define nh5pset_xfer_c FNAME(H5PSET_XFER_C) -# define nh5pget_xfer_c FNAME(H5PGET_XFER_C) +# define nh5pset_fapl_mpio_c FNAME(H5PSET_FAPL_MPIO_C) +# define nh5pget_fapl_mpio_c FNAME(H5PGET_FAPL_MPIO_C) +# define nh5pset_dxpl_mpio_c FNAME(H5PSET_DXPL_MPIO_C) +# define nh5pget_dxpl_mpio_c FNAME(H5PGET_DXPL_MPIO_C) #else # define nh5pcreate_c FNAME(h5pcreate_c) @@ -665,10 +665,10 @@ nh5tget_tag_c(hid_t_f* type_id, _fcd tag, int_f* namelen); # define nh5pget_hyper_cache_c FNAME(h5pget_hyper_cache_c) # define nh5pget_btree_ratios_c FNAME(h5pget_btree_ratios_c) # define nh5pset_btree_ratios_c FNAME(h5pset_btree_ratios_c) -# define nh5pset_mpi_c FNAME(h5pset_mpi_c) -# define nh5pget_mpi_c FNAME(h5pget_mpi_c) -# define nh5pset_xfer_c FNAME(h5pset_xfer_c) -# define nh5pget_xfer_c FNAME(h5pget_xfer_c) +# define nh5pset_fapl_mpio_c FNAME(h5pset_fapl_mpio_c) +# define nh5pget_fapl_mpio_c FNAME(h5pget_fapl_mpio_c) +# define nh5pset_dxpl_mpio_c FNAME(h5pset_dxpl_mpio_c) +# define nh5pget_dxpl_mpio_c FNAME(h5pget_dxpl_mpio_c) #endif #endif @@ -781,13 +781,13 @@ nh5pget_btree_ratios_c(hid_t_f *prp_id, real_f* left, real_f* middle, real_f* ri extern int_f nh5pset_btree_ratios_c(hid_t_f *prp_id, real_f* left, real_f* middle, real_f* right); extern int_f -nh5pget_mpi_c(hid_t_f *prp_id, int_f* comm, int_f* info); +nh5pget_fapl_mpio_c(hid_t_f *prp_id, int_f* comm, int_f* info); extern int_f -nh5pset_mpi_c(hid_t_f *prp_id, int_f* comm, int_f* info); +nh5pset_fapl_mpio_c(hid_t_f *prp_id, int_f* comm, int_f* info); extern int_f -nh5pget_xfer_c(hid_t_f *prp_id, int_f* data_xfer_mode); +nh5pget_dxpl_mpio_rc(hid_t_f *prp_id, int_f* data_xfer_mode); extern int_f -nh5pset_xfer_c(hid_t_f *prp_id, int_f* data_xfer_mode); +nh5pset_dxpl_mpio_c(hid_t_f *prp_id, int_f* data_xfer_mode); /* * Functions frome H5Rf.c diff --git a/fortran/src/H5fortran_flags.f90 b/fortran/src/H5fortran_flags.f90 index f4ba649..a104c06 100644 --- a/fortran/src/H5fortran_flags.f90 +++ b/fortran/src/H5fortran_flags.f90 @@ -41,9 +41,8 @@ INTEGER, PARAMETER :: H5D_CONTIGUOUS_F = 1 INTEGER, PARAMETER :: H5D_CHUNKED_F = 2 - INTEGER, PARAMETER :: H5D_XFER_INDEPENDENT_F = 0 - INTEGER, PARAMETER :: H5D_XFER_COLLECTIVE_F = 1 - INTEGER, PARAMETER :: H5D_XFER_DFLT_F = 2 + INTEGER, PARAMETER :: H5FD_MPIO_INDEPENDENT_F = 0 + INTEGER, PARAMETER :: H5FD_MPIO_COLLECTIVE_F = 1 !H5T Data type interface related flags INTEGER, PARAMETER :: H5T_NO_CLASS_F = -1 |