Merge pull request #3378 from akva2/janitoring

Quell some warnings in static analyzers

ebos/eclgenericoutputblackoilmodule.hh

@@ -44,7 +44,7 @@
 
 namespace Opm {
 
-namespace data { struct Solution; }
+namespace data { class Solution; }
 class EclipseState;
 
 template<class FluidSystem, class Scalar>

opm/simulators/linalg/bda/Reorder.cpp

@@ -37,7 +37,7 @@ namespace bda
 template <unsigned int block_size>
 int colorBlockedNodes(int rows, const int *CSRRowPointers, const int *CSRColIndices, const int *CSCColPointers, const int *CSCRowIndices, std::vector<int>& colors, int maxRowsPerColor, int maxColsPerColor)
 {
-    int left, c;
+    int left, c=-1;
     const int max_tries = 100;            // since coloring is random, it is possible that a coloring fails. In that case, try again.
     std::vector<int> randoms;
     randoms.resize(rows);
@@ -365,4 +365,4 @@ INSTANTIATE_BDA_FUNCTIONS(4);
 
 #undef INSTANTIATE_BDA_FUNCTIONS
 
-} //namespace bda
+} //namespace bda

opm/simulators/wells/BlackoilWellModel.hpp

@@ -130,18 +130,18 @@ namespace Opm {
             /////////////
             // <eWoms auxiliary module stuff>
             /////////////
-            unsigned numDofs() const
+            unsigned numDofs() const override
             // No extra dofs are inserted for wells. (we use a Schur complement.)
             { return 0; }
 
-            void addNeighbors(std::vector<NeighborSet>& neighbors) const;
+            void addNeighbors(std::vector<NeighborSet>& neighbors) const override;
 
-            void applyInitial()
+            void applyInitial() override
             {}
 
-            void linearize(SparseMatrixAdapter& jacobian, GlobalEqVector& res);
+            void linearize(SparseMatrixAdapter& jacobian, GlobalEqVector& res) override;
 
-            void postSolve(GlobalEqVector& deltaX)
+            void postSolve(GlobalEqVector& deltaX) override
             {
                 recoverWellSolutionAndUpdateWellState(deltaX);
             }

opm/simulators/wells/BlackoilWellModelGeneric.hpp

@@ -48,7 +48,7 @@ namespace Opm {
 namespace data {
 struct GroupData;
 struct GroupGuideRates;
-struct GroupAndNetworkValues;
+class GroupAndNetworkValues;
 struct NodeData;
 }