read character unify with h5fortrn

Author: scivision

src/interface.f90

@@ -106,10 +106,17 @@ module h5fortran
 procedure lt0readattr, lt1readattr
 end interface
 
+interface read_char
+procedure read_char0, read_char1, read_char2, read_char3, read_char4, read_char5, read_char6, read_char7
+end interface
 
 !! for submodules only
 public :: HSIZE_T, H5T_NATIVE_REAL, H5T_NATIVE_DOUBLE, H5T_NATIVE_INTEGER, H5T_NATIVE_CHARACTER, H5T_STD_I64LE
 public :: H5T_INTEGER_F, H5T_FLOAT_F, H5T_STRING_F
+!! HDF5 types for end users
+
+
+!> Submodules
 
 interface !< write.f90
 
@@ -272,55 +279,55 @@ module subroutine h5write_scalar(self, dname, A, compact)
 module subroutine h5write_1d(self, dname, A, dset_dims, istart, iend, stride, chunk_size, compact)
 class(hdf5_file), intent(in) :: self
 character(*), intent(in) :: dname
-class(*), intent(in) :: A(:)
+class(*), intent(in), dimension(:) :: A
 integer, intent(in), dimension(1), optional :: chunk_size, istart, iend, stride, dset_dims
 logical, intent(in), optional :: compact
 end subroutine
 
 module subroutine h5write_2d(self, dname, A, dset_dims, istart, iend, stride, chunk_size, compact)
 class(hdf5_file), intent(in) :: self
 character(*), intent(in) :: dname
-class(*), intent(in) :: A(:,:)
+class(*), intent(in), dimension(:,:):: A
 integer, intent(in), dimension(2), optional :: chunk_size, istart, iend, stride, dset_dims
 logical, intent(in), optional :: compact
 end subroutine
 
 module subroutine h5write_3d(self, dname, A, dset_dims, istart, iend, stride, chunk_size, compact)
 class(hdf5_file), intent(in) :: self
 character(*), intent(in) :: dname
-class(*), intent(in) :: A(:,:,:)
+class(*), intent(in), dimension(:,:,:) :: A
 integer, intent(in), dimension(3), optional :: chunk_size, istart, iend, stride, dset_dims
 logical, intent(in), optional :: compact
 end subroutine
 
 module subroutine h5write_4d(self, dname, A, dset_dims, istart, iend, stride, chunk_size, compact)
 class(hdf5_file), intent(in) :: self
 character(*), intent(in) :: dname
-class(*), intent(in) :: A(:,:,:,:)
+class(*), intent(in), dimension(:,:,:,:) :: A
 integer, intent(in), dimension(4), optional :: chunk_size, istart, iend, stride, dset_dims
 logical, intent(in), optional :: compact
 end subroutine
 
 module subroutine h5write_5d(self, dname, A, dset_dims, istart, iend, stride, chunk_size, compact)
 class(hdf5_file), intent(in) :: self
 character(*), intent(in) :: dname
-class(*), intent(in) :: A(:,:,:,:,:)
+class(*), intent(in), dimension(:,:,:,:,:) :: A
 integer, intent(in), dimension(5), optional :: chunk_size, istart, iend, stride, dset_dims
 logical, intent(in), optional :: compact
 end subroutine
 
 module subroutine h5write_6d(self, dname, A, dset_dims, istart, iend, stride, chunk_size, compact)
 class(hdf5_file), intent(in) :: self
 character(*), intent(in) :: dname
-class(*), intent(in) :: A(:,:,:,:,:,:)
+class(*), intent(in), dimension(:,:,:,:,:,:) :: A
 integer, intent(in), dimension(6), optional :: chunk_size, istart, iend, stride, dset_dims
 logical, intent(in), optional :: compact
 end subroutine
 
 module subroutine h5write_7d(self, dname, A, dset_dims, istart, iend, stride, chunk_size, compact)
 class(hdf5_file), intent(in) :: self
 character(*), intent(in) :: dname
