Merge pull request #415 from boutproject/more-warning-fixes

More warning fixes

Author: bendudson

CMakeLists.txt

@@ -203,6 +203,7 @@ add_library(hermes_warnings INTERFACE)
 hermes_set_project_warnings(hermes_warnings ${HERMES_ERROR_ON_WARNINGS} "" "" "" "")
 
 if (HERMES_ENABLE_WARNINGS)
+  target_link_libraries(hermes-3-lib PRIVATE hermes_warnings)
   target_link_libraries(hermes-3 PRIVATE hermes_warnings)
 endif()
 

include/adas_neon.hxx

@@ -37,7 +37,7 @@ constexpr std::initializer_list<char> neon_species_name<0>{'n', 'e'};
 /// ADAS effective ionisation (ADF11)
 ///
 /// @tparam level  The ionisation level of the ion on the left of the reaction
-template <int level>
+template <std::size_t level>
 struct ADASNeonIonisation : public OpenADAS {
   ADASNeonIonisation(std::string, Options& alloptions, Solver*)
       : OpenADAS(alloptions["units"], "scd96_ne.json", "plt96_ne.json", level,
@@ -57,7 +57,7 @@ struct ADASNeonIonisation : public OpenADAS {
 /// ADAS effective recombination coefficients (ADF11)
 ///
 /// @tparam level  The ionisation level of the ion on the right of the reaction
-template <int level>
+template <std::size_t level>
 struct ADASNeonRecombination : public OpenADAS {
   /// @param alloptions  The top-level options. Only uses the ["units"] subsection.
   ADASNeonRecombination(std::string, Options& alloptions, Solver*)
@@ -75,7 +75,7 @@ struct ADASNeonRecombination : public OpenADAS {
 
 /// @tparam level     The ionisation level of the ion on the right of the reaction
 /// @tparam Hisotope  The hydrogen isotope ('h', 'd' or 't')
-template <int level, char Hisotope>
+template <std::size_t level, char Hisotope>
 struct ADASNeonCX : public OpenADASChargeExchange {
   /// @param alloptions  The top-level options. Only uses the ["units"] subsection.
   ADASNeonCX(std::string, Options& alloptions, Solver*)

include/adas_reaction.hxx

@@ -4,6 +4,8 @@
 
 #include "component.hxx"
 #include "reaction.hxx"
+
+#include <cstddef>
 #include <vector>
 
 /// Represent a 2D rate coefficient table (T,n)
@@ -13,7 +15,7 @@ struct OpenADASRateCoefficient {
   /// @param filename   The file to read. Path relative to run working directory
   /// @param level      The first index in the log coefficient array
   ///                   (ionisation level)
-  OpenADASRateCoefficient(const std::string& filename, int level);
+  OpenADASRateCoefficient(const std::string& filename, std::size_t level);
 
   std::vector<std::vector<BoutReal>> log_coeff;
   std::vector<BoutReal> log_temperature;
@@ -53,7 +55,7 @@ struct OpenADAS : public ReactionBase {
   ///  - The rate and radiation file names have "json_database/" prepended
   /// 
   OpenADAS(const Options& units, const std::string& rate_file,
-           const std::string& radiation_file, int level, BoutReal electron_heating)
+           const std::string& radiation_file, std::size_t level, BoutReal electron_heating)
       : rate_coef(std::string("json_database/") + rate_file, level),
         radiation_coef(std::string("json_database/") + radiation_file, level),
         electron_heating(electron_heating) {
@@ -79,7 +81,7 @@ private:
 };
 
 struct OpenADASChargeExchange : public ReactionBase {
-  OpenADASChargeExchange(const Options& units, const std::string& rate_file, int level)
+  OpenADASChargeExchange(const Options& units, const std::string& rate_file, std::size_t level)
       : rate_coef(std::string("json_database/") + rate_file, level) {
     // Get the units
     Tnorm = get<BoutReal>(units["eV"]);

src/adas_reaction.cxx

@@ -19,10 +19,11 @@
 #include "../external/json.hxx"
 
 #include <algorithm>
+#include <cstddef>
 #include <fstream>
 #include <iterator>
 
-OpenADASRateCoefficient::OpenADASRateCoefficient(const std::string& filename, int level) {
+OpenADASRateCoefficient::OpenADASRateCoefficient(const std::string& filename, std::size_t level) {
   AUTO_TRACE();
 
   // Read the rate file
@@ -54,7 +55,7 @@ OpenADASRateCoefficient::OpenADASRateCoefficient(const std::string& filename, in
 
 namespace {
 
-int get_high_index(const std::vector<BoutReal>& vec, BoutReal value) {
+auto get_high_index(const std::vector<BoutReal>& vec, BoutReal value) {
   ASSERT2(vec.size() > 1); // Need at least two elements
 
   // Iterator pointing to the first element greater than or equal to log10T
@@ -64,10 +65,10 @@ int get_high_index(const std::vector<BoutReal>& vec, BoutReal value) {
   } else if (high_it == vec.begin()) {
     ++high_it; // Shift to the second element
   }
-  int high_index = std::distance(vec.begin(), high_it);
+  const auto high_index = std::distance(vec.begin(), high_it);
 
-  ASSERT2((high_index > 0) and (high_index < static_cast<int>(vec.size())));
-  return high_index;
+  ASSERT2((high_index > 0) and (static_cast<std::size_t>(high_index) < vec.size()));
+  return static_cast<std::size_t>(high_index);
 }
 
 } // namespace
@@ -80,8 +81,8 @@ BoutReal OpenADASRateCoefficient::evaluate(BoutReal T, BoutReal n) {
   BoutReal log10n = log10(std::clamp(n, nmin, nmax));
 
   // Get the upper index. Between 1 and size-1 inclusive
-  int high_T_index = get_high_index(log_temperature, log10T);
-  int high_n_index = get_high_index(log_density, log10n);
+  const auto high_T_index = get_high_index(log_temperature, log10T);
+  const auto high_n_index = get_high_index(log_density, log10n);
 
   // Construct the simple interpolation grid
   // Find weightings based on linear distance
@@ -91,12 +92,13 @@ BoutReal OpenADASRateCoefficient::evaluate(BoutReal T, BoutReal n) {
   //  | /     \ |      |
   // w00 ------ w10
 
-  int low_T_index = high_T_index - 1;
+  // This is ok because high_T_index is >= 1
+  const auto low_T_index = high_T_index - 1;
 
   BoutReal x = (log10T - log_temperature[low_T_index])
                / (log_temperature[high_T_index] - log_temperature[low_T_index]);
 
-  int low_n_index = high_n_index - 1;
+  const auto low_n_index = high_n_index - 1;
 
   BoutReal y = (log10n - log_density[low_n_index])
                / (log_density[high_n_index] - log_density[low_n_index]);

src/component.cxx

@@ -6,8 +6,7 @@ std::unique_ptr<Component> Component::create(const std::string &type,
                                              Options &alloptions,
                                              Solver *solver) {
 
-  return std::unique_ptr<Component>(
-      ComponentFactory::getInstance().create(type, name, alloptions, solver));
+  return ComponentFactory::getInstance().create(type, name, alloptions, solver);
 }
 
 constexpr decltype(ComponentFactory::type_name) ComponentFactory::type_name;

src/detachment_controller.cxx

@@ -1,5 +1,6 @@
 #include "../include/detachment_controller.hxx"
 
+#include <bout/bout_types.hxx>
 #include <bout/mesh.hxx>
 using bout::globals::mesh;
 #include <algorithm>  // Include for std::max
@@ -8,7 +9,7 @@ using bout::globals::mesh;
 #include <numeric>
 
 BoutReal calculateGradient(const std::vector<BoutReal>& x, const std::vector<BoutReal>& y) {
-    size_t N = x.size();
+    const auto N = x.size();
     BoutReal sum_x = std::accumulate(x.begin(), x.end(), 0.0);
     BoutReal sum_y = std::accumulate(y.begin(), y.end(), 0.0);
     BoutReal sum_xy = 0.0;
@@ -19,8 +20,9 @@ BoutReal calculateGradient(const std::vector<BoutReal>& x, const std::vector<Bou
         sum_x_squared += x[i] * x[i];
     }
 
-    BoutReal numerator = N * sum_xy - sum_x * sum_y;
-    BoutReal denominator = N * sum_x_squared - sum_x * sum_x;
+    const auto N_real = static_cast<BoutReal>(N);
+    const BoutReal numerator = (N_real * sum_xy) - (sum_x * sum_y);
+    const BoutReal denominator = (N_real * sum_x_squared) - (sum_x * sum_x);
 
     if (denominator == 0) {
         return 0.0; // Handle division by zero or return an error code

src/ionisation.cxx

@@ -14,7 +14,7 @@ BoutReal ionisation_rate(BoutReal T) {
   const auto log_T = log(T);
   double lograte = 0.0;
   for (std::size_t i = 0; i < ioncoeffs.size(); i++) {
-    lograte = lograte + ioncoeffs[i] * pow(log_T, i);
+    lograte = lograte + (ioncoeffs[i] * pow(log_T, static_cast<BoutReal>(i)));
   }
 
   return exp(lograte) * 1.0E-6;

src/neutral_mixed.cxx

@@ -104,7 +104,7 @@ NeutralMixed::NeutralMixed(const std::string& name, Options& alloptions, Solver*
       .withDefault<std::string>("multispecies");
 
   if (precondition) {
-    inv = std::unique_ptr<Laplacian>(Laplacian::create(&options["precon_laplace"]));
+    inv = Laplacian::create(&options["precon_laplace"]);
 
     inv->setInnerBoundaryFlags(INVERT_DC_GRAD | INVERT_AC_GRAD);
     inv->setOuterBoundaryFlags(INVERT_DC_GRAD | INVERT_AC_GRAD);

tests/unit/test_adas_reactions.hxx

@@ -6,6 +6,7 @@
 #include "../../include/adas_carbon.hxx"
 #include "../../include/adas_lithium.hxx"
 #include "../../include/adas_neon.hxx"
+#include <cstddef>
 
 /**
  * @brief Base fixture for tests of OpenADAS subclasses.
@@ -192,7 +193,7 @@ public:
 };
 
 // Li CX
-template <int level, char Hisotope>
+template <std::size_t level, char Hisotope>
 class ADASLiCXReactionTest : public ADASCXReactionTest<ADASLithiumCX<level, Hisotope>> {
 public:
   ADASLiCXReactionTest(std::string lbl, std::string reaction_str)
@@ -217,7 +218,7 @@ public:
 };
 
 // Ne CX
-template <int level, char Hisotope>
+template <std::size_t level, char Hisotope>
 class ADASNeCXReactionTest : public ADASCXReactionTest<ADASNeonCX<level, Hisotope>> {
 public:
   ADASNeCXReactionTest(std::string lbl, std::string reaction_str)
@@ -240,4 +241,4 @@ class ADASNep9TCXTest : public ADASNeCXReactionTest<8, 't'> {
 public:
   ADASNep9TCXTest() : ADASNeCXReactionTest<8, 't'>("Nep9TCX", "ne+9 + t -> ne+8 + t+") {}
 };
-#endif
+#endif