Merge pull request #3201 from JasonRuonanWang/struct

added allowReorganize for InquireStructVariable
ornladios · May 4, 2022 · 04918d7 · 04918d7
2 parents ad39c37 + 2cff680
commit 04918d7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/source/adios2/core/IO.cpp b/source/adios2/core/IO.cpp
@@ -930,7 +930,8 @@ VariableStruct *IO::InquireStructVariable(const std::string &name) noexcept
 }
 
 VariableStruct *IO::InquireStructVariable(const std::string &name,
-                                          const StructDefinition &def) noexcept
+                                          const StructDefinition &def,
+                                          const bool allowReorganize) noexcept
 {
     auto ret = InquireStructVariable(name);
     if (ret == nullptr)
@@ -949,7 +950,8 @@ VariableStruct *IO::InquireStructVariable(const std::string &name,
         {
             return nullptr;
         }
-        if (ret->m_StructDefinition.Offset(i) != def.Offset(i))
+        if (ret->m_StructDefinition.Offset(i) != def.Offset(i) &&
+            !allowReorganize)
         {
             return nullptr;
         }

diff --git a/source/adios2/core/IO.h b/source/adios2/core/IO.h
@@ -282,8 +282,9 @@ class IO
 
     VariableStruct *InquireStructVariable(const std::string &name) noexcept;
 
-    VariableStruct *InquireStructVariable(const std::string &name,
-                                          const StructDefinition &def) noexcept;
+    VariableStruct *
+    InquireStructVariable(const std::string &name, const StructDefinition &def,
+                          const bool allowReorganize = false) noexcept;
 
     /**
      * @brief Returns the type of an existing variable as an string