ADIOS2: Use YYYYMMDD schema tag

Also fix a bug in Parallel IO tests that I noticed

Author: franzpoeschel

.github/workflows/unix.yml

@@ -99,7 +99,7 @@ jobs:
         ../share/openPMD/download_samples.sh && chmod u-w samples/git-sample/*.h5
         cmake -S .. -B . -DopenPMD_USE_PYTHON=OFF -DopenPMD_USE_MPI=ON -DopenPMD_USE_HDF5=ON -DopenPMD_USE_ADIOS1=OFF -DopenPMD_USE_ADIOS2=ON -DopenPMD_USE_INVASIVE_TESTS=ON
         cmake --build . --parallel 2
-        export OPENPMD_NEW_ATTRIBUTE_LAYOUT=1
+        export OPENPMD2_ADIOS2_SCHEMA=20210209
         ctest --output-on-failure
 
 # TODO

include/openPMD/IO/ADIOS/ADIOS2IOHandler.hpp

@@ -80,6 +80,20 @@ namespace detail
 } // namespace detail
 
 
+namespace ADIOS2Schema
+{
+    using schema_t = uint64_t;
+    /*
+     * Original ADIOS schema.
+     */
+    constexpr schema_t schema_0000_00_00 = 00000000;
+    /*
+     * This introduces attribute layout via scalar ADIOS variables.
+     */
+    constexpr schema_t schema_2021_02_09 = 20210209;
+}
+
+
 class ADIOS2IOHandlerImpl
 : public AbstractIOHandlerImplCommon< ADIOS2FilePosition >
 {
@@ -203,14 +217,20 @@ class ADIOS2IOHandlerImpl
      * The ADIOS2 engine type, to be passed to adios2::IO::SetEngine
      */
     std::string m_engineType;
+    ADIOS2Schema::schema_t m_schema = ADIOS2Schema::schema_0000_00_00;
 
     enum class AttributeLayout : char
     {
         ByAdiosAttributes,
         ByAdiosVariables
     };
 
-    AttributeLayout m_attributeLayout = AttributeLayout::ByAdiosAttributes;
+    inline AttributeLayout attributeLayout() const
+    {
+        return m_schema < ADIOS2Schema::schema_2021_02_09
+            ? AttributeLayout::ByAdiosAttributes
+            : AttributeLayout::ByAdiosVariables;
+    }
 
     struct ParameterizedOperator
     {
@@ -357,15 +377,12 @@ namespace ADIOS2Defaults
     constexpr const_str str_params = "parameters";
     constexpr const_str str_usesteps = "usesteps";
     constexpr const_str str_usesstepsAttribute = "__openPMD_internal/useSteps";
-    /*
-     * 0: pre 2021-02-09
-     * 1:     2021-02-09
-     */
-    constexpr const_str str_layoutVersion = "__openPMD_internal/layoutVersion";
-    } // namespace ADIOS2Defaults
+    constexpr const_str str_adios2Schema =
+        "__openPMD_internal/openPMD2_adios2_schema";
+} // namespace ADIOS2Defaults
 
-    namespace detail
-    {
+namespace detail
+{
     // Helper structs for calls to the switchType function
 
     struct DatasetReader
@@ -1090,8 +1107,7 @@ namespace ADIOS2Defaults
         detail::DatasetReader const m_readDataset;
         detail::AttributeReader const m_attributeReader;
         PreloadAdiosAttributes preloadAttributes;
-        using AttributeLayout = ADIOS2IOHandlerImpl::AttributeLayout;
-        AttributeLayout & m_attributeLayout;
+        ADIOS2Schema::schema_t & m_schema;
         IterationEncoding & m_iterationEncoding;
 
         /*
@@ -1308,16 +1324,12 @@ namespace ADIOS2Defaults
 
         void configure_IO( ADIOS2IOHandlerImpl & impl );
 
-        uint32_t layoutVersion() const
+        using AttributeLayout = ADIOS2IOHandlerImpl::AttributeLayout;
+        inline AttributeLayout attributeLayout() const
         {
-            switch( m_attributeLayout )
-            {
-            case AttributeLayout::ByAdiosAttributes:
-                return 0;
-            case AttributeLayout::ByAdiosVariables:
-                return 1;
-            }
-            throw std::runtime_error( "Unreachable!" );
+            return m_schema < ADIOS2Schema::schema_2021_02_09
+                ? AttributeLayout::ByAdiosAttributes
+                : AttributeLayout::ByAdiosVariables;
         }
     };