remove id mapping feature and fix some things

Author: GuySten

include/openmc/mesh.h

@@ -1082,9 +1082,7 @@ void read_meshes(pugi::xml_node root);
 //! Read meshes from a HDF5 file
 //
 //! \param[in] group HDF5 group
-//! \param[out] mesh_map mapping from mesh ids inside HDF5 group to global mesh
-//! ids
-void read_meshes(hid_t group, std::unordered_map<int32_t, int32_t>& mesh_map);
+void read_meshes(hid_t group);
 
 //! Write mesh data to an HDF5 group
 //

include/openmc/weight_windows.h

@@ -87,9 +87,8 @@ class WeightWindows {
   WeightWindows(pugi::xml_node node);
   ~WeightWindows();
   static WeightWindows* create(int32_t id = -1);
-  static WeightWindows* from_hdf5(hid_t wws_group,
-    const std::string& group_name,
-    std::unordered_map<int32_t, int32_t>& id_map);
+  static WeightWindows* from_hdf5(
+    hid_t wws_group, const std::string& group_name);
 
   //----------------------------------------------------------------------------
   // Methods

src/mesh.cpp

@@ -3821,23 +3821,15 @@ void read_meshes(pugi::xml_node root)
   }
 }
 
-void read_meshes(hid_t group, std::unordered_map<int32_t, int32_t>& mesh_map)
+void read_meshes(hid_t group)
 {
-  // Find the iterator to the element with the maximum key
-  auto max_key_it =
-    std::max_element(model::mesh_map.begin(), model::mesh_map.end(),
-      [](const auto& p1, const auto& p2) { return p1.first < p2.first; });
-  auto offset = max_key_it->first;
-
   std::unordered_set<int> mesh_ids;
 
   std::array<int, 1> ids;
   read_attribute(group, "ids", ids);
 
   for (auto id : ids) {
 
-    mesh_map[id] = id + offset;
-
     // Check to make sure multiple meshes in the same file don't share IDs
     if (contains(mesh_ids, id)) {
       fatal_error(fmt::format("Two or more meshes use the same unique ID "
@@ -3846,19 +3838,26 @@ void read_meshes(hid_t group, std::unordered_map<int32_t, int32_t>& mesh_map)
     }
     mesh_ids.insert(id);
 
+    // If we've already read a mesh with the same ID in a *different* file,
+    // assume it is the same here
+    if (model::mesh_map.find(id) != model::mesh_map.end()) {
+      warning(fmt::format("Mesh with ID={} appears in multiple files.", id));
+      continue;
+    }
+
     std::string name = fmt::format("mesh {}", id);
     hid_t mesh_group = open_group(group, name.c_str());
 
     std::string mesh_type;
-    if (attribute_exists(mesh_group, "type")) {
+    if (object_exists(mesh_group, "type")) {
       read_dataset(mesh_group, "type", mesh_type);
     } else {
       mesh_type = "regular";
     }
 
     // determine the mesh library to use
     std::string mesh_lib;
-    if (attribute_exists(mesh_group, "library")) {
+    if (object_exists(mesh_group, "library")) {
       read_dataset(mesh_group, "library", mesh_lib);
     }
 
@@ -3888,8 +3887,6 @@ void read_meshes(hid_t group, std::unordered_map<int32_t, int32_t>& mesh_map)
       fatal_error("Invalid mesh type: " + mesh_type);
     }
 
-    model::meshes.back()->id_ = mesh_map[model::meshes.back()->id_];
-
     // Map ID to position in vector
     model::mesh_map[model::meshes.back()->id_] = model::meshes.size() - 1;
   }

src/weight_windows.cpp

@@ -241,8 +241,8 @@ WeightWindows* WeightWindows::create(int32_t id)
   return wws;
 }
 
-WeightWindows* WeightWindows::from_hdf5(hid_t wws_group,
-  const std::string& group_name, std::unordered_map<int32_t, int32_t>& id_map)
+WeightWindows* WeightWindows::from_hdf5(
+  hid_t wws_group, const std::string& group_name)
 {
   // collect ID from the name of this group
   hid_t ww_group = open_group(wws_group, group_name);
@@ -258,8 +258,6 @@ WeightWindows* WeightWindows::from_hdf5(hid_t wws_group,
   int32_t mesh_id;
   read_dataset(ww_group, "mesh", mesh_id);
 
-  mesh_id = id_map[mesh_id];
-
   if (model::mesh_map.count(mesh_id) == 0) {
     fatal_error(
       fmt::format("Mesh {} used in weight windows does not exist.", mesh_id));
@@ -1330,16 +1328,14 @@ extern "C" int openmc_weight_windows_import(const char* filename)
 
   hid_t weight_windows_group = open_group(ww_file, "weight_windows");
 
-  std::unordered_map<int32_t, int32_t> mesh_map;
-
   hid_t mesh_group = open_group(ww_file, "meshes");
 
-  read_meshes(mesh_group, mesh_map);
+  read_meshes(mesh_group);
 
   std::vector<std::string> names = group_names(weight_windows_group);
 
   for (const auto& name : names) {
-    WeightWindows::from_hdf5(weight_windows_group, name, mesh_map);
+    WeightWindows::from_hdf5(weight_windows_group, name);
   }
 
   close_group(weight_windows_group);