remove redundant write methods

Author: scivision

API.md

@@ -138,22 +138,6 @@ logical, intent(in), optional :: compact  !< faster I/O for sub-64 kB datasets
 integer, intent(out), optional :: ierr  !< 0 if OK
 ```
 
-While the generic `%write()` method above works for all supported types and ranks, it's also possible to specify the desired type to write.
-The user may desire this to be more explicit about the data type intended for disk writes.
-The optional arguments are the same as above; we give basic examples here:
-
-```fortran
-call h%write_r32(dname, 1._real32)
-
-call h%write_r64(dname, 1._real64)
-
-call h%write_i32(dname, 1_int32)
-
-call h%write_i64(dname, 1_int64)
-
-call h%write_char(dname, "hello")
-```
-
 Write dataset attribute (e.g. units or instrument)
 
 ```fortran

src/interface.f90

@@ -54,8 +54,7 @@ module h5fortran
 !> below are procedure that need generic mapping (type or rank agnostic)
 
 !> write group or dataset integer/real
-generic, public :: write => &
-hdf_write_scalar_r32,hdf_write_scalar_r64,hdf_write_scalar_i32,hdf_write_scalar_i64, hdf_write_scalar_char, &
+generic, public :: write => hdf_write_scalar, &
 hdf_write_1d_r32, hdf_write_1d_r64, hdf_write_1d_i32, hdf_write_1d_i64, &
 hdf_write_2d_r32, hdf_write_2d_r64, hdf_write_2d_i32, hdf_write_2d_i64, &
 hdf_write_3d_r32, hdf_write_3d_r64, hdf_write_3d_i32, hdf_write_3d_i64, &
@@ -64,20 +63,6 @@ module h5fortran
 hdf_write_6d_r32, hdf_write_6d_r64, hdf_write_6d_i32, hdf_write_6d_i64, &
 hdf_write_7d_r32, hdf_write_7d_r64, hdf_write_7d_i32, hdf_write_7d_i64
 
-generic, public :: write_r32 => hdf_write_scalar_r32,hdf_write_1d_r32,hdf_write_2d_r32,hdf_write_3d_r32, &
-hdf_write_4d_r32,hdf_write_5d_r32,hdf_write_6d_r32,hdf_write_7d_r32
-
-generic, public :: write_r64 => hdf_write_scalar_r64,hdf_write_1d_r64,hdf_write_2d_r64,hdf_write_3d_r64, &
-hdf_write_4d_r64,hdf_write_5d_r64,hdf_write_6d_r64,hdf_write_7d_r64
-
-generic, public :: write_i32 => hdf_write_scalar_i32,hdf_write_1d_i32,hdf_write_2d_i32,hdf_write_3d_i32, &
-hdf_write_4d_i32,hdf_write_5d_i32,hdf_write_6d_i32,hdf_write_7d_i32
-
-generic, public :: write_i64 => hdf_write_scalar_i64,hdf_write_1d_i64,hdf_write_2d_i64,hdf_write_3d_i64, &
-hdf_write_4d_i64,hdf_write_5d_i64,hdf_write_6d_i64,hdf_write_7d_i64
-
-generic, public :: write_char => hdf_write_scalar_char
-
 !> write attributes
 generic, public :: writeattr => writeattr_char, writeattr_num
 
@@ -90,8 +75,7 @@ module h5fortran
 
 !> private methods
 !! each method must be declared here, and above as a generic, public
-procedure,private :: &
-hdf_write_scalar_r32, hdf_write_scalar_r64, hdf_write_scalar_i32, hdf_write_scalar_i64, hdf_write_scalar_char, &
+procedure,private :: hdf_write_scalar, &
 hdf_write_1d_r32, hdf_write_1d_r64, hdf_write_1d_i32, hdf_write_1d_i64, &
 hdf_write_2d_r32, hdf_write_2d_r64, hdf_write_2d_i32, hdf_write_2d_i64, &
 hdf_write_3d_r32, hdf_write_3d_r64, hdf_write_3d_i32, hdf_write_3d_i64, &
@@ -459,46 +443,13 @@ end subroutine lt7read
 end interface
 
 interface !< writer.f90
