add h5read(), h5write() procedures

Author: scivision

src/CMakeLists.txt

@@ -9,6 +9,7 @@ utils.f90
 ${CMAKE_CURRENT_BINARY_DIR}/hdf5_config.f90
 read.f90 read_scalar.f90 read_scalar_ascii.f90 reader.f90
 write.f90 write_scalar.f90 writer.f90
+reader_lt.f90 writer_lt.f90
 interface.f90
 attr.f90 attr_read.f90 attr_write.f90
 mpi.F90

src/interface.f90

@@ -86,7 +86,15 @@ module h5fortran
 public :: hdf5_file, is_hdf5
 public :: hdf_rank_check, hdf_shape_check, hdf5version, h5exist, hdf5_close
 public :: mpi_collective, mpi_hyperslab
-public :: h5write_attr, h5read_attr
+public :: h5write, h5read, h5write_attr, h5read_attr
+
+interface h5write
+procedure lt0write, lt1write, lt2write, lt3write, lt4write, lt5write, lt6write, lt7write
+end interface
+
+interface h5read
+procedure lt0read, lt1read, lt2read, lt3read, lt4read, lt5read, lt6read, lt7read
+end interface
 
 interface h5write_attr
 procedure lt0writeattr, lt1writeattr
@@ -156,6 +164,99 @@ module subroutine get_hdf5_config(parallel_compression)
 end subroutine
 end interface
 
+interface !< writer_lt.f90
+
+module subroutine lt0write(filename, dname, A)
+character(*), intent(in) :: filename, dname
+class(*), intent(in) :: A
+end subroutine
+
+module subroutine lt1write(filename, dname, A)
+character(*), intent(in) :: filename, dname
+class(*), intent(in) :: A(:)
+end subroutine
+
+module subroutine lt2write(filename, dname, A)
+character(*), intent(in) :: filename, dname
+class(*), intent(in) :: A(:,:)
+end subroutine
+
+module subroutine lt3write(filename, dname, A)
+character(*), intent(in) :: filename, dname
+class(*), intent(in) :: A(:,:,:)
+end subroutine
+
+module subroutine lt4write(filename, dname, A)
+character(*), intent(in) :: filename, dname
+class(*), intent(in) :: A(:,:,:,:)
+end subroutine
+
+module subroutine lt5write(filename, dname, A)
+character(*), intent(in) :: filename, dname
+class(*), intent(in) :: A(:,:,:,:,:)
+end subroutine
+
+module subroutine lt6write(filename, dname, A)
+character(*), intent(in) :: filename, dname
+class(*), intent(in) :: A(:,:,:,:,:,:)
+end subroutine
+
+module subroutine lt7write(filename, dname, A)
+character(*), intent(in) :: filename, dname
+class(*), intent(in) :: A(:,:,:,:,:,:,:)
+end subroutine
+
+end interface
+
+
+interface !< reader_lt.f90
+
+module logical function h5exist(filename, dname, mpi)
+character(*), intent(in) :: filename, dname
+logical, intent(in), optional :: mpi
+end function
+
+module subroutine lt0read(filename, dname, A)
+character(*), intent(in) :: filename, dname
+class(*), intent(out) :: A
+end subroutine
+
+module subroutine lt1read(filename, dname, A)
+character(*), intent(in) :: filename, dname
+class(*), intent(inout) :: A(:)
+end subroutine
+
+module subroutine lt2read(filename, dname, A)
+character(*), intent(in) :: filename, dname
+class(*), intent(inout) :: A(:,:)
+end subroutine
+
+module subroutine lt3read(filename, dname, A)
+character(*), intent(in) :: filename, dname
+class(*), intent(inout) :: A(:,:,:)
+end subroutine
+
+module subroutine lt4read(filename, dname, A)
+character(*), intent(in) :: filename, dname
+class(*), intent(inout) :: A(:,:,:,:)
+end subroutine
+
+module subroutine lt5read(filename, dname, A)
+character(*), intent(in) :: filename, dname
+class(*), intent(inout) :: A(:,:,:,:,:)
+end subroutine
+
+module subroutine lt6read(filename, dname, A)
+character(*), intent(in) :: filename, dname
+class(*), intent(inout) :: A(:,:,:,:,:,:)
+end subroutine
+
+module subroutine lt7read(filename, dname, A)
+character(*), intent(in) :: filename, dname
+class(*), intent(inout) :: A(:,:,:,:,:,:,:)
+end subroutine
+end interface
+
 
 interface !< writer.f90
 
@@ -284,11 +385,6 @@ module logical function hdf_check_exist(self, dname)
 !! * arrays: to work correctly when actual argument is allocatable
 !! * scalar: to work correctly with character type
 
-module logical function h5exist(filename, dname, mpi)
-character(*), intent(in) :: filename, dname
-logical, intent(in) :: mpi
-end function
-
 module subroutine h5read_scalar(self, dname, A)
 class(hdf5_file), intent(in)     :: self
 character(*), intent(in)         :: dname

src/reader.f90

@@ -7,17 +7,6 @@
 contains
 
 
