same internal procedure names as h5fortran

Author: scivision

src/interface.f90

@@ -54,9 +54,9 @@ module h5mpi
 procedure, public :: is_open
 !! procedures without mapping
 
-generic, public :: write => h5write_scalar,ph5write_1d, ph5write_2d, ph5write_3d, ph5write_4d, ph5write_5d, ph5write_6d, ph5write_7d
+generic, public :: write => h5write_scalar, h5write_1d, h5write_2d, h5write_3d, h5write_4d, h5write_5d, h5write_6d, h5write_7d
 
-generic, public :: read => h5read_scalar, ph5read_1d, ph5read_2d, ph5read_3d, ph5read_4d, ph5read_5d, ph5read_6d, ph5read_7d
+generic, public :: read => h5read_scalar, h5read_1d, h5read_2d, h5read_3d, h5read_4d, h5read_5d, h5read_6d, h5read_7d
 !! mapped procedures
 
 !> write attributes
@@ -67,9 +67,9 @@ module h5mpi
 
 procedure, private :: writeattr_char, writeattr_num, readattr_char, readattr_num
 
-procedure, private :: h5write_scalar, ph5write_1d, ph5write_2d, ph5write_3d, ph5write_4d, ph5write_5d, ph5write_6d, ph5write_7d
+procedure, private :: h5write_scalar, h5write_1d, h5write_2d, h5write_3d, h5write_4d, h5write_5d, h5write_6d, h5write_7d
 
-procedure, private :: h5read_scalar, ph5read_1d, ph5read_2d, ph5read_3d, ph5read_4d, ph5read_5d, ph5read_6d, ph5read_7d
+procedure, private :: h5read_scalar, h5read_1d, h5read_2d, h5read_3d, h5read_4d, h5read_5d, h5read_6d, h5read_7d
 !! mapped procedures must be declared again like this
 
 !> flush file to disk and close file if user forgets to do so.
@@ -144,75 +144,75 @@ module subroutine h5write_scalar(self, dname, value, compact)
 logical, intent(in), optional :: compact
 end subroutine h5write_scalar
 
-module subroutine ph5write_1d(self, dname, value, dset_dims, istart, iend, chunk_size, compact)
+module subroutine h5write_1d(self, dname, value, dset_dims, istart, iend, chunk_size, compact)
 class(hdf5_file), intent(in) :: self
 character(*), intent(in) :: dname
 class(*), intent(in) :: value(:)
 class(*), intent(in), dimension(1), optional :: dset_dims  !< integer or integer(HSIZE_T) full disk shape (not just per worker)
 integer(HSIZE_T), intent(in), dimension(1), optional :: istart, iend
 integer, intent(in), dimension(1), optional :: chunk_size
 logical, intent(in), optional :: compact
-end subroutine ph5write_1d
+end subroutine h5write_1d
 
-module subroutine ph5write_2d(self, dname, value, dset_dims, istart, iend, chunk_size, compact)
+module subroutine h5write_2d(self, dname, value, dset_dims, istart, iend, chunk_size, compact)
 class(hdf5_file), intent(in) :: self
 character(*), intent(in) :: dname
 class(*), intent(in) :: value(:,:)
 class(*), intent(in), dimension(2), optional :: dset_dims
 integer(HSIZE_T), intent(in), dimension(2), optional :: istart, iend
 integer, intent(in), dimension(2), optional :: chunk_size
 logical, intent(in), optional :: compact
-end subroutine ph5write_2d
+end subroutine h5write_2d
 
-module subroutine ph5write_3d(self, dname, value, dset_dims, istart, iend, chunk_size, compact)
+module subroutine h5write_3d(self, dname, value, dset_dims, istart, iend, chunk_size, compact)
 class(hdf5_file), intent(in) :: self
 character(*), intent(in) :: dname
 class(*), intent(in) :: value(:,:,:)
 class(*), intent(in), dimension(3), optional :: dset_dims
 integer(HSIZE_T), intent(in), dimension(3), optional :: istart, iend
 integer, intent(in), dimension(3), optional :: chunk_size
 logical, intent(in), optional :: compact
-end subroutine ph5write_3d
+end subroutine h5write_3d
 
-module subroutine ph5write_4d(self, dname, value, dset_dims, istart, iend, chunk_size, compact)
+module subroutine h5write_4d(self, dname, value, dset_dims, istart, iend, chunk_size, compact)
 class(hdf5_file), intent(in) :: self
 character(*), intent(in) :: dname
 class(*), intent(in) :: value(:,:,:,:)
 class(*), intent(in), dimension(4), optional :: dset_dims
 integer(HSIZE_T), intent(in), dimension(4), optional :: istart, iend
 integer, intent(in), dimension(4), optional :: chunk_size
 logical, intent(in), optional :: compact
-end subroutine ph5write_4d
+end subroutine h5write_4d
 
