more handle closes

Author: scivision

src/read/reader.in.f90

@@ -92,6 +92,9 @@
 call h5dclose_f(dset_id, ier)
 if(ier /= 0) error stop "ERROR:h5fortran:reader: closing dataset: " // dname // " in " // self%filename
 
+if(self%use_mpi) call h5pclose_f(xfer_id, ier)
+if(ier /= 0) error stop "ERROR:h5fortran:writer closing property: " // dname // " in " // self%filename
+
 end procedure h5read_scalar
 
 

src/read/reader_template.f90

@@ -51,5 +51,5 @@
 if(file_space_id /= H5S_ALL_F) call h5sclose_f(file_space_id, ier)
 if(ier /= 0) error stop "ERROR:h5fortran:reader closing file dataspace: " // dname // " in " // self%filename
 
-call h5pclose_f(xfer_id, ier)
+if(self%use_mpi) call h5pclose_f(xfer_id, ier)
 if(ier /= 0) error stop "ERROR:h5fortran:reader closing property: " // dname // " in " // self%filename

src/write/write.f90

@@ -98,17 +98,17 @@
 end procedure hdf_create
 
 
-subroutine set_deflate(self, dims, plist_id, chunk_size)
+subroutine set_deflate(self, dims, dcpl, chunk_size)
 class(hdf5_file), intent(inout) :: self
 integer(HSIZE_T), intent(in) :: dims(:)
-integer(HID_T), intent(out) :: plist_id
+integer(HID_T), intent(out) :: dcpl
 integer, intent(in), optional :: chunk_size(:)
 
 integer(HSIZE_T) :: cs(size(dims))
 integer :: ierr
 
 
-plist_id = H5P_DEFAULT_F
+dcpl = H5P_DEFAULT_F
 
 if (present(chunk_size)) then
   cs = chunk_size
@@ -127,18 +127,18 @@ subroutine set_deflate(self, dims, plist_id, chunk_size)
 if(any(cs == 0)) return  !< array too small to chunk
 if(any(cs < 0)) error stop "ERROR:h5fortran:set_deflate: chunk_size must be strictly positive"
 
-call h5pcreate_f(H5P_DATASET_CREATE_F, plist_id, ierr)
+call h5pcreate_f(H5P_DATASET_CREATE_F, dcpl, ierr)
 if (ierr/=0) error stop "ERROR:h5fortran:set_deflate:h5pcreate: " // self%filename
 
-call h5pset_chunk_f(plist_id, size(dims), cs, ierr)
+call h5pset_chunk_f(dcpl, size(dims), cs, ierr)
 if (ierr/=0) error stop "ERROR:h5fortran:set_deflate:h5pset_chunk: " // self%filename
 
 if (self%fletcher32) then
   !! fletcher32 filter adds a checksum to the data
   if (self%use_mpi .and. .not. self%parallel_compression) then
     write(stderr, '(a)') 'WARNING: h5fortran:set_deflate: fletcher32 parallel filter not supported ' // self%filename
   else
-    call h5pset_fletcher32_f(plist_id, ierr)
+    call h5pset_fletcher32_f(dcpl, ierr)
     if (ierr/=0) error stop "ERROR:h5fortran:set_deflate:h5pset_fletcher32: " // self%filename
   endif
 endif
@@ -155,12 +155,12 @@ subroutine set_deflate(self, dims, plist_id, chunk_size)
   if (self%use_mpi .and. .not. self%parallel_compression) then
     write(stderr, '(a)') 'WARNING: h5fortran:set_deflate: shuffle parallel filter not supported ' // self%filename
   else
-    call h5pset_shuffle_f(plist_id, ierr)
+    call h5pset_shuffle_f(dcpl, ierr)
     if (ierr/=0) error stop "ERROR:h5fortran:set_deflate:h5pset_shuffle: " // self%filename
   endif
 endif
 
-call h5pset_deflate_f(plist_id, self%comp_lvl, ierr)
+call h5pset_deflate_f(dcpl, self%comp_lvl, ierr)
 if (ierr/=0) error stop "ERROR:h5fortran:set_deflate:h5pset_deflate: " // self%filename
 
 if(self%debug) print '(a,i0)','TRACE:set_deflate done, comp_lvl: ', self%comp_lvl

src/write/writer.in.f90

@@ -59,6 +59,15 @@
 call h5dclose_f(dset_id, ier)
 if(ier /= 0) error stop "ERROR:h5fortran:writer: closing dataset: " // dname // " in " // self%filename
 
+if(mem_space_id /= H5S_ALL_F) call h5sclose_f(mem_space_id, ier)
+if(ier /= 0) error stop "ERROR:h5fortran:writer closing memory dataspace: " // dname // " in " // self%filename
+
+if(file_space_id /= H5S_ALL_F) call h5sclose_f(file_space_id, ier)
+if(ier /= 0) error stop "ERROR:h5fortran:writer closing file dataspace: " // dname // " in " // self%filename
+
+if(self%use_mpi) call h5pclose_f(xfer_id, ier)
+if(ier /= 0) error stop "ERROR:h5fortran:writer closing property: " // dname // " in " // self%filename
+
 end procedure h5write_scalar
 
 module procedure ph5write_1d

src/write/writer_template.f90

@@ -68,5 +68,5 @@
 if(file_space_id /= H5S_ALL_F) call h5sclose_f(file_space_id, ier)
 if(ier /= 0) error stop "ERROR:h5fortran:writer closing file dataspace: " // dname // " in " // self%filename
 
-call h5pclose_f(xfer_id, ier)
+if(self%use_mpi) call h5pclose_f(xfer_id, ier)
 if(ier /= 0) error stop "ERROR:h5fortran:writer closing property: " // dname // " in " // self%filename