Merge pull request #4394 from akva2/janitoring

Some janitoring
OPM · Dec 23, 2024 · f0342ac · f0342ac
2 parents 332a08e + 3b5f508
commit f0342ac
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 49 deletions.
diff --git a/external/resinsight/LibCore/cvfArrayWrapperConst.h b/external/resinsight/LibCore/cvfArrayWrapperConst.h
@@ -36,6 +36,8 @@
 
 #pragma once
 
+#include <cstddef>
+
 namespace external {
 namespace cvf {
 

diff --git a/opm/common/utility/numeric/VectorUtil.hpp b/opm/common/utility/numeric/VectorUtil.hpp
@@ -1,13 +1,11 @@
 #ifndef VECTORUTIL_H
 #define VECTORUTIL_H
 
-#include <tuple>
-#include <vector>
-#include <functional>
-#include <stdexcept> 
+#include <algorithm>
 #include <array>
+#include <stdexcept>
 #include <tuple>
-
+#include <vector>
 
 namespace VectorUtil {
 
@@ -97,16 +95,6 @@ auto callMethodForEachInputOnObjectXYZ(const T& obj, Method mtd, const std::vect
     return splitXYZ<X>(result);
 }
 
-template <typename T>
-    void test(std::vector<T> vec){
-    std::size_t index = 1;
-    for (T el : vec){
-        index++;
-    }
-}
-
-
-
 // Example for other utilities...
 
 } // namespace VectorUtil

diff --git a/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp b/opm/input/eclipse/EclipseState/Grid/EclipseGrid.cpp
@@ -2107,9 +2107,12 @@ std::vector<double> EclipseGrid::createDVector(const std::array<int,3>& dims, st
     int EclipseGrid::initializeLGRObjectIndices(int num){
         lgr_level = num;
         num++;
-        for (std::size_t index :m_print_order_lgr_cells) {
-            num = lgr_children_cells[index].initializeLGRObjectIndices(num);
-        }
+        std::accumulate(m_print_order_lgr_cells.begin(),
+                        m_print_order_lgr_cells.end(), num,
+                        [this](int n, const auto& it)
+                        {
+                            return lgr_children_cells[it].initializeLGRObjectIndices(n);
+                        });
         return num;
     }
 
@@ -2191,9 +2194,10 @@ std::vector<double> EclipseGrid::createDVector(const std::array<int,3>& dims, st
         });
 
         lgr_children_labels.reserve(lgr_children_cells.size());
-        for (auto lgr_cell : lgr_children_cells) {
-            lgr_children_labels.emplace_back(lgr_cell.lgr_label);
-        }
+        std::transform(lgr_children_cells.begin(),
+                       lgr_children_cells.end(),
+                       std::back_inserter(lgr_children_labels),
+                       [](const auto& it) { return it.lgr_label; });
         lgr_active_index.resize(lgr_children_cells.size(),0);
     }
 

diff --git a/opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp b/opm/input/eclipse/EclipseState/Grid/EclipseGrid.hpp
@@ -391,8 +391,8 @@ namespace Opm {
       std::string father_label;
       // references global on the father label
       vec_size_t father_global;
-      std::array<int,3> low_fahterIJK;
-      std::array<int,3> up_fahterIJK;
+      std::array<int,3> low_fahterIJK{};
+      std::array<int,3> up_fahterIJK{};
       std::vector<int> m_hostnum;
     };
 

diff --git a/opm/input/eclipse/Schedule/ResCoup/GrupSlav.cpp b/opm/input/eclipse/Schedule/ResCoup/GrupSlav.cpp
@@ -88,7 +88,8 @@ void checkValidSlaveGroupName(const std::string& name, HandlerContext& handlerCo
     }
 }
 