-module subroutine ph5write_5d(self, dname, value, dset_dims, istart, iend, chunk_size, compact)
+module subroutine h5write_5d(self, dname, value, dset_dims, istart, iend, chunk_size, compact)
 class(hdf5_file), intent(in) :: self
 character(*), intent(in) :: dname
 class(*), intent(in) :: value(:,:,:,:,:)
 class(*), intent(in), dimension(5), optional :: dset_dims
 integer(HSIZE_T), intent(in), dimension(5), optional :: istart, iend
 integer, intent(in), dimension(5), optional :: chunk_size
 logical, intent(in), optional :: compact
-end subroutine ph5write_5d
+end subroutine h5write_5d
 
-module subroutine ph5write_6d(self, dname, value, dset_dims, istart, iend, chunk_size, compact)
+module subroutine h5write_6d(self, dname, value, dset_dims, istart, iend, chunk_size, compact)
 class(hdf5_file), intent(in) :: self
 character(*), intent(in) :: dname
 class(*), intent(in) :: value(:,:,:,:,:,:)
 class(*), intent(in), dimension(6), optional :: dset_dims
 integer(HSIZE_T), intent(in), dimension(6), optional :: istart, iend
 integer, intent(in), dimension(6), optional :: chunk_size
 logical, intent(in), optional :: compact
-end subroutine ph5write_6d
+end subroutine h5write_6d
 
-module subroutine ph5write_7d(self, dname, value, dset_dims, istart, iend, chunk_size, compact)
+module subroutine h5write_7d(self, dname, value, dset_dims, istart, iend, chunk_size, compact)
 class(hdf5_file), intent(in) :: self
 character(*), intent(in) :: dname
 class(*), intent(in) :: value(:,:,:,:,:,:,:)
 class(*), intent(in), dimension(7), optional :: dset_dims
 integer(HSIZE_T), intent(in), dimension(7), optional :: istart, iend
 integer, intent(in), dimension(7), optional :: chunk_size
 logical, intent(in), optional :: compact
-end subroutine ph5write_7d
+end subroutine h5write_7d
 
 end interface
 
@@ -290,54 +290,54 @@ module subroutine h5read_scalar(self, dname, value)
 class(*), intent(inout)        :: value
 end subroutine h5read_scalar
 
-module subroutine ph5read_1d(self, dname, value, istart, iend)
+module subroutine h5read_1d(self, dname, value, istart, iend)
 class(hdf5_file), intent(in)     :: self
 character(*), intent(in)         :: dname
 class(*), intent(inout) :: value(:)
 integer(HSIZE_T), intent(in), dimension(1), optional :: istart, iend
-end subroutine ph5read_1d
+end subroutine h5read_1d
 
-module subroutine ph5read_2d(self, dname, value, istart, iend)
+module subroutine h5read_2d(self, dname, value, istart, iend)
 class(hdf5_file), intent(in)     :: self
 character(*), intent(in)         :: dname
 class(*), intent(inout) :: value(:,:)
 integer(HSIZE_T), intent(in), dimension(2), optional :: istart, iend
-end subroutine ph5read_2d
+end subroutine h5read_2d
 
-module subroutine ph5read_3d(self, dname, value, istart, iend)
+module subroutine h5read_3d(self, dname, value, istart, iend)
 class(hdf5_file), intent(in)     :: self
 character(*), intent(in)         :: dname
 class(*), intent(inout) :: value(:,:,:)
 integer(HSIZE_T), intent(in), dimension(3), optional :: istart, iend
-end subroutine ph5read_3d
+end subroutine h5read_3d
 
-module subroutine ph5read_4d(self, dname, value, istart, iend)
+module subroutine h5read_4d(self, dname, value, istart, iend)
 class(hdf5_file), intent(in)     :: self
 character(*), intent(in)         :: dname
 class(*), intent(inout) :: value(:,:,:,:)
 integer(HSIZE_T), intent(in), dimension(4), optional :: istart, iend
-end subroutine ph5read_4d
+end subroutine h5read_4d
 
-module subroutine ph5read_5d(self, dname, value, istart, iend)
+module subroutine h5read_5d(self, dname, value, istart, iend)
 class(hdf5_file), intent(in)     :: self
 character(*), intent(in)         :: dname
 class(*), intent(inout) :: value(:,:,:,:,:)
 integer(HSIZE_T), intent(in), dimension(5), optional :: istart, iend
-end subroutine ph5read_5d
+end subroutine h5read_5d
 
-module subroutine ph5read_6d(self, dname, value, istart, iend)
+module subroutine h5read_6d(self, dname, value, istart, iend)
 class(hdf5_file), intent(in)     :: self
 character(*), intent(in)         :: dname
 class(*), intent(inout) :: value(:,:,:,:,:,:)
 integer(HSIZE_T), intent(in), dimension(6), optional :: istart, iend
-end subroutine ph5read_6d
+end subroutine h5read_6d
 
