Merge pull request #191 from EXP-code/copilot/sub-pr-183-another-one

Only apply HDF5 shuffle filter when compression is enabled

Author: The9Cat

expui/BiorthBasis.cc

@@ -5170,8 +5170,7 @@ namespace BasisClasses
     if (H5compress > 0) {
       unsigned int csz = sampleCounts.size();
       dcpl1.add(HighFive::Chunking({csz, 1}));
-      // Only apply shuffle filter when Deflate compression is enabled (guaranteed by outer if)
-      if (H5shuffle) dcpl1.add(HighFive::Shuffle());
+      if (H5shuffle && H5compress > 0) dcpl1.add(HighFive::Shuffle());
       dcpl1.add(HighFive::Deflate(H5compress));
     }
 
@@ -5220,8 +5219,7 @@ namespace BasisClasses
       HighFive::Chunking data_dims2{std::min<unsigned>(csz2, H5chunk), 1};
 
       dcpl2.add(data_dims2);
-      // Only apply shuffle filter when compression is enabled (guaranteed by outer if)
-      if (H5shuffle) dcpl2.add(HighFive::Shuffle());
+      if (H5shuffle && (H5compress > 0 || H5szip)) dcpl2.add(HighFive::Shuffle());
       if (H5szip) {
 	dcpl2.add(HighFive::Szip(options_mask, pixels_per_block));
       } else {
@@ -5234,8 +5232,7 @@ namespace BasisClasses
       HighFive::Chunking data_dims3{std::min<unsigned>(csz3, H5chunk), 1};
 
       dcpl3.add(data_dims3);
-      // Only apply shuffle filter when compression is enabled (guaranteed by outer if)
-      if (H5shuffle) dcpl3.add(HighFive::Shuffle());
+      if (H5shuffle && (H5compress > 0 || H5szip)) dcpl3.add(HighFive::Shuffle());
       if (H5szip) {
 	dcpl3.add(HighFive::Szip(options_mask, pixels_per_block));
       } else {

exputil/EmpCylSL.cc

@@ -7385,8 +7385,7 @@ void EmpCylSL::WriteH5Cache()
       // Chunking
       unsigned long nx = NUMX + 1, ny = NUMY + 1;
       dcpl.add(HighFive::Chunking({nx, ny}));
-      // Only apply shuffle filter when compression is enabled (guaranteed by outer if)
-      if (H5shuffle) dcpl.add(HighFive::Shuffle());
+      if (H5shuffle && (H5compress > 0 || H5szip)) dcpl.add(HighFive::Shuffle());
       if (H5szip) {
         const int options_mask = H5_SZIP_NN_OPTION_MASK;
         const int pixels_per_block = 8;

src/Component.cc

@@ -2510,21 +2510,21 @@ void Component::write_HDF5(HighFive::Group& group, bool masses, bool IDs)
     }
 
     dcpl1.add(HighFive::Chunking(chunk));
-    if (H5shuffle) dcpl1.add(HighFive::Shuffle());
+    if (H5shuffle && H5compress > 0) dcpl1.add(HighFive::Shuffle());
     dcpl1.add(HighFive::Deflate(H5compress));
 
     dcpl3.add(HighFive::Chunking(chunk, 3));
-    if (H5shuffle) dcpl3.add(HighFive::Shuffle());
+    if (H5shuffle && H5compress > 0) dcpl3.add(HighFive::Shuffle());
     dcpl3.add(HighFive::Deflate(H5compress));
 
     if (niattrib) {
       dcplI.add(HighFive::Chunking(chunk, niattrib));
-      if (H5shuffle) dcplI.add(HighFive::Shuffle());
+      if (H5shuffle && H5compress > 0) dcplI.add(HighFive::Shuffle());
       dcplI.add(HighFive::Deflate(H5compress));
     }
     if (ndattrib) {
       dcplD.add(HighFive::Chunking(chunk, ndattrib));
-      if (H5shuffle) dcplD.add(HighFive::Shuffle());
+      if (H5shuffle && H5compress > 0) dcplD.add(HighFive::Shuffle());
       dcplD.add(HighFive::Deflate(H5compress));
     }
   }
@@ -2652,7 +2652,7 @@ void Component::write_H5(H5::Group& group)
       if (H5compress) dcpl.setDeflate(H5compress);
 
       // Enable shuffle filter
-      if (H5shuffle) dcpl.setShuffle();
+      if (H5shuffle && H5compress > 0) dcpl.setShuffle();
     }
 
     // Create dataspace