added option to use mpi_f08

brtnfld · Mar 22, 2024 · cb25f8e · cb25f8e
1 parent e073f5c
commit cb25f8e
Showing 1 changed file with 27 additions and 8 deletions.
diff --git a/fortran/testpar/async.F90 b/fortran/testpar/async.F90
@@ -17,13 +17,11 @@
 
 MODULE test_async_APIs
 
-#ifdef H5_HAVE_PARALLEL
 #ifdef H5_HAVE_MPI_F08
-!  USE MPI_F08
+  USE MPI_F08
 #else
-#endif
-#endif
   USE MPI
+#endif
   USE HDF5
   USE TH5_MISC
   USE TH5_MISC_GEN
@@ -392,8 +390,12 @@ SUBROUTINE H5D_async_tests(cleanup, total_error)
 
     INTEGER :: error  ! Error flags
     INTEGER(KIND=MPI_INTEGER_KIND) :: mpierror       ! MPI error flag
-    INTEGER(KIND=MPI_INTEGER_KIND) :: comm
-    INTEGER(KIND=MPI_INTEGER_KIND) :: info
+#ifdef H5_HAVE_MPI_F08
+    TYPE(MPI_COMM) :: comm
+    TYPE(MPI_INFO) :: info
+#else
+    INTEGER(KIND=MPI_INTEGER_KIND) :: comm, info
+#endif
     INTEGER(KIND=MPI_INTEGER_KIND) :: mpi_size, mpi_rank
 
     comm = MPI_COMM_WORLD
@@ -593,8 +595,12 @@ SUBROUTINE H5G_async_tests(cleanup, total_error)
 
     INTEGER :: error
     INTEGER(KIND=MPI_INTEGER_KIND) :: mpierror       ! MPI error flag
-    INTEGER(KIND=MPI_INTEGER_KIND) :: comm
-    INTEGER(KIND=MPI_INTEGER_KIND) :: info
+#ifdef H5_HAVE_MPI_F08
+    TYPE(MPI_COMM) :: comm
+    TYPE(MPI_INFO) :: info
+#else
+    INTEGER(KIND=MPI_INTEGER_KIND) :: comm, info
+#endif
     INTEGER(KIND=MPI_INTEGER_KIND) :: mpi_size, mpi_rank
 
     comm = MPI_COMM_WORLD
@@ -722,7 +728,12 @@ SUBROUTINE H5F_async_tests(cleanup, total_error)
 
     INTEGER :: error  ! Error flags
     INTEGER(KIND=MPI_INTEGER_KIND) :: mpierror       ! MPI error flag
+#ifdef H5_HAVE_MPI_F08
+    TYPE(MPI_COMM) :: comm
+    TYPE(MPI_INFO) :: info
+#else
     INTEGER(KIND=MPI_INTEGER_KIND) :: comm, info
+#endif
     INTEGER(KIND=MPI_INTEGER_KIND) :: mpi_size, mpi_rank
 
     comm = MPI_COMM_WORLD
@@ -828,7 +839,11 @@ SUBROUTINE H5L_async_tests(cleanup, total_error)
 
     INTEGER :: error  ! Error flags
     INTEGER(KIND=MPI_INTEGER_KIND) :: mpierror       ! MPI error flag
+#ifdef H5_HAVE_MPI_F08
+    TYPE(MPI_COMM) :: comm
+#else
     INTEGER(KIND=MPI_INTEGER_KIND) :: comm
+#endif
     INTEGER(KIND=MPI_INTEGER_KIND) :: mpi_size, mpi_rank
 
     INTEGER(SIZE_T) :: count
@@ -1260,7 +1275,11 @@ PROGRAM async_test
   INTEGER(KIND=MPI_INTEGER_KIND) :: mpi_size               ! number of processes in the group of communicator
   INTEGER(KIND=MPI_INTEGER_KIND) :: mpi_rank               ! rank of the calling process in the communicator
   INTEGER(KIND=MPI_INTEGER_KIND) :: required, provided
+#ifdef H5_HAVE_MPI_F08
+  TYPE(MPI_DATATYPE) :: mpi_int_type
+#else
   INTEGER(KIND=MPI_INTEGER_KIND) :: mpi_int_type
+#endif
 
   INTEGER(HID_T) :: vol_id
   INTEGER :: hdferror