Merge branch 'SmallFixes' into 'master'

Various small fixes mostly from cppcheck See merge request ogs/ogs!4964
ufz · Mar 27, 2024 · 48e85f4 · 48e85f4
2 parents 002de0a + 43a5945
commit 48e85f4
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 21 deletions.
diff --git a/BaseLib/ConfigTree.cpp b/BaseLib/ConfigTree.cpp
@@ -115,23 +115,23 @@ ConfigTree& ConfigTree::operator=(ConfigTree&& other)
     return *this;
 }
 
-ConfigTree ConfigTree::getConfigParameter(std::string const& root) const
+ConfigTree ConfigTree::getConfigParameter(std::string const& param) const
 {
-    auto ct = getConfigSubtree(root);
+    auto ct = getConfigSubtree(param);
     if (ct.hasChildren())
     {
-        error("Requested parameter <" + root + "> actually is a subtree.");
+        error("Requested parameter <" + param + "> actually is a subtree.");
     }
     return ct;
 }
 
 std::optional<ConfigTree> ConfigTree::getConfigParameterOptional(
-    std::string const& root) const
+    std::string const& param) const
 {
-    auto ct = getConfigSubtreeOptional(root);
+    auto ct = getConfigSubtreeOptional(param);
     if (ct && ct->hasChildren())
     {
-        error("Requested parameter <" + root + "> actually is a subtree.");
+        error("Requested parameter <" + param + "> actually is a subtree.");
     }
     return ct;
 }

diff --git a/BaseLib/ConfigTree.h b/BaseLib/ConfigTree.h
@@ -382,7 +382,7 @@ class ConfigTree final
      * \pre \c param must not have been read before from this ConfigTree.
      */
     std::optional<ConfigTree> getConfigParameterOptional(
-        std::string const& root) const;
+        std::string const& param) const;
 
     /*! Fetches all parameters with name \c param from the current level of the
      * tree.

diff --git a/Documentation/ProjectFile/material/porous_medium/porosity/i_porosity.md b/Documentation/ProjectFile/material/porous_medium/porosity/i_porosity.md
diff --git a/Documentation/ProjectFile/material/porous_medium/porosity/t_porosity_parameter.md b/Documentation/ProjectFile/material/porous_medium/porosity/t_porosity_parameter.md
diff --git a/Documentation/ProjectFile/material/porous_medium/porosity/t_type.md b/Documentation/ProjectFile/material/porous_medium/porosity/t_type.md
diff --git a/Documentation/ProjectFile/material/porous_medium/storage/Constant/c_Constant.md b/Documentation/ProjectFile/material/porous_medium/storage/Constant/c_Constant.md
diff --git a/Documentation/ProjectFile/material/porous_medium/storage/Constant/t_value.md b/Documentation/ProjectFile/material/porous_medium/storage/Constant/t_value.md
diff --git a/Documentation/ProjectFile/material/porous_medium/storage/i_storage.md b/Documentation/ProjectFile/material/porous_medium/storage/i_storage.md
diff --git a/Documentation/ProjectFile/material/porous_medium/storage/t_type.md b/Documentation/ProjectFile/material/porous_medium/storage/t_type.md
diff --git a/GeoLib/IO/NetCDFRasterReader.cpp b/GeoLib/IO/NetCDFRasterReader.cpp
@@ -10,11 +10,13 @@
 #include "GeoLib/IO/NetCDFRasterReader.h"
 
 #include <filesystem>
+#include <numeric>
 #ifdef OGS_USE_NETCDF
 #include <netcdf>
 #endif
 
 #include "BaseLib/ConfigTree.h"
+#include "BaseLib/StringTools.h"
 #include "GeoLib/AABB.h"
 #include "GeoLib/IO/AsciiRasterInterface.h"
 

diff --git a/MaterialLib/MPL/Properties/VolumeFractionAverage.h b/MaterialLib/MPL/Properties/VolumeFractionAverage.h
@@ -45,9 +45,9 @@ class VolumeFractionAverage : public Property
     // Struct with pointers on the properties of relevant phases
     struct PhaseProperties
     {
-        const Property* liquid;
-        const Property* frozen;
-        const Property* porous;
+        const Property* liquid = nullptr;
+        const Property* frozen = nullptr;
+        const Property* porous = nullptr;
     };
 
 public:

diff --git a/MathLib/VectorizedTensor.h b/MathLib/VectorizedTensor.h
@@ -195,6 +195,8 @@ Type<DisplacementDim> toVector(Eigen::MatrixBase<Derived> const& tensor)
     {
         return tensor.reshaped();
     }
+    OGS_FATAL(
+        "Not all cases handled in the VectorizedTensor::toVector() function.");
 }
 
 /// Converts a vectorized tensor to a 3x3 matrix.

diff --git a/ParameterLib/TimeDependentHeterogeneousParameter.cpp b/ParameterLib/TimeDependentHeterogeneousParameter.cpp
@@ -60,6 +60,13 @@ std::vector<double> TimeDependentHeterogeneousParameter::operator()(
             break;
         }
     }
+    if (k == _time_parameter_mapping.size())
+    {
+        OGS_FATAL(
+            "Could not find parameter for time {}. There are {:d} "
+            "time-parameter pairs.",
+            t, _time_parameter_mapping.size());
+    }
     auto const t0 = _time_parameter_mapping[k - 1].first;
     auto const t1 = _time_parameter_mapping[k].first;
     auto const alpha = (t - t0) / (t1 - t0);

diff --git a/Tests/Data/Mechanics/Linear/PythonHertzContact/hertz_contact_bc.py b/Tests/Data/Mechanics/Linear/PythonHertzContact/hertz_contact_bc.py
@@ -67,9 +67,7 @@ def _init_iteration(self):
         self._iteration += 1
 
         print(
-            "BC: a_est={:.4f}, a_prev={:.4f} ({:.4f}, {:.4f})".format(
-                self._a_est, self._a_prev, self._a_range[0], self._a_range[1]
-            )
+            f"BC: a_est={self._a_est:.4f}, a_prev={self._a_prev:.4f} ({self._a_range[0]:.4f}, {self._a_range[1]:.4f})"
         )
 
     def getDirichletBCValue(self, t, coords, node_id, primary_vars):