Further fixes

Author: franzpoeschel

include/openPMD/Iteration.hpp

@@ -461,9 +461,6 @@ class IndexedIteration : public Iteration
     {}
 };
 
-inline void breakpoint()
-{}
-
 namespace traits
 {
     template <>
@@ -473,9 +470,14 @@ namespace traits
         template <typename T, typename Container>
         void operator()(T &ret, Container *c)
         {
-            breakpoint();
             if (ret.IOHandler()->m_encoding == IterationEncoding::variableBased)
             {
+                for (auto &pair :
+                     static_cast<Attributable &>(ret).get().m_attributes)
+                {
+                    static_cast<Attributable &>(*c).get().m_attributes.emplace(
+                        std::move(pair));
+                }
                 static_cast<
                     std::shared_ptr<internal::SharedAttributableData> &>(
                     *ret.m_attri) =

src/Iteration.cpp

@@ -293,13 +293,7 @@ void Iteration::flushGroupBased(
 void Iteration::flushVariableBased(
     IterationIndex_t i, internal::FlushParams const &flushParams)
 {
-    if (!written())
-    {
-        /* create iteration path */
-        Parameter<Operation::OPEN_PATH> pOpen;
-        pOpen.path = "";
-        IOHandler()->enqueue(IOTask(this, pOpen));
-    }
+    setDirty(true);
 
     switch (flushParams.flushLevel)
     {
@@ -312,12 +306,8 @@ void Iteration::flushVariableBased(
         break;
     }
 
-    if (!written())
+    // @todo maybe dont repeat this upon each invocation
     {
-        /* create iteration path */
-        Parameter<Operation::OPEN_PATH> pOpen;
-        pOpen.path = "";
-        IOHandler()->enqueue(IOTask(this, pOpen));
         /*
          * In v-based encoding, the snapshot attribute must always be written.
          * Reason: Even in backends that don't support changing attributes,

src/Series.cpp

@@ -1500,8 +1500,6 @@ void Series::flushGorVBased(
         series.iterations.flush(
             auxiliary::replace_first(basePath(), "%T/", ""), flushParams);
 
-        debug::printDirty(*this);
-
         for (auto it = begin; it != end; ++it)
         {
             // Phase 1
@@ -2417,7 +2415,7 @@ Series::iterations_iterator Series::indexOf(Iteration const &iteration)
     for (auto it = series.iterations.begin(); it != series.iterations.end();
          ++it)
     {
-        if (it->second.m_attri->get() == iteration.m_attri->get())
+        if (it->second.m_attri.get() == iteration.m_attri.get())
         {
             return it;
         }