Merge iteration group with Container<iteration> group

Author: franzpoeschel

src/IO/ADIOS/ADIOS2IOHandler.cpp

@@ -475,7 +475,9 @@ void ADIOS2IOHandlerImpl::openPath(
     std::string prefix =
         filePositionToString( setAndGetFilePosition( writable->parent ) );
     std::string suffix = auxiliary::removeSlashes( parameters.path );
-    std::string infix = auxiliary::ends_with( prefix, '/' ) ? "" : "/";
+    std::string infix = suffix.empty() || auxiliary::ends_with( prefix, '/' ) 
+        ? ""
+        : "/";
 
     /* ADIOS has no concept for explicitly creating paths.
      * They are implicitly created with the paths of variables/attributes. */

src/Iteration.cpp

@@ -261,9 +261,9 @@ Iteration::flushStepBased()
     if( !written() )
     {
         /* create iteration path */
-        Parameter< Operation::CREATE_PATH > pCreate;
-        pCreate.path = "currentIteration";
-        IOHandler->enqueue( IOTask( this, pCreate ) );
+        Parameter< Operation::OPEN_PATH > pOpen;
+        pOpen.path = "";
+        IOHandler->enqueue( IOTask( this, pOpen ) );
     }
 
     flush();

src/Series.cpp

@@ -1061,7 +1061,7 @@ Series::read()
             IOHandler->flush();
             uint64_t index = Attribute( *aRead.resource ).get< uint64_t >();
             Iteration & i = iterations[ index ];
-            pOpen.path = "currentIteration";
+            pOpen.path = "";
             IOHandler->enqueue( IOTask( &i, pOpen ) );
             i.read();
         }
@@ -1187,7 +1187,7 @@ Series::openIteration( uint64_t index, Iteration iteration )
     IOHandler->enqueue( IOTask( &iterations, pOpen ) );
     /* open iteration path */
     pOpen.path = *m_iterationEncoding == IterationEncoding::stepBased
-        ? "currentIteration"
+        ? ""
         : std::to_string( index );
     IOHandler->enqueue( IOTask( &iteration, pOpen ) );
     switch( *iteration.m_closed )