Directly reset memory selection after applying

openPMD · May 22, 2024 · edb6d5e · edb6d5e
1 parent c833209
commit edb6d5e
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 22 deletions.
diff --git a/include/openPMD/IO/ADIOS/ADIOS2IOHandler.hpp b/include/openPMD/IO/ADIOS/ADIOS2IOHandler.hpp
@@ -492,28 +492,6 @@ class ADIOS2IOHandlerImpl
                  adios2::Dims(
                      memorySelection->extent.begin(),
                      memorySelection->extent.end())});
-            if constexpr (!CanTheMemorySelectionBeReset)
-            {
-                if (!printedWarningsAlready.memorySelection)
-                {
-                    std::cerr
-                        << "[Warning] Using a version of ADIOS2 that cannot "
-                           "reset memory selections on a variable, once "
-                           "specified. When using memory selections, then "
-                           "please specify it explicitly on all storeChunk() "
-                           "calls. Further info: "
-                           "https://github.com/ornladios/ADIOS2/pull/4169."
-                        << std::endl;
-                    printedWarningsAlready.memorySelection = true;
-                }
-            }
-        }
-        else
-        {
-            if constexpr (CanTheMemorySelectionBeReset)
-            {
-                var.SetMemorySelection();
-            }
         }
 
         return var;

diff --git a/src/IO/ADIOS/ADIOS2File.cpp b/src/IO/ADIOS/ADIOS2File.cpp
@@ -22,6 +22,7 @@
 #include "openPMD/IO/ADIOS/ADIOS2File.hpp"
 #include "openPMD/Error.hpp"
 #include "openPMD/IO/ADIOS/ADIOS2IOHandler.hpp"
+#include "openPMD/IO/ADIOS/macros.hpp"
 #include "openPMD/auxiliary/Environment.hpp"
 #include <optional>
 
@@ -71,6 +72,12 @@ void DatasetReader::call(
 template <class>
 inline constexpr bool always_false_v = false;
 
+static constexpr char const *warningMemorySelection =
+    "[Warning] Using a version of ADIOS2 that cannot reset memory selections "
+    "on a variable, once specified. When using memory selections, then please "
+    "specify it explicitly on all storeChunk() calls. Further info: "
+    "https://github.com/ornladios/ADIOS2/pull/4169.";
+
 template <typename T>
 void WriteDataset::call(ADIOS2File &ba, detail::BufferedPut &bp)
 {
@@ -93,6 +100,19 @@ void WriteDataset::call(ADIOS2File &ba, detail::BufferedPut &bp)
                     bp.name);
 
                 ba.getEngine().Put(var, ptr);
+                if (bp.param.memorySelection.has_value())
+                {
+                    if constexpr (CanTheMemorySelectionBeReset)
+                    {
+                        var.SetMemorySelection();
+                    }
+                    else if (!ba.m_impl->printedWarningsAlready.memorySelection)
+                    {
+                        std::cerr << warningMemorySelection << std::endl;
+                        ba.m_impl->printedWarningsAlready.memorySelection =
+                            true;
+                    }
+                }
             }
             else if constexpr (std::is_same_v<
                                    ptr_type,
@@ -155,6 +175,18 @@ struct RunUniquePtrPut
             ba.m_IO,
             bufferedPut.name);
         ba.getEngine().Put(var, ptr);
+        if (bufferedPut.memorySelection.has_value())
+        {
+            if constexpr (CanTheMemorySelectionBeReset)
+            {
+                var.SetMemorySelection();
+            }
+            else if (!ba.m_impl->printedWarningsAlready.memorySelection)
+            {
+                std::cerr << warningMemorySelection << std::endl;
+                ba.m_impl->printedWarningsAlready.memorySelection = true;
+            }
+        }
     }
 
     static constexpr char const *errorMsg = "RunUniquePtrPut";