Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions src/Component.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2504,10 +2504,12 @@ void Component::write_HDF5(HighFive::Group& group, bool masses, bool IDs)
if (H5compress or H5chunk) {
int chunk = H5chunk;

// Sanity
if (H5chunk >= nbodies and nbodies >= 8) {
// Clamp chunk to [1, nbodies]: use nbodies/8 as a downsize when
// H5chunk would exceed the dataset extent, then ensure at least 1
if (H5chunk >= nbodies) {
chunk = nbodies/8;
}
chunk = std::max(1, std::min(chunk, nbodies));

dcpl1.add(HighFive::Chunking(chunk));
if (H5shuffle) dcpl1.add(HighFive::Shuffle());
Expand Down Expand Up @@ -2639,18 +2641,13 @@ void Component::write_H5(H5::Group& group)
if (H5compress or H5chunk) {
// Set chunking
if (H5chunk) {
// Sanity
// Clamp chunk to [1, nbodies]: use nbodies/8 as a downsize when
// H5chunk would exceed the dataset extent, then ensure at least 1
int chunk = H5chunk;
if (H5chunk >= nbodies and nbodies >= 8) {
if (H5chunk >= nbodies) {
chunk = nbodies/8;
}
// Ensure chunk size is valid for the dataspace: 1 <= chunk <= nbodies
if (chunk > nbodies) {
chunk = nbodies;
}
if (chunk < 1) {
chunk = 1;
}
chunk = std::max(1, std::min(chunk, nbodies));
hsize_t chunk_dims[1] = {static_cast<hsize_t>(chunk)};
dcpl.setChunk(1, chunk_dims);
}
Expand Down