Merge pull request #4672 from akva2/janitoring

Some janitoring

ebos/eclalugridvanguard.hh

@@ -188,19 +188,20 @@ public:
     }
 
     template<class DataHandle>
-    void scatterData(DataHandle& handle) const
+    void scatterData(DataHandle& /*handle*/) const
     {
     // not existing for this type of grid yet
     }
 
     template<class DataHandle>
-    void gatherData(DataHandle& handle) const
+    void gatherData(DataHandle& /*handle*/) const
     {
     // not existing for this type of grid yet
     }
 
     template<class DataHandle, class InterfaceType, class CommunicationDirection>
-    void communicate (DataHandle& data, InterfaceType iftype, CommunicationDirection dir) const
+    void communicate (DataHandle& /*data*/, InterfaceType /*iftype*/,
+                      CommunicationDirection /*dir*/) const
     {
     // not existing for this type of grid yet
     }

ebos/eclgenericwriter.cc

@@ -351,7 +351,6 @@ exportNncStructure_(const std::unordered_map<int,int>& cartesianToActive, const
     std::size_t ny = eclState_.getInputGrid().getNY();
     auto nncData = eclState_.getInputNNC().input();
     const auto& unitSystem = eclState_.getDeckUnitSystem();
-    std::size_t index = 0;
 
     for( const auto& entry : nncData ) {
         // test whether NNC is not a neighboring connection
@@ -365,7 +364,6 @@ exportNncStructure_(const std::unordered_map<int,int>& cartesianToActive, const
             if ( tt >= 1.0e-6 )
                 outputNnc_.emplace_back(entry.cell1, entry.cell2, entry.trans);
         }
-        ++index;
     }
 
     using GlobalGridView = typename EquilGrid::LeafGridView;

ebos/ecltransmissibility.cc

@@ -932,7 +932,7 @@ applyEditNncToGridTransHelper_(const std::unordered_map<std::size_t,int>& global
         return fmt::format("({},{},{})", i + 1,j + 1,k + 1);
     };
 
-    auto print_warning = [&format_ijk, &nncs, &getLocation, &keyword] (const NNCdata& nnc) {
+    auto print_warning = [&format_ijk, &getLocation, &keyword] (const NNCdata& nnc) {
             const auto& location = getLocation( nnc );
             auto warning =  fmt::format("Problem with {} keyword\n"
                                         "In {} line {} \n"

opm/simulators/wells/MultisegmentWell_impl.hpp

@@ -1078,6 +1078,7 @@ namespace Opm
         auto obtain = [this](const Eval& value)
                       {
                           if constexpr (std::is_same_v<Value, Scalar>) {
+                              (void)this; // suppress clang warning
                               return getValue(value);
                           } else {
                               return this->extendEval(value);

opm/simulators/wells/StandardWell_impl.hpp

@@ -869,6 +869,7 @@ namespace Opm
         auto obtain = [this](const Eval& value)
                       {
                           if constexpr (std::is_same_v<Value, Scalar>) {
+                              (void)this; // suppress clang warning
                               return getValue(value);
                           } else {
                               return this->extendEval(value);

opm/simulators/wells/WellAssemble.hpp

@@ -41,8 +41,8 @@ class Schedule;
 class SummaryState;
 template<class FluidSystem> class WellInterfaceFluidSystem;
 class WellState;
-class WellInjectionControls;
-class WellProductionControls;
+struct WellInjectionControls;
+struct WellProductionControls;
 
 template<class FluidSystem>
 class WellAssemble {

tests/test_equil.cc

@@ -512,14 +512,11 @@ BOOST_AUTO_TEST_CASE(RegMapping)
     for (const auto& r : eqlmap.activeRegions()) {
         ptable.equilibrate(region[r], vspan);
 
-        PVal::size_type i = 0;
         for (const auto& c : eqlmap.cells(r)) {
             const auto depth = centerDepth(*simulator, c);
 
             ppress[0][c] = ptable.water(depth);
             ppress[1][c] = ptable.oil  (depth);
-
-            ++i;
         }
     }