Test and fixes for READ_LINEAR mode

openPMD · Jun 12, 2024 · 668e0e5 · 668e0e5
1 parent 18fc184
commit 668e0e5
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 8 deletions.
diff --git a/include/openPMD/IO/AbstractIOHandler.hpp b/include/openPMD/IO/AbstractIOHandler.hpp
@@ -195,13 +195,28 @@ class AbstractIOHandler
     {
         /*
          * In file-based iteration encoding, the APPEND mode is handled entirely
-         * by the frontend, the backend should just treat it as CREATE mode
+         * by the frontend, the backend should just treat it as CREATE mode.
+         * Similar for READ_LINEAR which should be treated as READ_RANDOM_ACCESS
+         * in the backend.
          */
-        if (encoding == IterationEncoding::fileBased &&
-            m_backendAccess == Access::APPEND)
+        if (encoding == IterationEncoding::fileBased)
         {
-            // do we really want to have those as const members..?
-            *const_cast<Access *>(&m_backendAccess) = Access::CREATE;
+            switch (m_backendAccess)
+            {
+
+            case Access::READ_LINEAR:
+                // do we really want to have those as const members..?
+                *const_cast<Access *>(&m_backendAccess) =
+                    Access::READ_RANDOM_ACCESS;
+                break;
+            case Access::APPEND:
+                *const_cast<Access *>(&m_backendAccess) = Access::CREATE;
+                break;
+            case Access::READ_RANDOM_ACCESS:
+            case Access::READ_WRITE:
+            case Access::CREATE:
+                break;
+            }
         }
 
         m_encoding = encoding;

diff --git a/src/Series.cpp b/src/Series.cpp
@@ -1548,6 +1548,13 @@ void Series::readFileBased()
     Parameter<Operation::OPEN_FILE> fOpen;
     Parameter<Operation::READ_ATT> aRead;
 
+    // Tell the backend that we are parsing file-based iteration encoding.
+    // This especially means that READ_RANDOM_ACCESS will be used instead of
+    // READ_LINEAR, as READ_LINEAR is implemented in the frontend for file-based
+    // encoding. Don't set the iteration encoding in the frontend yet, will be
+    // set after reading the iteration encoding attribute from the opened file.
+    IOHandler()->setIterationEncoding(IterationEncoding::fileBased);
+
     if (!auxiliary::directory_exists(IOHandler()->directory))
         throw error::ReadError(
             error::AffectedObject::File,

diff --git a/test/SerialIOTest.cpp b/test/SerialIOTest.cpp
@@ -4461,9 +4461,7 @@ TEST_CASE("adios2_flush_via_step")
 #if openPMD_HAS_ADIOS_2_10_1
     for (auto access : {Access::READ_RANDOM_ACCESS, Access::READ_LINEAR})
     {
-        Series read(
-            "../samples/adios2_flush_via_step/simData_%T.bp5",
-            Access::READ_RANDOM_ACCESS);
+        Series read("../samples/adios2_flush_via_step/simData_%T.%E", access);
         std::vector<float> load_data(100);
         data.resize(100);
         for (auto iteration : read.readIterations())