-module subroutine hdf_write_scalar_r32(self, dname, value, ierr, compact)
-class(hdf5_file), intent(inout) :: self
-character(*), intent(in) :: dname
-real(real32), intent(in) :: value
-logical, intent(in), optional :: compact
-integer, intent(out), optional :: ierr
-end subroutine hdf_write_scalar_r32
-
-module subroutine hdf_write_scalar_r64(self, dname, value, ierr, compact)
+module subroutine hdf_write_scalar(self, dname, value, ierr, compact)
 class(hdf5_file), intent(inout) :: self
 character(*), intent(in) :: dname
-real(real64), intent(in) :: value
+class(*), intent(in) :: value
 logical, intent(in), optional :: compact
 integer, intent(out), optional :: ierr
-end subroutine hdf_write_scalar_r64
-
-module subroutine hdf_write_scalar_i32(self, dname, value, ierr, compact)
-class(hdf5_file), intent(inout) :: self
-character(*), intent(in) :: dname
-integer(int32), intent(in) :: value
-logical, intent(in), optional :: compact
-integer, intent(out), optional :: ierr
-end subroutine hdf_write_scalar_i32
-
-module subroutine hdf_write_scalar_i64(self, dname, value, ierr, compact)
-class(hdf5_file), intent(inout) :: self
-character(*), intent(in) :: dname
-integer(int64), intent(in) :: value
-logical, intent(in), optional :: compact
-integer, intent(out), optional :: ierr
-end subroutine hdf_write_scalar_i64
-
-module subroutine hdf_write_scalar_char(self, dname, value, ierr, compact)
-class(hdf5_file), intent(inout) :: self
-character(*), intent(in) :: dname
-character(*), intent(in) :: value
-logical, intent(in), optional :: compact
-integer, intent(out), optional :: ierr
-end subroutine hdf_write_scalar_char
-
+end subroutine hdf_write_scalar
 
 module subroutine hdf_write_1d_r32(self,dname,value, ierr, chunk_size, istart, iend, stride, compact)
 class(hdf5_file), intent(inout) :: self

src/tests/test_array.f90

@@ -153,7 +153,6 @@ subroutine test_write_slice(filename)
 print *, 'PASSED: create dataset and write slice 1D'
 
 call h%write('/int32-1d', [35, 70], istart=[2], iend=[3], stride=[1])
-call h%write_i32('/int32-1d', [35, 70], istart=[2], iend=[3], stride=[1])
 
 call h%read('/int32-1d', i1t)
 if (.not.all(i1t==[1,35,70,4])) then

src/tests/test_scalar.f90

@@ -33,16 +33,12 @@ program scalar_test
 call h%open(fn, action='w')
 !> scalar tests
 call h%write('/scalar_int32', 42_int32)
-call h%write_i32('/scalar_i32', 42_int32)
 
 call h%write('/scalar_int64', 42_int64)
-call h%write_i64('/scalar_i64', 42_int64)
 
 call h%write('/scalar_real32', -1._real32)
-call h%write_r32("/scalar_r32", -1._real32)
 
 call h%write('/scalar_real64', -1._real64)
-call h%write_r64("/scalar_r64", -1._real64)
 
 !> vector
 call h%write('/1d_real', r1)

src/tests/test_string.f90

@@ -15,7 +15,6 @@ program test_string
 call h%open(path, action='w')
 
 call h%write('/little', '42')
-call h%write_char('/little_char', '42')
 call h%write('/MySentence', 'this is a little sentence.')
 
 call h%close()

src/write/writer.in.f90

@@ -7,7 +7,7 @@
 contains
 
 
-module procedure hdf_write_scalar_r32
+module procedure hdf_write_scalar
 
 integer(HID_T)  :: sid, did
 integer(HSIZE_T), allocatable :: dims(:)
@@ -17,100 +17,34 @@
 
 allocate(dims(0))
 