-class(*), intent(in) :: A(:,:,:,:,:,:,:)
+class(*), intent(in), dimension(:,:,:,:,:,:,:) :: A
 integer, intent(in), dimension(7), optional :: chunk_size, istart, iend, stride, dset_dims
 logical, intent(in), optional :: compact
 end subroutine
@@ -399,58 +406,113 @@ 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 subroutine read_char0(self, obj_name, A, obj_id, mem_space_id, file_space_id)
+class(hdf5_file), intent(in) :: self
+character(*), intent(in) :: obj_name
+character(*), intent(inout) :: A
+integer(HID_T), intent(in) :: obj_id, mem_space_id, file_space_id
+end subroutine
+
+module subroutine read_char1(self, obj_name, A, obj_id, mem_space_id, file_space_id)
+class(hdf5_file), intent(in) :: self
+character(*), intent(in) :: obj_name
+character(*), intent(inout), dimension(:) :: A
+integer(HID_T), intent(in) :: obj_id, mem_space_id, file_space_id
+end subroutine
+
+module subroutine read_char2(self, obj_name, A, obj_id, mem_space_id, file_space_id)
+class(hdf5_file), intent(in) :: self
+character(*), intent(in) :: obj_name
+character(*), intent(inout), dimension(:,:) :: A
+integer(HID_T), intent(in) :: obj_id, mem_space_id, file_space_id
+end subroutine
+
+module subroutine read_char3(self, obj_name, A, obj_id, mem_space_id, file_space_id)
+class(hdf5_file), intent(in) :: self
+character(*), intent(in) :: obj_name
+character(*), intent(inout), dimension(:,:,:) :: A
+integer(HID_T), intent(in) :: obj_id, mem_space_id, file_space_id
+end subroutine
+
+module subroutine read_char4(self, obj_name, A, obj_id, mem_space_id, file_space_id)
+class(hdf5_file), intent(in) :: self
+character(*), intent(in) :: obj_name
+character(*), intent(inout), dimension(:,:,:,:) :: A
+integer(HID_T), intent(in) :: obj_id, mem_space_id, file_space_id
+end subroutine
+
+module subroutine read_char5(self, obj_name, A, obj_id, mem_space_id, file_space_id)
+class(hdf5_file), intent(in) :: self
+character(*), intent(in) :: obj_name
+character(*), intent(inout), dimension(:,:,:,:,:) :: A
+integer(HID_T), intent(in) :: obj_id, mem_space_id, file_space_id
+end subroutine
+
+module subroutine read_char6(self, obj_name, A, obj_id, mem_space_id, file_space_id)
+class(hdf5_file), intent(in) :: self
+character(*), intent(in) :: obj_name
+character(*), intent(inout), dimension(:,:,:,:,:,:) :: A
+integer(HID_T), intent(in) :: obj_id, mem_space_id, file_space_id
+end subroutine
+
+module subroutine read_char7(self, obj_name, A, obj_id, mem_space_id, file_space_id)
+class(hdf5_file), intent(in) :: self
+character(*), intent(in) :: obj_name
+character(*), intent(inout), dimension(:,:,:,:,:,:,:) :: A
+integer(HID_T), intent(in) :: obj_id, mem_space_id, file_space_id
+end subroutine
 module subroutine h5read_scalar(self, dname, A)
 class(hdf5_file), intent(in)     :: self
 character(*), intent(in)         :: dname
-class(*), intent(inout)        :: A
+class(*), intent(inout)          :: A
 end subroutine
 
 module subroutine h5read_1d(self, dname, A, istart, iend, stride)
 class(hdf5_file), intent(in)     :: self
 character(*), intent(in)         :: dname
-class(*), intent(inout) :: A(:)
+class(*), intent(inout), dimension(:) :: A
 integer, intent(in), dimension(1), optional :: istart, iend, stride
 end subroutine
 
 module subroutine h5read_2d(self, dname, A, istart, iend, stride)
 class(hdf5_file), intent(in)     :: self
 character(*), intent(in)         :: dname
