Skip to content

Commit 3a00121

Browse files
committed
get_deflate: work with mpi
1 parent 73d2155 commit 3a00121

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

src/read/read.f90

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@
5555

5656
get_deflate = .false.
5757

58-
if(self%use_mpi) error stop "ERROR:h5fortran:get_deflate: must not have mpi=.true. => %open(mpi=.false.) to use %deflate()"
59-
6058
Naux = size(Aux, kind=SIZE_T)
6159

6260
call h5dopen_f(self%file_id, dname, dset_id, ierr)
@@ -87,10 +85,9 @@
8785
if(j>0) print *, "TRACE:get_filter: filter name: ", filter_name(:j-1)
8886
endif
8987

90-
if (filter_id == H5Z_FILTER_DEFLATE_F) then
91-
get_deflate = .true.
92-
exit filters
93-
end if
88+
get_deflate = filter_id == H5Z_FILTER_DEFLATE_F
89+
if(get_deflate) exit filters
90+
9491
end do filters
9592

9693
call h5pclose_f(dcpl, ierr)

src/tests/unit/test_deflate_props.f90

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,8 @@ program test_deflate_props
2727
call test_read_deflate_props(fn1, N, mpi_id)
2828
if(mpi_id==0) print *,'OK: HDF5 read deflate properties'
2929

30-
if(mpi_id==0) then
31-
call test_get_deflate(fn1)
32-
!! only works with mpi=.false. else get h5fclose error
33-
print *, 'OK: HDF5 get deflate'
34-
endif
30+
call test_get_deflate(fn1)
31+
if (ierr /= 0) print *, 'OK: HDF5 get deflate'
3532

3633
call mpi_finalize(ierr)
3734
if (ierr /= 0) error stop "mpi_finalize"
@@ -88,7 +85,7 @@ subroutine test_get_deflate(fn)
8885

8986
type(hdf5_file) :: h5f
9087

91-
call h5f%open(fn, action='r', mpi=.false.)
88+
call h5f%open(fn, action='r', mpi=.true.)
9289

9390
if (h5f%parallel_compression) then
9491
if (.not. h5f%deflate("/A")) error stop "test_get_deflate: expected deflate MPI"

0 commit comments

Comments
 (0)