Address feedback

Author: siramok

src/libs/blueprint/conduit_blueprint_mesh.cpp

@@ -1100,7 +1100,7 @@ convert_topology_to_rectilinear(const std::string &/*base_type*/,
 
     dest.set(topo);
     dest["type"].set("rectilinear");
-    dest["coordset"].set(bputils::resolve_output_name(*coordset, cdest));
+    dest["coordset"].set(bputils::resolve_output_name(topo, "coordset", cdest));
 }
 
 //-------------------------------------------------------------------------
@@ -1128,7 +1128,7 @@ convert_topology_to_structured(const std::string &base_type,
     }
 
     dest["type"].set("structured");
-    dest["coordset"].set(bputils::resolve_output_name(*coordset, cdest));
+    dest["coordset"].set(bputils::resolve_output_name(topo, "coordset", cdest));
     if(topo.has_child("origin"))
     {
         dest["origin"].set(topo["origin"]);
@@ -1185,7 +1185,7 @@ convert_topology_to_unstructured(const std::string &base_type,
     }
 
     dest["type"].set("unstructured");
-    dest["coordset"].set(bputils::resolve_output_name(*coordset, cdest));
+    dest["coordset"].set(bputils::resolve_output_name(topo, "coordset", cdest));
     if(topo.has_child("origin"))
     {
         dest["origin"].set(topo["origin"]);
@@ -5269,7 +5269,7 @@ mesh::topology::unstructured::generate_sides(const Node &topo,
 
     topo_dest.reset();
     topo_dest["type"].set("unstructured");
-    topo_dest["coordset"].set(bputils::resolve_output_name(*coordset, coords_dest));
+    topo_dest["coordset"].set(bputils::resolve_output_name(topo, "coordset", coords_dest));
     topo_dest["elements/shape"].set(side_shape.type());
     topo_dest["elements/connectivity"].set(DataType(int_dtype.id(),
         side_shape.indices * sides_num_elems));
@@ -6118,7 +6118,7 @@ mesh::topology::unstructured::generate_corners(const Node &topo,
 
     topo_dest.reset();
     topo_dest["type"].set("unstructured");
-    topo_dest["coordset"].set(bputils::resolve_output_name(*coordset, coords_dest));
+    topo_dest["coordset"].set(bputils::resolve_output_name(topo, "coordset", coords_dest));
     topo_dest["elements/shape"].set(corner_shape.type());
     if (is_topo_3d)
     {

src/libs/blueprint/conduit_blueprint_mesh_utils.cpp

@@ -465,7 +465,7 @@ find_reference_node(const Node &node, const std::string &ref_key)
 
 //-----------------------------------------------------------------------------
 std::string
-resolve_output_name(const Node &source, const Node &dest)
+resolve_output_name(const Node &node, const std::string &ref_key, const Node &dest)
 {
     if (!dest.name().empty())
     {
@@ -477,12 +477,13 @@ resolve_output_name(const Node &source, const Node &dest)
     }
     else // if (dest.name().empty())
     {
-        // If the dest node has no name, use the source node's name. This is
-        // relevant when passing an empty output node when calling mesh
-        // transforms, where the output node is expected to inherit the
-        // coordset name from the source node. Not doing this was resulting
-        // in newly converted topologies to fail `verify`.
-        return source.name();
+        // If the dest node has no name, fall back to the name that 'node'
+        // itself references (e.g. node["coordset"]). This is relevant
+        // when passing an empty output node when calling mesh transforms,
+        // where the output node is expected to inherit the reference name
+        // from 'node'. Not doing this was resulting in newly converted
+        // topologies to fail `verify`.
+        return node[ref_key].as_string();
     }
 }
 
@@ -5143,4 +5144,3 @@ void CONDUIT_BLUEPRINT_API lerp(const Node& As,
 //-----------------------------------------------------------------------------
 // -- end conduit:: --
 //-----------------------------------------------------------------------------
-

src/libs/blueprint/conduit_blueprint_mesh_utils.hpp

@@ -251,11 +251,14 @@ CONDUIT_BLUEPRINT_API const Node * find_reference_node(const Node &node, const s
 
 //-----------------------------------------------------------------------------
 /**
- @brief Get the name that a reference node (i.e. "coordset") should use for a
-        destination node. If the destination node has a name, use it; otherwise,
-        use the name of 'source'.
+ @brief Get the name that a reference field (e.g. "coordset") should use for
+        a destination node. If the destination node has a name, use it;
+        otherwise, fall back to the name that 'node' itself references via
+        'ref_key' (e.g. node["coordset"]).
  */
-std::string CONDUIT_BLUEPRINT_API resolve_output_name(const Node &source, const Node &dest);
+std::string CONDUIT_BLUEPRINT_API resolve_output_name(const Node &node,
+                                                      const std::string &ref_key,
+                                                      const Node &dest);
 
 //-----------------------------------------------------------------------------
 index_t CONDUIT_BLUEPRINT_API find_domain_id(const Node &node);