Merge pull request #604 from atgeirr/minor-fixes

Fix minor initialization and overriding bugs.

opm/autodiff/BlackoilModelBase_impl.hpp

@@ -178,7 +178,8 @@ namespace detail {
         , residual_ ( { std::vector<ADB>(fluid.numPhases(), ADB::null()),
                         ADB::null(),
                         ADB::null(),
-                        { 1.1169, 1.0031, 0.0031 }} ) // the default magic numbers
+                        { 1.1169, 1.0031, 0.0031 }, // the default magic numbers
+                        false } )
         , terminal_output_ (terminal_output)
         , material_name_{ "Water", "Oil", "Gas" }
         , current_relaxation_(1.0)

opm/polymer/IncompTpfaPolymer.cpp

@@ -116,7 +116,7 @@ namespace Opm
 
     /// Compute per-solve dynamic properties.
     void IncompTpfaPolymer::computePerSolveDynamicData(const double /*dt*/,
-                                                       const PolymerState& state,
+                                                       const SimulatorState& state,
                                                        const WellState& /*well_state*/)
     {
         // Computed here:

opm/polymer/IncompTpfaPolymer.hpp

@@ -96,7 +96,7 @@ namespace Opm
 
     private:
         virtual void computePerSolveDynamicData(const double dt,
-                                                const PolymerState& state,
+                                                const SimulatorState& state,
                                                 const WellState& well_state);
     private:
         // ------ Data that will remain unmodified after construction. ------