-class(*), intent(inout) :: A(:,:)
+class(*), intent(inout), dimension(:,:) :: A
 integer, intent(in), dimension(2), optional :: istart, iend, stride
 end subroutine
 
 module subroutine h5read_3d(self, dname, A, istart, iend, stride)
 class(hdf5_file), intent(in)     :: self
 character(*), intent(in)         :: dname
-class(*), intent(inout) :: A(:,:,:)
+class(*), intent(inout), dimension(:,:,:) :: A
 integer, intent(in), dimension(3), optional :: istart, iend, stride
 end subroutine
 
 module subroutine h5read_4d(self, dname, A,  istart, iend, stride)
 class(hdf5_file), intent(in)     :: self
 character(*), intent(in)         :: dname
-class(*), intent(inout) :: A(:,:,:,:)
+class(*), intent(inout), dimension(:,:,:,:) :: A
 integer, intent(in), dimension(4), optional :: istart, iend, stride
 end subroutine
 
 module subroutine h5read_5d(self, dname, A, istart, iend, stride)
 class(hdf5_file), intent(in)     :: self
 character(*), intent(in)         :: dname
-class(*), intent(inout) :: A(:,:,:,:,:)
+class(*), intent(inout), dimension(:,:,:,:,:) :: A
 integer, intent(in), dimension(5), optional :: istart, iend, stride
 end subroutine
 
 module subroutine h5read_6d(self, dname, A, istart, iend, stride)
 class(hdf5_file), intent(in)     :: self
 character(*), intent(in)         :: dname
-class(*), intent(inout) :: A(:,:,:,:,:,:)
+class(*), intent(inout), dimension(:,:,:,:,:,:) :: A
 integer, intent(in), dimension(6), optional :: istart, iend, stride
 end subroutine
 
 module subroutine h5read_7d(self, dname, A, istart, iend, stride)
 class(hdf5_file), intent(in)     :: self
 character(*), intent(in)         :: dname
-class(*), intent(inout) :: A(:,:,:,:,:,:,:)
+class(*), intent(inout), dimension(:,:,:,:,:,:,:) :: A
 integer, intent(in), dimension(7), optional :: istart, iend, stride
 end subroutine
 

src/read.f90

@@ -3,13 +3,13 @@
 use, intrinsic:: iso_c_binding, only : c_null_char
 
 use hdf5, only : &
-H5Aget_space_f, H5Aget_type_f, H5Aopen_by_name_f, H5Aclose_f, &
+H5Aget_space_f, H5Aget_type_f, H5Aopen_by_name_f, H5Aclose_f, H5Aget_storage_size_f, &
 h5pget_layout_f, h5pget_chunk_f, h5pclose_f, h5pget_nfilters_f, h5pget_filter_f, &
-H5Dget_create_plist_f, h5dget_type_f, h5dopen_f, h5dclose_f, H5Dget_space_f, &
+H5Dget_create_plist_f, h5dget_type_f, h5dopen_f, h5dclose_f, H5Dget_space_f, H5Dget_storage_size_f, &
 H5Iget_type_f, &
 h5lexists_f, &
-H5Sget_simple_extent_ndims_f, H5Sget_simple_extent_dims_f, H5Sclose_f, &
-h5tclose_f, h5tget_native_type_f, h5tget_class_f, H5Tget_order_f, h5tget_size_f, h5tget_strpad_f, &
+H5Sget_simple_extent_ndims_f, H5Sget_simple_extent_dims_f, H5Sget_simple_extent_npoints_f, H5Sclose_f, &
+h5tclose_f, h5tget_native_type_f, h5tget_class_f, H5Tget_order_f, h5tget_size_f, h5tget_strpad_f, H5Tis_variable_str_f, &
 h5z_filter_deflate_f, &
 H5T_DIR_ASCEND_F, &
 H5I_ATTR_F, H5I_DATASET_F
