Merge pull request #817 from akva2/janitoring

Some janitoring

opm/parser/eclipse/EclipseState/Schedule/Well/Well2.hpp

@@ -41,7 +41,7 @@ namespace Opm {
 class DeckRecord;
 class EclipseGrid;
 class DeckKeyword;
-class WellInjectionProperties;
+struct WellInjectionProperties;
 class WellProductionProperties;
 
 struct WellGuideRate {

src/opm/output/eclipse/CreateInteHead.cpp

@@ -192,7 +192,7 @@ namespace {
 
         const auto nsegwl =
             std::count_if(std::begin(sched_wells), std::end(sched_wells),
-                          [lookup_step](const Opm::Well2& well)
+                          [](const Opm::Well2& well)
             {
                 return well.isMultiSegment();
             });

src/opm/output/eclipse/Summary.cpp

@@ -382,8 +382,7 @@ inline quantity rate( const fn_args& args ) {
 template< bool injection >
 inline quantity flowing( const fn_args& args ) {
     const auto& wells = args.wells;
-    const auto ts = args.sim_step;
-    auto pred = [&wells,ts]( const Well2& w ) {
+    auto pred = [&wells]( const Well2& w ) {
         const auto& name = w.name();
         return w.isInjector( ) == injection
             && wells.count( name ) > 0

src/opm/parser/eclipse/EclipseState/Schedule/MSW/Compsegs.cpp

@@ -68,8 +68,8 @@ namespace Opm {
 
             const std::string& well_name = compsegsKeyword.getRecord(0).getItem("WELL").getTrimmedString(0);
 
-            double distance_start;
-            double distance_end;
+            double distance_start = 0.0;
+            double distance_end = -1.0;
             if (record.getItem<ParserKeywords::COMPSEGS::DISTANCE_START>().hasValue(0)) {
                 distance_start = record.getItem<ParserKeywords::COMPSEGS::DISTANCE_START>().getSIDouble(0);
             } else if (recordIndex == 1) {

src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQParser.hpp

@@ -66,8 +66,8 @@ public:
   static UDQASTNode parse(const UDQParams& udq_params, UDQVarType target_type, const std::string& target_var, const std::vector<std::string>& tokens, const ParseContext& parseContext, ErrorGuard& errors);
 
 private:
-    UDQParser(const UDQParams& udq_params, const std::vector<std::string>& tokens) :
-        udq_params(udq_params),
+    UDQParser(const UDQParams& udq_params1, const std::vector<std::string>& tokens) :
+        udq_params(udq_params1),
         udqft(UDQFunctionTable(udq_params)),
         tokens(tokens)
     {}