Merge pull request #658 from atgeirr/master

Silence some recently introduced warnings.

opm/autodiff/SimulatorBase.hpp

@@ -158,7 +158,6 @@ namespace Opm
                     WellState& xw);
 
         void computeWellPotentials(const Wells*                    wells,
-                                   const BlackoilState&            x,
                                    const WellState& xw,
                                    std::vector<double>& well_potentials);
 

opm/autodiff/SimulatorBase_impl.hpp

@@ -225,7 +225,7 @@ namespace Opm
             // The well potentials are only computed if they are needed
             // For now thay are only used to determine default guide rates for group controlled wells
             if ( is_well_potentials_computed ) {
-                asImpl().computeWellPotentials(wells, state, well_state, well_potentials);
+                asImpl().computeWellPotentials(wells, well_state, well_potentials);
             }
 
         }
@@ -391,7 +391,6 @@ namespace Opm
 
     template <class Implementation>
     void SimulatorBase<Implementation>::computeWellPotentials(const Wells* wells,
-                                                              const BlackoilState& x,
                                                               const WellState& xw,
                                                               std::vector<double>& well_potentials)
     {

opm/autodiff/StandardWells_impl.hpp

@@ -181,6 +181,8 @@ namespace Opm
                                                 std::vector<double>& rvmax_perf,
                                                 std::vector<double>& surf_dens_perf)
     {
+        static_cast<void>(active); // Silence unused argument warning in release mode.
+
         const int nperf = wells().well_connpos[wells().number_of_wells];
         const int nw = wells().number_of_wells;