making output capable of default handling many outputs

wildmeshing · Nov 29, 2024 · 413ed13 · 413ed13
1 parent 2c47a4c
commit 413ed13
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/components/multimesh/src/wmtk/components/multimesh/NamedMultiMesh.cpp b/components/multimesh/src/wmtk/components/multimesh/NamedMultiMesh.cpp
@@ -332,11 +332,12 @@ NamedMultiMesh::NamedMultiMesh(const NamedMultiMesh& o)
 {}
 
 
-std::unique_ptr<nlohmann::json> NamedMultiMesh::get_names_json() const
+std::unique_ptr<nlohmann::json> NamedMultiMesh::get_names_json(const std::string_view& path) const
 {
     auto js_ptr = std::make_unique<nlohmann::json>();
     auto& js = *js_ptr;
-    js = *m_name_root;
+    const auto id = get_id(path);
+    js = get_node(id);
 
 
     return js_ptr;

diff --git a/components/multimesh/src/wmtk/components/multimesh/NamedMultiMesh.hpp b/components/multimesh/src/wmtk/components/multimesh/NamedMultiMesh.hpp
@@ -40,7 +40,7 @@ class NamedMultiMesh
     void set_root(Mesh& m);
     void append_child_mesh_names(const Mesh& parent, const NamedMultiMesh& o);
 
-    std::unique_ptr<nlohmann::json> get_names_json() const;
+    std::unique_ptr<nlohmann::json> get_names_json(const std::string_view& path) const;
 
     std::string_view root_name() const;
     std::string name(const std::vector<int64_t>& id) const;

diff --git a/components/output/wmtk/components/output/output.cpp b/components/output/wmtk/components/output/output.cpp
@@ -3,6 +3,7 @@
 #include <fmt/std.h>
 #include <type_traits>
 #include <wmtk/Mesh.hpp>
+#include <wmtk/components/multimesh/MeshCollection.hpp>
 #include <wmtk/components/multimesh/NamedMultiMesh.hpp>
 #include <wmtk/components/utils/resolve_path.hpp>
 #include <wmtk/io/HDF5Writer.hpp>
@@ -77,14 +78,27 @@ void output(const Mesh& mesh, const OutputOptions& opts)
             fmt::format("Unable to write file [{}] of extension [{}]", opts.path, opts.type));
 }
 
-void output(const multimesh::NamedMultiMesh& mesh, const OutputOptions& opts)
+void output(
+    const multimesh::NamedMultiMesh& mesh,
+    const OutputOptions& opts,
+    const std::string_view& mesh_path)
 {
-    output(mesh.root(), opts);
+    output(mesh.get_mesh(mesh_path), opts);
 
     if (opts.mesh_name_path.has_value()) {
         const auto& path = opts.mesh_name_path.value();
         std::ofstream ofs(path);
-        ofs << *mesh.get_names_json();
+        ofs << *mesh.get_names_json(mesh_path);
+    }
+}
+
+void output(
+    const multimesh::MeshCollection& mesh_col,
+    const std::map<std::string, OutputOptions>& opts)
+{
+    for (const auto& [path, single_opts] : opts) {
+        const multimesh::NamedMultiMesh& nmm = mesh_col.get_named_multimesh(path);
+        output(nmm, single_opts, path);
     }
 }
 

diff --git a/components/output/wmtk/components/output/output.hpp b/components/output/wmtk/components/output/output.hpp
@@ -8,6 +8,7 @@
 namespace wmtk::components {
     namespace multimesh {
         class NamedMultiMesh;
+        class  MeshCollection;
     }
 
     namespace output {
@@ -68,7 +69,12 @@ void output(
 
 void output(
     const multimesh::NamedMultiMesh& mesh,
-    const OutputOptions&);
+    const OutputOptions&, const std::string_view& mesh_path = "");
+
+
+void output(
+    const multimesh::MeshCollection& mesh,
+    const std::map<std::string, OutputOptions>&);
 
 /**
  * @brief Write the mesh to file.