-module procedure h5exist
-
-type(hdf5_file) :: h
-
-call h%open(filename, action='r', mpi=mpi)
-h5exist = h%exist(dname)
-call h%close()
-
-end procedure h5exist
-
-
 module procedure h5read_1d
 include "reader.inc"
 end procedure

src/reader_lt.f90

@@ -0,0 +1,50 @@
+submodule (h5fortran:hdf5_read) reader_lt
+
+implicit none (type, external)
+
+contains
+
+module procedure h5exist
+
+type(hdf5_file) :: h
+
+call h%open(filename, action='r', mpi=mpi)
+h5exist = h%exist(dname)
+call h%close()
+
+end procedure h5exist
+
+
+module procedure lt0read
+include "reader_lt.inc"
+end procedure
+
+module procedure lt1read
+include "reader_lt.inc"
+end procedure
+
+module procedure lt2read
+include "reader_lt.inc"
+end procedure
+
+module procedure lt3read
+include "reader_lt.inc"
+end procedure
+
+module procedure lt4read
+include "reader_lt.inc"
+end procedure
+
+module procedure lt5read
+include "reader_lt.inc"
+end procedure
+
+module procedure lt6read
+include "reader_lt.inc"
+end procedure
+
+module procedure lt7read
+include "reader_lt.inc"
+end procedure
+
+end submodule reader_lt

src/reader_lt.inc

@@ -0,0 +1,5 @@
+type(hdf5_file) :: h
+
+call h%open(filename, action='r')
+call h%read(dname, A)
+call h%close()

src/writer_lt.f90

@@ -0,0 +1,40 @@
+submodule (h5fortran:write) writer_lt
+
+implicit none (type, external)
+
+contains
+
+
+module procedure lt0write
+include "writer_lt.inc"
+end procedure
+
+module procedure lt1write
+include "writer_lt.inc"
+end procedure
+
+module procedure lt2write
+include "writer_lt.inc"
+end procedure
+
+module procedure lt3write
+include "writer_lt.inc"
+end procedure
+
+module procedure lt4write
+include "writer_lt.inc"
+end procedure
+
+module procedure lt5write
+include "writer_lt.inc"
+end procedure
+
+module procedure lt6write
+include "writer_lt.inc"
+end procedure
+
+module procedure lt7write
+include "writer_lt.inc"
+end procedure
+
+end submodule writer_lt

src/writer_lt.inc

@@ -0,0 +1,5 @@
+type(hdf5_file) :: h
+
+call h%open(filename, action='rw')
+call h%write(dname, A)
+call h%close()

test/CMakeLists.txt

@@ -57,7 +57,7 @@ cmake_path(SET string_file ${CMAKE_CURRENT_BINARY_DIR}/test_string_py.h5)
 # --- non-MPI tests
 
 set(nompi_tests array attributes cast deflate_props deflate_read deflate_write destructor
-exist
+exist fill
 )
 
 nompi_test("${nompi_tests}")
@@ -92,7 +92,7 @@ endif()
 # --- MPI tests
 
 set(mpi_tests array_mpi attributes_mpi cast_mpi destructor_mpi exist_mpi
-fill groups layout shape
+fill_mpi groups_mpi layout shape
 string string_read write
 )
 

test/test_fill.f90

@@ -4,29 +4,20 @@ program fill
 
 use h5fortran, only : hdf5_file
 use hdf5, only : HSIZE_T, H5T_NATIVE_REAL, H5T_NATIVE_DOUBLE, H5T_NATIVE_INTEGER, H5T_NATIVE_CHARACTER
-use mpi, only : mpi_init, MPI_COMM_WORLD, mpi_comm_rank
 
 implicit none (type, external)
 
-external :: mpi_finalize
-
 type(hdf5_file) :: h5
 
 character(*), parameter :: fn = "test_fill.h5"
 
 real :: NaN, r(3)
-integer :: i(2), ierr, mpi_id
+integer :: i(2)
 character(10) :: c, fill_value
 
-call mpi_init(ierr)
-if (ierr /= 0) error stop "mpi_init"
-
-call mpi_comm_rank(MPI_COMM_WORLD, mpi_id, ierr)
-if (ierr /= 0) error stop "mpi_comm_rank"
-
 NaN = ieee_value(0., ieee_quiet_nan)
 
-call h5%open(fn, action="w", mpi=.true.)
+call h5%open(fn, "w")
 
 call h5%create("/r32", H5T_NATIVE_REAL, dset_dims=[3], fill_value=NaN)
 call h5%create("/r64", H5T_NATIVE_DOUBLE, dset_dims=[3], fill_value=NaN)
@@ -42,8 +33,7 @@ program fill
 
 call h5%close()
 
-
-call h5%open(fn, action="r", mpi=.true.)
+call h5%open(fn, "r")
 
 call h5%read("/r32", r)
 if(any(ieee_is_finite(r))) error stop "real32: expected all NaN"
@@ -65,9 +55,6 @@ program fill
 
 call h5%close()
 
-if(mpi_id == 0) print *, "OK: fill value"
-
-call mpi_finalize(ierr)
-if (ierr /= 0) error stop "mpi_finalize"
+print *, "OK: fill value"
 
 end program