mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

changes parallel tests to .F90 ext. and fixes the CALL check strings (#1725)

Browse Source
This commit is contained in:
Scot Breitenfeld 2022-05-04 18:29:49 -05:00 committed by GitHub
parent 838d050a63
commit c4cd250408
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fortran/testpar/CMakeLists.txt
View File

@ -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}

2
fortran/testpar/Makefile.am
View File

@ -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)

0
fortran/testpar/hyper.f90 → fortran/testpar/hyper.F90
View File

29
fortran/testpar/mdset.f90 → fortran/testpar/mdset.F90
View File

@ -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)

0
fortran/testpar/ptest.f90 → fortran/testpar/ptest.F90
View File