name/doc refactor for common with nc4fortran

Author: scivision

.gitignore

@@ -22,6 +22,7 @@ __pycache__/
 
 # Fortran module files
 *.mod
+*.smod
 
 # Compiled Static libraries
 *.lai

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 3.13)  # 3.13 for target_sources() absolute
+cmake_minimum_required(VERSION 3.13)  # 3.13 for target_sources() absolute
 if(NOT CMAKE_BUILD_TYPE)
   set(CMAKE_BUILD_TYPE Release CACHE STRING "Debug or Release")
 endif()
@@ -48,4 +48,4 @@ endif()
 # --- install
 if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
   include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/install.cmake)
-endif()
+endif()

src/CMakeLists.txt

@@ -1,5 +1,5 @@
 target_sources(h5fortran PRIVATE
-hdf5_interface.f90
+interface.f90
 read.f90 reader.f90
 write.f90 writer.f90
 string_utils.f90)

src/hdf5_interface.f90 renamed to src/interface.f90

@@ -404,40 +404,38 @@ subroutine hdf_initialize(self,filename,ierr, status,action,comp_lvl,chunk_size,
 laction = 'rw'
 if(present(action)) laction = toLower(action)
 
-
 select case(lstatus)
-  case ('old', 'unknown')
-    select case(laction)
-      case('read','r')  !< Open an existing file.
-        inquire(file=filename, exist=exists)
-        if (.not.exists) then
-          write(stderr,*) 'ERROR: ' // filename // ' does not exist.'
-          ierr = -1
-          return
-        endif
-        call h5fopen_f(filename,H5F_ACC_RDONLY_F,self%lid,ierr)
-      case('write','readwrite','w','rw', 'r+', 'append', 'a')
-        inquire(file=filename, exist=exists)
-        if(lstatus == 'unknown' .and. .not.exists) then
-          call h5fcreate_f(filename, H5F_ACC_TRUNC_F, self%lid, ierr)
-          if (check(ierr, 'ERROR: ' // filename // ' could not be created')) return
-        else
-          call h5fopen_f(filename, H5F_ACC_RDWR_F, self%lid, ierr)
-          if (check(ierr, 'ERROR: ' // filename // ' could not be opened in read/write')) return
-        endif
-      case default
-        write(stderr,*) 'Unsupported action -> ' // laction
-        ierr = 128
-      endselect
-  case('new','replace')
-    call h5fcreate_f(filename, H5F_ACC_TRUNC_F, self%lid, ierr)
-    if (check(ierr, 'ERROR: ' // filename // ' could not be created')) return
-  case default
-    write(stderr,*) 'Unsupported status -> '// lstatus
-    ierr = 128
+case ('old', 'unknown')
+  select case(laction)
+    case('read','r')  !< Open an existing file.
+      inquire(file=filename, exist=exists)
+      if (.not.exists) then
+        write(stderr,*) 'ERROR: ' // filename // ' does not exist.'
+        ierr = -1
+        return
+      endif
+      call h5fopen_f(filename,H5F_ACC_RDONLY_F,self%lid,ierr)
+    case('write','readwrite','w','rw', 'r+', 'append', 'a')
+      inquire(file=filename, exist=exists)
+      if(lstatus == 'unknown' .and. .not.exists) then
+        call h5fcreate_f(filename, H5F_ACC_TRUNC_F, self%lid, ierr)
+        if (check(ierr, 'ERROR: ' // filename // ' could not be created')) return
+      else
+        call h5fopen_f(filename, H5F_ACC_RDWR_F, self%lid, ierr)
+        if (check(ierr, 'ERROR: ' // filename // ' could not be opened in read/write')) return
+      endif
+    case default
+      write(stderr,*) 'Unsupported action -> ' // laction
+      ierr = 128
+    endselect
+case('new','replace')
+  call h5fcreate_f(filename, H5F_ACC_TRUNC_F, self%lid, ierr)
+  if (check(ierr, 'ERROR: ' // filename // ' could not be created')) return
+case default
+  write(stderr,*) 'Unsupported status -> '// lstatus
+  ierr = 128
 endselect
 
-
 end subroutine hdf_initialize
 
 

src/meson.build

@@ -1,4 +1,4 @@
-hdf5_src = files('hdf5_interface.f90',
+hdf5_src = files('interface.f90',
   'read.f90', 'reader.f90',
   'write.f90', 'writer.f90',
   'string_utils.f90')

src/read.f90

@@ -1,6 +1,5 @@
-!! This submodule is for reading HDF5, via child submodules
 submodule (h5fortran) read
-
+!! This submodule is for reading HDF5 via submodules
 use hdf5, only : h5dopen_f, h5dread_f, h5dclose_f, h5dget_create_plist_f, &
   h5pget_layout_f, H5D_CONTIGUOUS_F, H5D_CHUNKED_F
 use H5LT, only : h5ltget_dataset_info_f, &

src/write.f90

@@ -1,6 +1,5 @@
-!! This submodule is for writing HDF5 data via child submodules
 submodule (h5fortran) write
-
+!! This submodule is for writing HDF5 data via child submodules
 use hdf5, only: &
 h5screate_f, h5sclose_f, h5screate_simple_f, H5S_SCALAR_F, &
 h5dopen_f, h5dcreate_f, h5dwrite_f, h5dclose_f, &

src/writer.f90

@@ -1,5 +1,5 @@
-!! This submodule is for writing 0-D..7-D data
 submodule (h5fortran:write) writer
+!! This submodule is for writing 0-D..7-D data
 
 use hdf5, only: H5_REAL_KIND, H5_INTEGER_KIND, H5S_SCALAR_F, H5KIND_TO_TYPE
 implicit none