-module subroutine ph5read_7d(self, dname, value, istart, iend)
+module subroutine h5read_7d(self, dname, value, istart, iend)
 class(hdf5_file), intent(in)     :: self
 character(*), intent(in)         :: dname
 class(*), intent(inout) :: value(:,:,:,:,:,:,:)
 integer(HSIZE_T), intent(in), dimension(7), optional :: istart, iend
-end subroutine ph5read_7d
+end subroutine h5read_7d
 
 end interface
 
@@ -354,7 +354,7 @@ end subroutine readattr_char
 module subroutine readattr_num(self, dname, attr, attrval)
 class(hdf5_file), intent(in) :: self
 character(*), intent(in) :: dname, attr
-class(*), intent(inout) :: attrval(:)
+class(*), intent(out) :: attrval(:)
 end subroutine readattr_num
 
 module subroutine writeattr_char(self, dname, attr, attrval)
@@ -384,9 +384,9 @@ module subroutine h5open(self, filename, action, mpi, comp_lvl, shuffle, fletche
 
 class(hdf5_file), intent(inout) :: self
 character(*), intent(in) :: filename
-character(*), intent(in), optional :: action
+character(*), intent(in), optional :: action !< r, r+, rw, w, a
 logical, intent(in) :: mpi
-integer, intent(in), optional :: comp_lvl
+integer, intent(in), optional :: comp_lvl  !< 0: no compression. 1-9: ZLIB compression, higher is more compressior
 logical, intent(in), optional :: shuffle
 logical, intent(in), optional :: fletcher32
 logical, intent(in), optional :: debug

src/read_scalar.f90

@@ -29,16 +29,16 @@
 if(vector_scalar) then
   select type(value)
   type is (real(real32))
-    call ph5read_1d(self, dname, buf_r32)
+    call h5read_1d(self, dname, buf_r32)
     value = buf_r32(1)
   type is (real(real64))
-    call ph5read_1d(self, dname, buf_r64)
+    call h5read_1d(self, dname, buf_r64)
     value = buf_r64(1)
   type is (integer(int32))
-    call ph5read_1d(self, dname, buf_i32)
+    call h5read_1d(self, dname, buf_i32)
     value = buf_i32(1)
   type is (integer(int64))
-    call ph5read_1d(self, dname, buf_i64)
+    call h5read_1d(self, dname, buf_i64)
     value = buf_i64(1)
   class default
     error stop "h5fortran:read:vector_scalar: unknown memory variable type" // dname
@@ -113,17 +113,12 @@
       call h5sclose_f(space_id, ier)
       if(ier/=0) error stop "h5fortran:read:h5sclose " // dname // " in " // self%filename
     else
-      !! H5T_STR_NULLTERM  Null terminate (as C does).
-      !! H5T_STR_NULLPAD   Pad with zeros.
-      !! H5T_STR_SPACEPAD  Pad with spaces (as FORTRAN does).
       call H5Tget_strpad_f(type_id, pad_type, ier)
       if(ier/=0) error stop "h5fortran:read:h5tget_strpad " // dname // " in " // self%filename
 
       call H5Tget_size_f(type_id, dsize, ier) !< only for non-variable
       if(ier/=0) error stop "h5fortran:read:h5tget_size " // dname // " in " // self%filename
 
-      if(pad_type == H5T_STR_NULLTERM_F) dsize = dsize - 1  !< for the trailing C_NULL_CHAR
-
       if(dsize > len(value)) then
         write(stderr,'(a,i0,a3,i0,1x,a)') "h5fortran:read:string: buffer too small: ", dsize, " > ", len(value), &
             dname // " in " // self%filename

src/reader.f90

@@ -18,32 +18,32 @@
 end procedure h5exist
 
 
-module procedure ph5read_1d
+module procedure h5read_1d
 include "reader_template.inc"
-end procedure ph5read_1d
+end procedure h5read_1d
 
-module procedure ph5read_2d
+module procedure h5read_2d
 include "reader_template.inc"
-end procedure ph5read_2d
+end procedure h5read_2d
 
-module procedure ph5read_3d
+module procedure h5read_3d
 include "reader_template.inc"
-end procedure ph5read_3d
+end procedure h5read_3d
 
-module procedure ph5read_4d
+module procedure h5read_4d
 include "reader_template.inc"
-end procedure ph5read_4d
+end procedure h5read_4d
 
-module procedure ph5read_5d
+module procedure h5read_5d
 include "reader_template.inc"
-end procedure ph5read_5d
+end procedure h5read_5d
 
-module procedure ph5read_6d
+module procedure h5read_6d
 include "reader_template.inc"
-end procedure ph5read_6d
+end procedure h5read_6d
 
-module procedure ph5read_7d
+module procedure h5read_7d
 include "reader_template.inc"
-end procedure ph5read_7d
+end procedure h5read_7d
 
 end submodule hdf5_reader