use mpi: in mpi.F90

Author: scivision

src/interface.f90

@@ -3,7 +3,6 @@ module h5fortran
 use, intrinsic :: iso_c_binding, only : c_ptr, c_loc
 use, intrinsic :: iso_fortran_env, only : real32, real64, int32, int64, stderr=>error_unit
 
-use mpi, only : MPI_COMM_WORLD, MPI_INFO_NULL, mpi_comm_rank
 use hdf5, only : HID_T, SIZE_T, HSIZE_T, &
 H5S_ALL_F, H5S_SELECT_SET_F, &
 H5T_NATIVE_DOUBLE, H5T_NATIVE_REAL, H5T_NATIVE_INTEGER, H5T_NATIVE_CHARACTER, H5T_STD_I64LE, &
@@ -14,8 +13,6 @@ module h5fortran
 
 private
 
-integer, parameter :: mpi_h5comm = MPI_COMM_WORLD, mpi_h5info = MPI_INFO_NULL
-
 !> main type
 type :: hdf5_file
 
@@ -84,15 +81,7 @@ module h5fortran
 
 end type hdf5_file
 
-
-type :: mpi_tags
-
-integer :: a2=102, a3=103
-
-end type mpi_tags
-
-
-public :: mpi_h5comm,  mpi_tags, has_parallel_compression
+public :: has_parallel_compression
 public :: hdf5_file, is_hdf5
 public :: hdf_rank_check, hdf_shape_check, hdf5version, h5exist, hdf5_close
 public :: mpi_collective, mpi_hyperslab
@@ -583,11 +572,12 @@ module integer(HID_T) function mpi_collective(dname, use_mpi) result(xfer_id)
 logical, intent(in) :: use_mpi
 end function
 
-module integer(HID_T) function mpi_opener(filename, use_mpi, mpi_id) result(fapl)
+module subroutine mpi_opener(filename, use_mpi, mpi_id, fapl)
 character(*), intent(in) :: filename !< just for error messages
 logical, intent(in) :: use_mpi
-integer, intent(in) :: mpi_id
-end function
+integer, intent(out) :: mpi_id
+integer(HID_T), intent(out) :: fapl
+end subroutine
 
 end interface
 

src/mpi.F90

@@ -6,6 +6,8 @@
 use hdf5, only : h5pcreate_f, h5pset_dxpl_mpio_f, h5pset_fapl_mpio_f, &
 H5FD_MPIO_COLLECTIVE_F, &
 H5P_DATASET_XFER_F
+
+use mpi, only : MPI_COMM_WORLD, MPI_INFO_NULL, mpi_comm_rank
 #endif
 
 use hdf5, only : H5P_FILE_ACCESS_F
@@ -45,19 +47,20 @@
 integer :: ier
 
 fapl = H5P_DEFAULT_F
+mpi_id = -1
 
 if (.not. use_mpi) return
 
 #ifdef h5fortran_HAVE_PARALLEL
 
-call mpi_comm_rank(mpi_h5comm, mpi_id, ier)
+call mpi_comm_rank(MPI_COMM_WORLD, mpi_id, ier)
 if(ier /= 0) error stop "ERROR:h5fortran:opener: could not get MPI ID"
 
 !! collective: setup for MPI access
 call H5Pcreate_f(H5P_FILE_ACCESS_F, fapl, ier)
 if(ier /= 0) error stop "ERROR:h5fortran:opener:h5pcreate could not collective open property for " // filename
 
-call H5Pset_fapl_mpio_f(fapl, mpi_h5comm, mpi_h5info, ier)
+call H5Pset_fapl_mpio_f(fapl, MPI_COMM_WORLD, MPI_INFO_NULL, ier)
 if(ier /= 0) error stop "ERROR:h5fortran:opener:h5pset_fapl_mpio could not collective open file for " // filename
 
 #endif

src/utils.f90

@@ -112,7 +112,7 @@
   error stop 'ERROR:h5fortran:open Unsupported action ' // laction // ' for ' // filename
 end select
 
-fapl = mpi_opener(filename, self%use_mpi, self%mpi_id)
+call mpi_opener(filename, self%use_mpi, self%mpi_id, fapl)
 
 if (file_mode == H5F_ACC_RDONLY_F .or. file_mode == H5F_ACC_RDWR_F) then
   if(.not. is_hdf5(filename)) error stop "ERROR:h5fortran:open: not an HDF5 file: "//filename