Clean up Iteration finalizing logic

Author: franzpoeschel

include/openPMD/Mesh.hpp

@@ -45,7 +45,8 @@ class Mesh
 {
     friend class Container<Mesh>;
     friend class Iteration;
-    friend class internal::ScientificDefaults<Mesh>;
+    template <typename>
+    friend class internal::ScientificDefaults;
 
 public:
     Mesh(Mesh const &) = default;

include/openPMD/ParticleSpecies.hpp

@@ -40,7 +40,8 @@ class ParticleSpecies
     friend class Iteration;
     template <typename T>
     friend T &internal::makeOwning(T &self, Series);
-    friend class internal::ScientificDefaults<ParticleSpecies>;
+    template <typename>
+    friend class internal::ScientificDefaults;
 
 public:
     ParticlePatches particlePatches;

src/Iteration.cpp

@@ -113,20 +113,12 @@ Iteration &Iteration::close(bool _flush)
         // yet keeps it re-openable)
         break;
     }
+
     {
         Access at = IOHandler()->m_frontendAccess;
         finalize(at);
-        for (auto &[_, mesh] : meshes)
-        {
-            (void)_;
-            mesh.internal::ScientificDefaults<Mesh>::finalize(at);
-        }
-        for (auto &[_, ps] : particles)
-        {
-            (void)_;
-            ps.finalize(at);
-        }
     }
+
     if (_flush)
     {
         if (flag == StepStatus::DuringStep)

src/backend/ScientificDefaults.cpp

@@ -134,11 +134,26 @@ void ScientificDefaults<Child>::finalize(Access at)
             }
         }
     }
+    // sic! no else
 
-    if constexpr (std::is_same_v<Child, ParticleSpecies>)
+    if constexpr (std::is_same_v<Child, Iteration>)
+    {
+        for (auto &[_, right] : asChild().meshes)
+        {
+            (void)_;
+            right.ScientificDefaults<Mesh>::finalize(at);
+        }
+        for (auto &[_, right] : asChild().particles)
+        {
+            (void)_;
+            right.ScientificDefaults<ParticleSpecies>::finalize(at);
+        }
+    }
+    else if constexpr (std::is_same_v<Child, ParticleSpecies>)
     {
         for (auto &[_, right] : asChild().particlePatches)
         {
+            (void)_;
             right
                 .ScientificDefaults<BaseRecord<PatchRecordComponent>>::finalize(
                     at);