unify concatenate function

zoeprieto · Aug 7, 2024 · f7f56a6 · f7f56a6
1 parent 56f9ecc
commit f7f56a6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 25 deletions.
diff --git a/include/openmc/string_utils.h b/include/openmc/string_utils.h
@@ -25,9 +25,15 @@ bool ends_with(const std::string& value, const std::string& ending);
 
 bool starts_with(const std::string& value, const std::string& beginning);
 
-std::string concatenate_vec(const std::vector<double>& temps);
-
-std::string concatenate_xt(const xt::xarray<double>& temps);
+template<typename T>
+inline std::string concatenate(const T& temps)
+{
+  std::ostringstream oss;
+  for (const auto& temp : temps) {
+    oss << temp << " ";
+  }
+  return oss.str();
+}
 
 } // namespace openmc
 #endif // OPENMC_STRING_UTILS_H
diff --git a/src/mgxs.cpp b/src/mgxs.cpp
@@ -112,7 +112,7 @@ void Mgxs::metadata_from_hdf5(hid_t xs_id, const vector<double>& temperature,
           "for {} at or near {} K. Available temperatures "
           "are {} K consider making use of openmc.Settings.temperature "
           "to specify how intermediate temperatures are treated.",
-          in_name, std::round(T), concatenate_xt(temps_available)));
+          in_name, std::round(T), concatenate(temps_available)));
       }
     }
     break;

diff --git a/src/nuclide.cpp b/src/nuclide.cpp
@@ -163,7 +163,7 @@ Nuclide::Nuclide(hid_t group, const vector<double>& temperature)
           "for {}  at or near {} K. Available temperatures "
           "are {} K consider making use of openmc.Settings.temperature "
           "to specify how intermediate temperatures are treated.",
-          name_, std::to_string(T_desired), concatenate_vec(temps_available)));
+          name_, std::to_string(T_desired), concatenate(temps_available)));
       }
     }
     break;

diff --git a/src/string_utils.cpp b/src/string_utils.cpp
@@ -88,22 +88,4 @@ bool starts_with(const std::string& value, const std::string& beginning)
   return std::equal(beginning.begin(), beginning.end(), value.begin());
 }
 
-std::string concatenate_vec(const std::vector<double>& temps)
-{
-  std::ostringstream oss;
-  for (const auto& temp : temps) {
-    oss << temp << " ";
-  }
-  return oss.str();
-}
-
-std::string concatenate_xt(const xt::xarray<double>& temps)
-{
-  std::ostringstream oss;
-  for (const auto& temp : temps) {
-    oss << temp << " ";
-  }
-  return oss.str();
-}
-
 } // namespace openmc
diff --git a/src/thermal.cpp b/src/thermal.cpp
@@ -95,8 +95,7 @@ ThermalScattering::ThermalScattering(
           "for {}  at or near {} K. Available temperatures "
           "are {} K consider making use of openmc.Settings.temperature "
           "to specify how intermediate temperatures are treated.",
-          name_, std::to_string(std::round(T)),
-          concatenate_xt(temps_available)));
+          name_, std::to_string(std::round(T)), concatenate(temps_available)));
       }
     }
     break;