Merge pull request #161 from andlaus/implement_MULTFLT_in_SCHEDULE_section

adapt to the "mutable geology" changes from opm-autodiff

examples/flow_polymer.cpp

@@ -315,7 +315,7 @@ try
         std::cout << "\n\n================ Starting main simulation loop ===============\n"
                   << std::flush;
 
-        SimulatorReport fullReport = simulator.run(simtimer, state);
+        SimulatorReport fullReport = simulator.run(eclipseState, simtimer, state);
 
         std::cout << "\n\n================    End of simulation     ===============\n\n";
         fullReport.report(std::cout);

examples/sim_poly_fi2p_comp_ad.cpp

@@ -254,7 +254,7 @@ try
                   deck,
                   *fis_solver,
                   grav);
-    fullReport= simulator.run(simtimer, state);
+    fullReport= simulator.run(eclipseState, simtimer, state);
 
     std::cout << "\n\n================    End of simulation     ===============\n\n";
     fullReport.report(std::cout);

opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer.hpp

@@ -107,7 +107,7 @@ namespace Opm
     public:
         SimulatorFullyImplicitBlackoilPolymer(const parameter::ParameterGroup& param,
                                               const GridT& grid,
-                                              const DerivedGeology& geo,
+                                              DerivedGeology& geo,
                                               BlackoilPropsAdInterface& props,
                                               const PolymerPropsAd& polymer_props,
                                               const RockCompressibility* rock_comp_props,

opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer_impl.hpp

@@ -25,7 +25,7 @@ namespace Opm
     SimulatorFullyImplicitBlackoilPolymer<GridT>::
     SimulatorFullyImplicitBlackoilPolymer(const parameter::ParameterGroup& param,
                                           const GridT& grid,
-                                          const DerivedGeology& geo,
+                                          DerivedGeology& geo,
                                           BlackoilPropsAdInterface& props,
                                           const PolymerPropsAd& polymer_props,
                                           const RockCompressibility* rock_comp_props,

opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer.hpp

@@ -99,7 +99,7 @@ namespace Opm
         /// Initialise from parameters and objects to observe.
         SimulatorFullyImplicitCompressiblePolymer(const parameter::ParameterGroup& param,
                                                   const GridT& grid,
-                                                  const DerivedGeology& geo,
+                                                  DerivedGeology& geo,
                                                   BlackoilPropsAdInterface& props,
                                                   const PolymerPropsAd&    polymer_props,
                                                   const RockCompressibility* rock_comp_props,

opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer_impl.hpp

@@ -28,7 +28,7 @@ template <class GridT>
 SimulatorFullyImplicitCompressiblePolymer<GridT>::
 SimulatorFullyImplicitCompressiblePolymer(const parameter::ParameterGroup& param,
                                           const GridT& grid,
-                                          const DerivedGeology& geo,
+                                          DerivedGeology& geo,
                                           BlackoilPropsAdInterface& props,
                                           const PolymerPropsAd&    polymer_props,
                                           const RockCompressibility* rock_comp_props,