Cleanup

Author: franzpoeschel

include/openPMD/Iteration.hpp

@@ -147,22 +147,19 @@ namespace internal
         std::optional<DeferredParseAccess> m_deferredParseAccess{};
     };
 } // namespace internal
+
 class Meshes : public Container<Mesh>
 {
 public:
-    void visitHierarchy(HierarchyVisitor &v) override
-    {
-        visitHierarchyImpl<Meshes>(v);
-    }
+    void visitHierarchy(HierarchyVisitor &v) override;
 };
+
 class Particles : public Container<ParticleSpecies>
 {
 public:
-    void visitHierarchy(HierarchyVisitor &v) override
-    {
-        visitHierarchyImpl<Particles>(v);
-    }
+    void visitHierarchy(HierarchyVisitor &v) override;
 };
+
 /** @brief  Logical compilation of data from one snapshot (e.g. a single
  * simulation cycle).
  *
@@ -309,7 +306,7 @@ class Iteration
     }
 
     Meshes meshes{};
-    Particles particles{}; // particleSpecies?
+    Particles particles{};
 
     virtual ~Iteration() = default;
 

include/openPMD/Mesh.hpp

@@ -326,10 +326,7 @@ class Mesh : public BaseRecord<MeshRecordComponent>
         typename = std::enable_if_t<std::is_floating_point<T>::value>>
     Mesh &setTimeOffset(T timeOffset);
 
-    void visitHierarchy(HierarchyVisitor &v) override
-    {
-        visitHierarchyImpl<Mesh>(v);
-    }
+    void visitHierarchy(HierarchyVisitor &v) override;
 
 private:
     Mesh();

include/openPMD/ParticlePatches.hpp

@@ -38,10 +38,7 @@ class ParticlePatches : public Container<PatchRecord>
     size_t numPatches() const;
     ~ParticlePatches() override = default;
 
-    void visitHierarchy(HierarchyVisitor &v) override
-    {
-        visitHierarchyImpl<ParticlePatches>(v);
-    }
+    void visitHierarchy(HierarchyVisitor &v) override;
 
 private:
     ParticlePatches() = default;

include/openPMD/Record.hpp

@@ -50,10 +50,7 @@ class Record : public BaseRecord<RecordComponent>
     template <typename T>
     Record &setTimeOffset(T);
 
-    void visitHierarchy(HierarchyVisitor &v) override
-    {
-        visitHierarchyImpl<Record>(v);
-    }
+    void visitHierarchy(HierarchyVisitor &v) override;
 
 private:
     Record();

include/openPMD/RecordComponent.hpp

@@ -488,10 +488,7 @@ class RecordComponent
     auto visit(Args &&...args) -> decltype(Visitor::template call<char>(
         std::declval<RecordComponent &>(), std::forward<Args>(args)...));
 
-    void visitHierarchy(HierarchyVisitor &v) override
-    {
-        v(*this);
-    }
+    void visitHierarchy(HierarchyVisitor &v) override;
 
     static constexpr char const *const SCALAR = "\vScalar";
 

include/openPMD/Series.hpp

@@ -69,10 +69,7 @@ class Series;
 class Iterations : public Container<Iteration, Iteration::IterationIndex_t>
 {
 public:
-    void visitHierarchy(HierarchyVisitor &v) override
-    {
-        visitHierarchyImpl<Iterations>(v);
-    }
+    void visitHierarchy(HierarchyVisitor &v) override;
 };
 
 namespace internal
@@ -787,11 +784,7 @@ class Series : public Attributable
      */
     void close();
 
-    void visitHierarchy(HierarchyVisitor &v) override
-    {
-        v(*this);
-        get().iterations.visitHierarchy(v);
-    }
+    void visitHierarchy(HierarchyVisitor &v) override;
 
     /**
      * This overrides Attributable::iterationFlush() which will fail on Series.

include/openPMD/backend/PatchRecord.hpp

@@ -40,10 +40,7 @@ class PatchRecord : public BaseRecord<PatchRecordComponent>
     PatchRecord &setUnitDimension(unit_representations::AsArray const &udim);
     ~PatchRecord() override = default;
 
-    void visitHierarchy(HierarchyVisitor &v) override
-    {
-        visitHierarchyImpl<PatchRecord>(v);
-    }
+    void visitHierarchy(HierarchyVisitor &v) override;
 
 private:
     PatchRecord() = default;

include/openPMD/backend/PatchRecordComponent.hpp

@@ -89,10 +89,7 @@ class PatchRecordComponent : public RecordComponent
     template <typename T>
     void store(T);
 
-    void visitHierarchy(HierarchyVisitor &v) override
-    {
-        v(*this);
-    }
+    void visitHierarchy(HierarchyVisitor &v) override;
 
     // clang-format off
 OPENPMD_private

include/openPMD/openPMD.hpp

@@ -45,6 +45,7 @@ namespace openPMD
 #include "openPMD/backend/BaseRecord.hpp"
 #include "openPMD/backend/BaseRecordComponent.hpp"
 #include "openPMD/backend/Container.hpp"
+#include "openPMD/backend/HierarchyVisitorImpl.hpp"
 #include "openPMD/backend/MeshRecordComponent.hpp"
 #include "openPMD/backend/PatchRecord.hpp"
 #include "openPMD/backend/PatchRecordComponent.hpp"

src/Iteration.cpp

@@ -54,6 +54,16 @@ namespace openPMD
 using internal::CloseStatus;
 using internal::DeferredParseAccess;
 
+void Meshes::visitHierarchy(HierarchyVisitor &v)
+{
+    visitHierarchyImpl<Meshes>(v);
+}
+
+void Particles::visitHierarchy(HierarchyVisitor &v)
+{
+    visitHierarchyImpl<Particles>(v);
+}
+
 Iteration::Iteration() : Attributable(NoInit())
 {
     setData(std::make_shared<Data_t>());