-call hdf_create(self, dname, H5T_NATIVE_REAL, dims, sid, did, compact=compact)
-call h5dwrite_f(did, H5T_NATIVE_REAL, value, dims, ier)
-
-if (ier/=0) error stop 'h5fortran:write: could not write ' // dname // ' to ' // self%filename
-
-call hdf_wrapup(did, sid)
-
-if (present(ierr)) ierr = ier
-if (check(ier, self%filename, dname) .and. .not.present(ierr)) error stop "h5fortran:write:wrapup: " // dname
-
-end procedure hdf_write_scalar_r32
-
-
-module procedure hdf_write_scalar_r64
-
-integer(HID_T)  :: sid, did
-integer(HSIZE_T), allocatable :: dims(:)
-integer :: ier
-
-if(.not.self%is_open) error stop 'h5fortran:write: file handle is not open'
-
-allocate(dims(0))
-
-call hdf_create(self, dname, H5T_NATIVE_DOUBLE, dims, sid, did, compact=compact)
-call h5dwrite_f(did, H5T_NATIVE_DOUBLE, value, dims, ier)
-
-if (ier/=0) error stop 'h5fortran:write: could not write ' // dname // ' to ' // self%filename
-
-call hdf_wrapup(did, sid)
-
-if (present(ierr)) ierr = ier
-if (check(ier, self%filename, dname) .and. .not.present(ierr)) error stop "h5fortran:write:wrapup: " // dname
-
-end procedure hdf_write_scalar_r64
-
-
-module procedure hdf_write_scalar_i32
-
-integer(HID_T)  :: sid, did
-integer(HSIZE_T), allocatable :: dims(:)
-integer :: ier
-
-if(.not.self%is_open) error stop 'h5fortran:write: file handle is not open'
-
-allocate(dims(0))
-
-call hdf_create(self, dname, H5T_NATIVE_INTEGER, dims, sid, did, compact=compact)
-call h5dwrite_f(did, H5T_NATIVE_INTEGER, value, dims, ier)
-
-if (ier/=0) error stop 'h5fortran:write: could not write ' // dname // ' to ' // self%filename
-
-call hdf_wrapup(did, sid)
-
-if (present(ierr)) ierr = ier
-if (check(ier, self%filename, dname) .and. .not.present(ierr)) error stop "h5fortran:write:wrapup: " // dname
-
-end procedure hdf_write_scalar_i32
-
-
-module procedure hdf_write_scalar_i64
-
-integer(HID_T)  :: sid, did
-integer(HSIZE_T), allocatable :: dims(:)
-integer :: ier
-
-if(.not.self%is_open) error stop 'h5fortran:write: file handle is not open'
-
-allocate(dims(0))
-
-call hdf_create(self, dname, H5T_STD_I64LE, dims, sid, did, compact=compact)
-call h5dwrite_f(did, H5T_STD_I64LE, value, dims, ier)
-
-if (ier/=0) error stop 'h5fortran:write: could not write ' // dname // ' to ' // self%filename
-
-call hdf_wrapup(did, sid)
-
-if (present(ierr)) ierr = ier
-if (check(ier, self%filename, dname) .and. .not.present(ierr)) error stop "h5fortran:write:wrapup: " // dname
-
-end procedure hdf_write_scalar_i64
-
-
-module procedure hdf_write_scalar_char
-
-integer :: ier
-
-if(.not.self%is_open) error stop 'h5fortran:write: file handle is not open'
-
-call h5ltmake_dataset_string_f(self%lid, dname, value, ier)
-
-if (present(ierr)) ierr = ier
-if (check(ier, self%filename, dname) .and. .not.present(ierr)) error stop "h5fortran:write:wrapup: " // dname
-
-end procedure hdf_write_scalar_char
+select type (value)
+type is (real(real32))
+  call hdf_create(self, dname, H5T_NATIVE_REAL, dims, sid, did, compact=compact)
+  call h5dwrite_f(did, H5T_NATIVE_REAL, value, dims, ier)
+type is (real(real64))
+  call hdf_create(self, dname, H5T_NATIVE_DOUBLE, dims, sid, did, compact=compact)
+  call h5dwrite_f(did, H5T_NATIVE_DOUBLE, value, dims, ier)
+type is (integer(int32))
+  call hdf_create(self, dname, H5T_NATIVE_INTEGER, dims, sid, did, compact=compact)
+  call h5dwrite_f(did, H5T_NATIVE_INTEGER, value, dims, ier)
+type is (integer(int64))
+  call hdf_create(self, dname, H5T_STD_I64LE, dims, sid, did, compact=compact)
+  call h5dwrite_f(did, H5T_STD_I64LE, value, dims, ier)
+type is (character(*))
+  call h5ltmake_dataset_string_f(self%lid, dname, value, ier)
+class default
+  error stop "h5fortran:write: unknown type"
+end select
+
+if (ier /= 0) error stop 'h5fortran:write: could not write ' // dname // ' to ' // self%filename
+
+select type (value)
+type is (character(*))
+class default
+  call hdf_wrapup(did, sid)
+end select
+
+end procedure hdf_write_scalar
 
 
 module procedure hdf_write_1d_r32