somewhat compiles

Author: franzpoeschel

include/openPMD/backend/Container.hpp

@@ -263,15 +263,7 @@ class Container : virtual public Attributable
         return container().emplace(std::forward<Args>(args)...);
     }
 
-    void visitHierarchy(HierarchyVisitor &v) override
-    {
-        v(*this);
-        for (auto &p : *this)
-        {
-            p.second.visitHierarchy(v);
-        }
-    }
-
+    void visitHierarchy(HierarchyVisitor &v) override;
     // clang-format off
 OPENPMD_protected
     // clang-format on

include/openPMD/backend/HierarchyVisitor.hpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cstdint>
 #include <map>
 #include <string>
 
@@ -9,28 +10,38 @@ class Series;
 class Iteration;
 class Mesh;
 class ParticleSpecies;
+class ParticlePatches;
 class PatchRecord;
 class PatchRecordComponent;
 class RecordComponent;
 class MeshRecordComponent;
 template <typename, typename, typename>
 class Container;
-template <typename Val>
-using Cont = Container<Val, std::string, std::map<std::string, Val>>;
+template <typename Val, typename Key = std::string>
+using Cont = Container<Val, Key, std::map<Key, Val>>;
 template <typename>
 class BaseRecord;
+class Record;
 
 class HierarchyVisitor
 {
 public:
     virtual void operator()(Series &) = 0;
     virtual void operator()(Iteration &) = 0;
-    virtual void operator()(Cont<Iteration> &) = 0;
+    virtual void operator()(Cont<Iteration, std::uint64_t> &) = 0;
     virtual void operator()(Cont<Mesh> &) = 0;
     virtual void operator()(Cont<ParticleSpecies> &) = 0;
+    virtual void operator()(Cont<ParticlePatches> &) = 0;
     virtual void operator()(Cont<PatchRecord> &) = 0;
+    virtual void operator()(Cont<Record> &) = 0;
+    virtual void operator()(Record &) = 0;
+    // TODO there are too many duplications here, remove most of them
+    virtual void operator()(Cont<MeshRecordComponent> &) = 0;
+    virtual void operator()(BaseRecord<MeshRecordComponent> &) = 0;
     virtual void operator()(Cont<PatchRecordComponent> &) = 0;
-    virtual void operator()(Mesh &) = 0;
+    virtual void operator()(BaseRecord<PatchRecordComponent> &) = 0;
+    virtual void operator()(Cont<RecordComponent> &) = 0;
+    virtual void operator()(BaseRecord<RecordComponent> &) = 0;
     virtual void operator()(ParticleSpecies &) = 0;
     virtual void operator()(RecordComponent &) = 0;
     virtual void operator()(MeshRecordComponent &) = 0;

include/openPMD/backend/HierarchyVisitorImpl.hpp

@@ -0,0 +1,7 @@
+#pragma once
+
+#include "openPMD/backend/HierarchyVisitor.hpp"
+
+#include "openPMD/Iteration.hpp"
+#include "openPMD/ParticleSpecies.hpp"
+#include "openPMD/Series.hpp"

src/Iteration.cpp

@@ -247,35 +247,37 @@ bool Iteration::closedByWriter() const
 void Iteration::populateDefaultMetadata()
 {
     auto standard = IOHandler()->m_standard;
-    visitHierarchy([standard](auto &component) {
-        using ComponentType = std::remove_reference_t<decltype(component)>;
-        if constexpr (auxiliary::IsTemplateBaseOf_v<BaseRecord, ComponentType>)
-        {
-            if (component.empty() && !component.datasetDefined())
-            {
-                std::cerr
-                    << "Cannot flush Record without any contained components: '"
-                    << component.myPath().openPMDPath() << "'. Will ignore.";
-                if (component.written())
-                {
-                    std::cerr
-                        << "\n(Note: The Record seems to have been written "
-                           "previously?)";
-                }
-                std::cerr << std::endl;
-                return;
-            }
-        }
-
-        if constexpr (
-            !std::is_same_v<ComponentType, Container<Mesh>> &&
-            !std::is_same_v<ComponentType, Container<Record>> &&
-            !std::is_same_v<ComponentType, Container<PatchRecord>> &&
-            !std::is_same_v<ComponentType, Container<ParticleSpecies>>)
-        {
-            component.writeDefaults(standard);
-        }
-    });
+    // visitHierarchy([standard](auto &component) {
+    //     using ComponentType = std::remove_reference_t<decltype(component)>;
+    //     if constexpr (auxiliary::IsTemplateBaseOf_v<BaseRecord,
+    //     ComponentType>)
+    //     {
+    //         if (component.empty() && !component.datasetDefined())
+    //         {
+    //             std::cerr
+    //                 << "Cannot flush Record without any contained components:
+    //                 '"
+    //                 << component.myPath().openPMDPath() << "'. Will ignore.";
+    //             if (component.written())
+    //             {
+    //                 std::cerr
+    //                     << "\n(Note: The Record seems to have been written "
+    //                        "previously?)";
+    //             }
+    //             std::cerr << std::endl;
+    //             return;
+    //         }
+    //     }
+
+    //     if constexpr (
+    //         !std::is_same_v<ComponentType, Container<Mesh>> &&
+    //         !std::is_same_v<ComponentType, Container<Record>> &&
+    //         !std::is_same_v<ComponentType, Container<PatchRecord>> &&
+    //         !std::is_same_v<ComponentType, Container<ParticleSpecies>>)
+    //     {
+    //         component.writeDefaults(standard);
+    //     }
+    // });
 }
 
 void Iteration::flushFileBased(

src/backend/Attributable.cpp

@@ -295,6 +295,11 @@ void Attributable::touch()
     setDirtyRecursive(true);
 }
 
+void Attributable::visitHierarchy(HierarchyVisitor &)
+{
+    throw std::runtime_error("Cannot call this on base class");
+}
+
 OpenpmdStandard Attributable::openPMDStandard() const
 {
     return IOHandler()->m_standard;

src/backend/Container.cpp

@@ -26,10 +26,20 @@
 #include "openPMD/ParticlePatches.hpp"
 #include "openPMD/ParticleSpecies.hpp"
 #include "openPMD/backend/Container.hpp"
+#include "openPMD/backend/HierarchyVisitorImpl.hpp"
 #include "openPMD/backend/PatchRecordComponent.hpp"
 
 namespace openPMD
 {
+template <typename Val, typename Key, typename Map>
+void Container<Val, Key, Map>::visitHierarchy(HierarchyVisitor &v)
+{
+    v(*this);
+    for (auto &p : *this)
+    {
+        p.second.visitHierarchy(v);
+    }
+}
 #define OPENPMD_COMMA ,
 #define OPENPMD_INSTANTIATE(type) template class Container<type>;