From e0a1abba094def0b8be12a342091afc640b52f2b Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Thu, 26 Nov 2015 12:20:15 +0100
Subject: [PATCH] adapt to the "mutable geology" changes from opm-autodiff

---
 examples/flow_polymer.cpp                                       | 2 +-
 examples/sim_poly_fi2p_comp_ad.cpp                              | 2 +-
 .../fullyimplicit/SimulatorFullyImplicitBlackoilPolymer.hpp     | 2 +-
 .../SimulatorFullyImplicitBlackoilPolymer_impl.hpp              | 2 +-
 .../fullyimplicit/SimulatorFullyImplicitCompressiblePolymer.hpp | 2 +-
 .../SimulatorFullyImplicitCompressiblePolymer_impl.hpp          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/flow_polymer.cpp b/examples/flow_polymer.cpp
index 7bf08c00a..72b19c8a6 100644
--- a/examples/flow_polymer.cpp
+++ b/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);
diff --git a/examples/sim_poly_fi2p_comp_ad.cpp b/examples/sim_poly_fi2p_comp_ad.cpp
index 0ef44ab29..018910970 100644
--- a/examples/sim_poly_fi2p_comp_ad.cpp
+++ b/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);
diff --git a/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer.hpp b/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer.hpp
index 19f60ae40..091e22f8b 100644
--- a/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer.hpp
+++ b/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,
diff --git a/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer_impl.hpp b/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer_impl.hpp
index cc44f1be6..b6d78b74f 100644
--- a/opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer_impl.hpp
+++ b/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,
diff --git a/opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer.hpp b/opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer.hpp
index fb61d04ea..fdae6d0d5 100644
--- a/opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer.hpp
+++ b/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,
diff --git a/opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer_impl.hpp b/opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer_impl.hpp
index f8b300d3e..ab722f1fa 100644
--- a/opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer_impl.hpp
+++ b/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,