Skip to content

Commit 71b2a2f

Browse files
committed
comment debug statements, add fletcher32
1 parent bebf066 commit 71b2a2f

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ if(NOT CMAKE_BUILD_TYPE)
44
endif()
55
project(h5fortran
66
LANGUAGES C Fortran
7-
VERSION 2.8.1
7+
VERSION 2.8.2
88
DESCRIPTION "thin, light, easy HDF5 Fortran interface"
99
HOMEPAGE_URL https://github.com/scivision/h5fortran)
1010
enable_testing()

cmake/hdf5.cmake

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,6 @@ set(HDF5_USE_STATIC_LIBRARIES true)
55
if(WIN32 AND CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
66
set(HDF5_NO_FIND_PACKAGE_CONFIG_FILE true)
77
set(HDF5_USE_STATIC_LIBRARIES false)
8-
9-
if(NOT HDF5_ROOT)
10-
# help CMake find binary HDF5
11-
file(GLOB _h5guess "c:/Program Files/HDF_Group/HDF5/1.1*/")
12-
if(EXISTS ${_h5guess})
13-
set(HDF5_ROOT ${_h5guess})
14-
endif()
15-
endif()
168
endif()
179

1810
find_package(HDF5 COMPONENTS Fortran HL)

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project('h5fortran', 'fortran',
22
meson_version : '>=0.52.0',
3-
version : '2.8.1',
3+
version : '2.8.2',
44
default_options : ['default_library=static', 'buildtype=release', 'warning_level=3'])
55

66
subdir('meson')

src/write.f90

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use hdf5, only: &
44
h5screate_f, H5S_SCALAR_F, &
55
h5dcreate_f, &
6-
h5pset_chunk_f, h5pset_deflate_f, h5pset_shuffle_f, h5pcreate_f, H5P_DATASET_CREATE_F, h5pclose_f, &
6+
h5pset_chunk_f, h5pset_deflate_f, h5pset_shuffle_f, h5pset_fletcher32_f, h5pcreate_f, H5P_DATASET_CREATE_F, h5pclose_f, &
77
h5gopen_f, h5gclose_f
88

99
use H5LT, only: h5ltpath_valid_f, h5ltset_attribute_string_f, h5ltmake_dataset_string_f
@@ -125,6 +125,9 @@ subroutine hdf_set_deflate(self, dims, pid, ierr, chunk_size)
125125
call h5pset_shuffle_f(pid, ierr)
126126
if (check(ierr, 'ERROR: enable Shuffle ' // self%filename)) return
127127

128+
call h5pset_fletcher32_f(pid, ierr)
129+
if (check(ierr, 'ERROR: enable Fletcher32 checksum ' // self%filename)) return
130+
128131
call h5pset_deflate_f(pid, self%comp_lvl, ierr)
129132
if (check(ierr, 'ERROR: enable Deflate compression ' // self%filename)) return
130133

@@ -158,7 +161,8 @@ subroutine guess_chunk_size(dims, chunk_size)
158161
dset_size = product(chunk_size) * TYPESIZE
159162
target_size = int(CHUNK_BASE * (2**log10(real(dset_size) / 1e6)), hsize_t)
160163
if (target_size > CHUNK_MAX) target_size = CHUNK_MAX
161-
print *,'target_size [bytes]: ',target_size
164+
165+
! print *,'target_size [bytes]: ',target_size
162166

163167
i = 0
164168
do

0 commit comments

Comments
 (0)