Merge pull request #8 from zoeprieto/nuclide_temperatures

generalize concatenate function and minor changes
zoeprieto · Aug 8, 2024 · 2dfb210 · 2dfb210
2 parents b0da8a4 + 1a9f2bb
commit 2dfb210
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/include/openmc/string_utils.h b/include/openmc/string_utils.h
@@ -26,11 +26,16 @@ bool ends_with(const std::string& value, const std::string& ending);
 bool starts_with(const std::string& value, const std::string& beginning);
 
 template<typename T>
-inline std::string concatenate(const T& temps)
+inline std::string concatenate(const T& values, const std::string& del = " ")
 {
   std::ostringstream oss;
-  for (const auto& temp : temps) {
-    oss << temp << " ";
+  auto it = values.begin();
+  if (it != values.end()) {
+    oss << *it; // Insert the first element without a delimiter
+    ++it;
+  }
+  for (; it != values.end(); ++it) {
+    oss << del << *it;
   }
   return oss.str();
 }

diff --git a/src/mgxs.cpp b/src/mgxs.cpp
@@ -110,9 +110,9 @@ void Mgxs::metadata_from_hdf5(hid_t xs_id, const vector<double>& temperature,
         fatal_error(fmt::format(
           "MGXS library does not contain cross sections "
           "for {} at or near {} K. Available temperatures "
-          "are {} K consider making use of openmc.Settings.temperature "
+          "are {} K. Consider making use of openmc.Settings.temperature "
           "to specify how intermediate temperatures are treated.",
-          in_name, std::round(T), concatenate(temps_available)));
+          in_name, std::round(T), concatenate(temps_available, ", ")));
       }
     }
     break;

diff --git a/src/nuclide.cpp b/src/nuclide.cpp
@@ -161,9 +161,10 @@ Nuclide::Nuclide(hid_t group, const vector<double>& temperature)
         fatal_error(fmt::format(
           "Nuclear data library does not contain cross sections "
           "for {}  at or near {} K. Available temperatures "
-          "are {} K consider making use of openmc.Settings.temperature "
+          "are {} K. Consider making use of openmc.Settings.temperature "
           "to specify how intermediate temperatures are treated.",
-          name_, std::to_string(T_desired), concatenate(temps_available)));
+          name_, std::to_string(T_desired),
+          concatenate(temps_available, ", ")));
       }
     }
     break;

diff --git a/src/thermal.cpp b/src/thermal.cpp
@@ -93,9 +93,9 @@ ThermalScattering::ThermalScattering(
         fatal_error(fmt::format(
           "Nuclear data library does not contain cross sections "
           "for {}  at or near {} K. Available temperatures "
-          "are {} K consider making use of openmc.Settings.temperature "
+          "are {} K. Consider making use of openmc.Settings.temperature "
           "to specify how intermediate temperatures are treated.",
-          name_, std::to_string(std::round(T)), concatenate(temps_available)));
+          name_, std::round(T), concatenate(temps_available, ", ")));
       }
     }
     break;