summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2022-05-04 23:29:49 (GMT)
committerGitHub <noreply@github.com>2022-05-04 23:29:49 (GMT)
commitc4cd250408c7f973c909a56c3cae18ed6a0118f2 (patch)
treeeb746898e73cda15941b80547ef6c75b5af7fcd9
parent838d050a63d310a38f92a510dc94c0656a84bb51 (diff)
downloadhdf5-c4cd250408c7f973c909a56c3cae18ed6a0118f2.zip
hdf5-c4cd250408c7f973c909a56c3cae18ed6a0118f2.tar.gz
hdf5-c4cd250408c7f973c909a56c3cae18ed6a0118f2.tar.bz2
changes parallel tests to .F90 ext. and fixes the CALL check strings (#1725)
-rw-r--r--fortran/testpar/CMakeLists.txt6
-rw-r--r--fortran/testpar/Makefile.am2
-rw-r--r--fortran/testpar/hyper.F90 (renamed from fortran/testpar/hyper.f90)0
-rw-r--r--fortran/testpar/mdset.F90 (renamed from fortran/testpar/mdset.f90)29
-rw-r--r--fortran/testpar/ptest.F90 (renamed from fortran/testpar/ptest.f90)0
5 files changed, 18 insertions, 19 deletions
diff --git a/fortran/testpar/CMakeLists.txt b/fortran/testpar/CMakeLists.txt
index 12489528..c37e84c 100644
--- a/fortran/testpar/CMakeLists.txt
+++ b/fortran/testpar/CMakeLists.txt
@@ -17,9 +17,9 @@ endif ()
#-- Adding test for parallel_test
add_executable (parallel_test
- ptest.f90
- hyper.f90
- mdset.f90
+ ptest.F90
+ hyper.F90
+ mdset.F90
)
target_include_directories (parallel_test
PRIVATE ${TESTPAR_INCLUDES}
diff --git a/fortran/testpar/Makefile.am b/fortran/testpar/Makefile.am
index f4bb73f..00538f4 100644
--- a/fortran/testpar/Makefile.am
+++ b/fortran/testpar/Makefile.am
@@ -40,7 +40,7 @@ check_PROGRAMS=$(TEST_PROG_PARA)
CHECK_CLEANFILES+=parf[12].h5
# Test source files
-parallel_test_SOURCES=ptest.f90 hyper.f90 mdset.f90
+parallel_test_SOURCES=ptest.F90 hyper.F90 mdset.F90
# The tests depend on several libraries.
LDADD=$(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
diff --git a/fortran/testpar/hyper.f90 b/fortran/testpar/hyper.F90
index 4dc18a7..4dc18a7 100644
--- a/fortran/testpar/hyper.f90
+++ b/fortran/testpar/hyper.F90
diff --git a/fortran/testpar/mdset.f90 b/fortran/testpar/mdset.F90
index 22b7a6c..9aa7b9e 100644
--- a/fortran/testpar/mdset.f90
+++ b/fortran/testpar/mdset.F90
@@ -218,30 +218,30 @@ SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_ra
CALL check("h5pcreate_f", hdferror, nerrors)
CALL h5pset_fapl_mpio_f(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL, hdferror)
- CALL check("h5pcreate_f", hdferror, nerrors)
+ CALL check("h5pset_fapl_mpio_f", hdferror, nerrors)
CALL h5fopen_f(filename, H5F_ACC_RDWR_F, file_id, hdferror, access_prp = fapl_id)
- CALL check("h5pcreate_f", hdferror, nerrors)
+ CALL check("h5fopen_f", hdferror, nerrors)
CALL h5screate_simple_f(1, dims, fspace_id, hdferror)
- CALL check("h5pcreate_f", hdferror, nerrors)
+ CALL check("h5screate_simple_f", hdferror, nerrors)
CALL h5screate_simple_f(1, dims, mspace_id, hdferror)
- CALL check("h5pcreate_f", hdferror, nerrors)
+ CALL check("h5screate_simple_f", hdferror, nerrors)
!//////////////////////////////////////////////////////////
! select hyperslab in memory
!//////////////////////////////////////////////////////////
CALL h5sselect_hyperslab_f(mspace_id, H5S_SELECT_SET_F, start, counti, hdferror)
- CALL check("h5pcreate_f", hdferror, nerrors)
+ CALL check("h5sselect_hyperslab_f", hdferror, nerrors)
!//////////////////////////////////////////////////////////
! select hyperslab in the file
!//////////////////////////////////////////////////////////
CALL h5sselect_hyperslab_f(fspace_id, H5S_SELECT_SET_F, start, counti, hdferror)
- CALL check("h5pcreate_f", hdferror, nerrors)
+ CALL check("h5sselect_hyperslab_f", hdferror, nerrors)
!//////////////////////////////////////////////////////////
! create a property list for collective dataset read
@@ -252,7 +252,7 @@ SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_ra
IF (do_collective) THEN
CALL h5pset_dxpl_mpio_f(dxpl_id, H5FD_MPIO_COLLECTIVE_F, hdferror)
- CALL check("h5pcreate_f", hdferror, nerrors)
+ CALL check("h5pset_dxpl_mpio_f", hdferror, nerrors)
ENDIF
!//////////////////////////////////////////////////////////
@@ -266,11 +266,11 @@ SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_ra
! create this dataset
CALL h5dopen_f(file_id, dsetname, dset_id, hdferror)
- CALL check("h5pcreate_f", hdferror, nerrors)
+ CALL check("h5dopen_f", hdferror, nerrors)
! read this dataset
CALL h5dread_f(dset_id,H5T_NATIVE_INTEGER,rbuf,dims,hdferror,file_space_id=fspace_id,mem_space_id=mspace_id,xfer_prp=dxpl_id)
- CALL check("h5pcreate_f", hdferror, nerrors)
+ CALL check("h5dread_f", hdferror, nerrors)
! close this dataset
CALL h5dclose_f(dset_id, hdferror)
@@ -296,20 +296,19 @@ SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_ra
!//////////////////////////////////////////////////////////
CALL h5pclose_f(fapl_id, hdferror)
- CALL check("h5pcreate_f", hdferror, nerrors)
+ CALL check("h5pclose_f", hdferror, nerrors)
CALL h5pclose_f(dxpl_id, hdferror)
- CALL check("h5pcreate_f", hdferror, nerrors)
+ CALL check("h5pclose_f", hdferror, nerrors)
CALL h5sclose_f(fspace_id, hdferror)
- CALL check("h5pcreate_f", hdferror, nerrors)
+ CALL check("h5sclose_f", hdferror, nerrors)
CALL h5sclose_f(mspace_id, hdferror)
- CALL check("h5pcreate_f", hdferror, nerrors)
+ CALL check("h5sclose_f", hdferror, nerrors)
CALL h5fclose_f(file_id, hdferror)
- CALL check("h5pcreate_f", hdferror, nerrors)
-
+ CALL check("h5fclose_f", hdferror, nerrors)
DEALLOCATE(wbuf)
DEALLOCATE(rbuf)
diff --git a/fortran/testpar/ptest.f90 b/fortran/testpar/ptest.F90
index 30abb88..30abb88 100644
--- a/fortran/testpar/ptest.f90
+++ b/fortran/testpar/ptest.F90