-ReservoirCoupling::GrupSlav::FilterFlag getFilterFlag(const DeckItem& keyword, HandlerContext& handlerContext)
+ReservoirCoupling::GrupSlav::FilterFlag
+getFilterFlag(const DeckItem& keyword, const HandlerContext& handlerContext)
 {
     try {
         return ReservoirCoupling::GrupSlav::filterFlagFromString(keyword.getTrimmedString(0));

diff --git a/opm/input/eclipse/Schedule/ResCoup/GrupSlav.hpp b/opm/input/eclipse/Schedule/ResCoup/GrupSlav.hpp
@@ -135,15 +135,15 @@ class GrupSlav {
         }
     }
 private:
-    std::string m_name;
-    std::string m_master_group_name;
-    FilterFlag m_oil_prod_flag;
-    FilterFlag m_liquid_prod_flag;
-    FilterFlag m_gas_prod_flag;
-    FilterFlag m_fluid_volume_prod_flag;
-    FilterFlag m_oil_inj_flag;
-    FilterFlag m_water_inj_flag;
-    FilterFlag m_gas_inj_flag;
+    std::string m_name{};
+    std::string m_master_group_name{};
+    FilterFlag m_oil_prod_flag{FilterFlag::BOTH};
+    FilterFlag m_liquid_prod_flag{FilterFlag::BOTH};
+    FilterFlag m_gas_prod_flag{FilterFlag::BOTH};
+    FilterFlag m_fluid_volume_prod_flag{FilterFlag::BOTH};
+    FilterFlag m_oil_inj_flag{FilterFlag::BOTH};
+    FilterFlag m_water_inj_flag{FilterFlag::BOTH};
+    FilterFlag m_gas_inj_flag{FilterFlag::BOTH};
 };
 
 // NOTE: This operator is needed by Boost.Test, See tests/parser/ReservoirCouplingTests.cpp

diff --git a/opm/input/eclipse/Schedule/ResCoup/MasterGroup.hpp b/opm/input/eclipse/Schedule/ResCoup/MasterGroup.hpp
@@ -82,10 +82,10 @@ class MasterGroup {
     }
 
 private:
-    std::string m_name;
-    std::string m_slave_name;
-    std::string m_slave_group_name;
-    double m_flow_limit_fraction;
+    std::string m_name{};
+    std::string m_slave_name{};
+    std::string m_slave_group_name{};
+    double m_flow_limit_fraction{};
 };
 
 

diff --git a/opm/input/eclipse/Schedule/ResCoup/Slaves.hpp b/opm/input/eclipse/Schedule/ResCoup/Slaves.hpp
@@ -80,10 +80,10 @@ class Slave {
         serializer(m_numprocs);
     }
 private:
-    std::string m_name;
-    std::string m_data_filename;
-    std::string m_directory_path;
-    unsigned int m_numprocs;
+    std::string m_name{};
+    std::string m_data_filename{};
+    std::string m_directory_path{};
+    unsigned int m_numprocs{};
 };
 
 } // namespace ReservoirCoupling

diff --git a/tests/parser/LgrOutputTests.cpp b/tests/parser/LgrOutputTests.cpp
@@ -434,8 +434,7 @@ SCHEDULE
     Opm::UnitSystem units(1);
     std::vector<Opm::NNCdata> vecNNC;
     std::array<int,3> global_grid_dim = {3,3,1};
-    std::vector<double> coord_g, zcorn_g, coord_l1, zcorn_l1, coord_l2, zcorn_l2,
-                        coord_g_opm, zcorn_g_opm, coord_l1_opm, zcorn_l1_opm, coord_l2_opm, zcorn_l2_opm;
+    std::vector<double> coord_g, zcorn_g, coord_l1, zcorn_l1, coord_l2, zcorn_l2;
     // Intialize LgrCollection from string.
     LgrCollection lgr_col = read_lgr(deck_string,global_grid_dim[0],global_grid_dim[1],global_grid_dim[2]);
     //  Read global COORD and ZCORN from reference simulator output.

diff --git a/tests/parser/ReservoirCouplingTests.cpp b/tests/parser/ReservoirCouplingTests.cpp
@@ -73,7 +73,7 @@ void assertRaisesInputErrorException(const std::string& schedule_string, bool sl
 }
 
 void checkLastLineStringBuffer(
-    std::ostringstream& stream_buffer,
+    const std::ostringstream& stream_buffer,
     const std::string& expected,
     size_t offset  // Line offset from the end of the string
 ) {

diff --git a/tests/test_Restart.cpp b/tests/test_Restart.cpp
@@ -412,11 +412,11 @@ struct Setup
 };
 
 RestartValue
-first_sim(const Setup&   setup,
-          Action::State& action_state,
-          SummaryState&  st,
-          UDQState&      udq_state,
-          bool           write_double)
+first_sim(const Setup&         setup,
+          const Action::State& action_state,
+          SummaryState&        st,
+          UDQState&            udq_state,
+          bool                 write_double)
 {
     WellTestState wtest_state;
     EclipseIO eclWriter(setup.es, setup.grid, setup.schedule, setup.summary_config);