@@ -119,43 +119,43 @@
 module procedure get_obj_class
 
 integer :: ier, obj_type
-integer(HID_T) :: dtype_id, native_dtype_id
+integer(HID_T) :: obj_dtype, native_dtype
 
 call H5Iget_type_f(obj_id, obj_type, ier)
 if(ier /= 0) error stop "ERROR:h5fortran:get_obj_class:H5Iget_type: " // obj_name // " " // self%filename
 
 if(obj_type == H5I_DATASET_F) then
-  call H5Dget_type_f(obj_id, dtype_id, ier)
+  call H5Dget_type_f(obj_id, obj_dtype, ier)
 elseif(obj_type == H5I_ATTR_F) then
-  call H5Aget_type_f(obj_id, dtype_id, ier)
+  call H5Aget_type_f(obj_id, obj_dtype, ier)
 else
   error stop "ERROR:h5fortran:get_obj_class: only datasets and attributes have datatype " // obj_name // " " // self%filename
 endif
-if(ier/=0) error stop 'ERROR:h5fortran:get_class: dtype_id ' // obj_name // ' from ' // self%filename
+if(ier/=0) error stop 'ERROR:h5fortran:get_class: obj_dtype ' // obj_name // ' from ' // self%filename
 
-call H5Tget_native_type_f(dtype_id, H5T_DIR_ASCEND_F, native_dtype_id, ier)
-if(ier/=0) error stop 'ERROR:h5fortran:get_class: native_dtype_id ' // obj_name // ' from ' // self%filename
+call H5Tget_native_type_f(obj_dtype, H5T_DIR_ASCEND_F, native_dtype, ier)
+if(ier/=0) error stop 'ERROR:h5fortran:get_class: native_dtype ' // obj_name // ' from ' // self%filename
 
 !> compose datatype inferred
-call H5Tget_class_f(native_dtype_id, class, ier)
+call H5Tget_class_f(native_dtype, class, ier)
 if(ier/=0) error stop 'ERROR:h5fortran:get_class: class ' // obj_name // ' from ' // self%filename
 
 if(present(size_bytes)) then
-  call H5Tget_size_f(native_dtype_id, size_bytes, ier)
+  call H5Tget_size_f(native_dtype, size_bytes, ier)
   if(ier/=0) error stop 'ERROR:h5fortran:get_class: byte size ' // obj_name // ' from ' // self%filename
 endif
 
-call H5Tclose_f(native_dtype_id, ier)
+call H5Tclose_f(native_dtype, ier)
 if(ier/=0) error stop 'ERROR:h5fortran:get_class: closing native dtype ' // obj_name // ' from ' // self%filename
 
 if(present(pad_type)) then
   if(class /= H5T_STRING_F) error stop "ERROR:h5fortran:get_class: pad_type only for string"
 
-  call H5Tget_strpad_f(dtype_id, pad_type, ier)
+  call H5Tget_strpad_f(obj_dtype, pad_type, ier)
   if(ier /= 0) error stop "h5fortran:read:h5tget_strpad " // obj_name // " in " // self%filename
 endif
 
-call H5Tclose_f(dtype_id, ier)
+call H5Tclose_f(obj_dtype, ier)
 if(ier/=0) error stop 'ERROR:h5fortran:get_class: closing dtype ' // obj_name // ' from ' // self%filename
 
 end procedure get_obj_class
@@ -186,7 +186,7 @@
 endif
 
 !> endianness and within type casting is handled by HDF5
-! call h5tget_order_f(native_dtype_id, order, ier)
+! call h5tget_order_f(native_dtype, order, ier)
 ! if(ier/=0) error stop 'ERROR:h5fortran:reader: get endianness ' // dname // ' from ' // self%filename
 ! !> check dataset endianness matches machine (in future, could swap endianness if needed)
 ! call h5tget_order_f(H5T_NATIVE_INTEGER, machine_order, ier)