From 3660ec8e8cddcadfef4279591f453bd1ce597acf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Tue, 5 Jun 2012 15:45:41 +0200
Subject: [PATCH 1/2] Follow headers that were moved in opm-core.

---
 examples/polymer_reorder.cpp | 4 ++--
 opm/polymer/PolymerState.hpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/polymer_reorder.cpp b/examples/polymer_reorder.cpp
index a0942daee..b15d1d973 100644
--- a/examples/polymer_reorder.cpp
+++ b/examples/polymer_reorder.cpp
@@ -28,7 +28,7 @@
 #include <opm/core/grid.h>
 #include <opm/core/GridManager.hpp>
 #include <opm/core/newwells.h>
-#include <opm/core/WellsManager.hpp>
+#include <opm/core/wells/WellsManager.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/initState.hpp>
 #include <opm/core/utility/SimulatorTimer.hpp>
@@ -53,7 +53,7 @@
 #include <opm/core/transport/CSRMatrixBlockAssembler.hpp>
 #include <opm/core/transport/SinglePointUpwindTwoPhase.hpp>
 
-#include <opm/core/ColumnExtract.hpp>
+#include <opm/core/utility/ColumnExtract.hpp>
 
 #include <opm/polymer/PolymerState.hpp>
 #include <opm/polymer/SinglePointUpwindTwoPhasePolymer.hpp>
diff --git a/opm/polymer/PolymerState.hpp b/opm/polymer/PolymerState.hpp
index 99488abe3..de09c5f36 100644
--- a/opm/polymer/PolymerState.hpp
+++ b/opm/polymer/PolymerState.hpp
@@ -21,7 +21,7 @@
 #define OPM_POLYMERSTATE_HEADER_INCLUDED
 
 
-#include <opm/core/TwophaseState.hpp>
+#include <opm/core/simulator/TwophaseState.hpp>
 #include <opm/core/grid.h>
 #include <vector>
 

From 6a9dc03085d6d0d616593d1a2dc40bda41aa90df Mon Sep 17 00:00:00 2001
From: Xavier Raynaud <xavier.raynaud@sintef.no>
Date: Thu, 7 Jun 2012 13:45:09 +0200
Subject: [PATCH 2/2] Change copy assignment to reference.

---
 opm/polymer/TransportModelPolymer.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/opm/polymer/TransportModelPolymer.cpp b/opm/polymer/TransportModelPolymer.cpp
index cc94dc7f7..f28cf8439 100644
--- a/opm/polymer/TransportModelPolymer.cpp
+++ b/opm/polymer/TransportModelPolymer.cpp
@@ -151,7 +151,7 @@ namespace
 	double operator()(const double t) const;
 	CurveInSCPlane curve;
     private:
-	Opm::TransportModelPolymer::ResidualEquation res_eq_;
+	const Opm::TransportModelPolymer::ResidualEquation& res_eq_;
     };
 
     // Compute the "c" residual along the curve "curve" for a given residual equation "res_eq".
@@ -163,7 +163,7 @@ namespace
 	double operator()(const double t) const;
 	CurveInSCPlane curve;
     private:
-	Opm::TransportModelPolymer::ResidualEquation res_eq_;
+	const Opm::TransportModelPolymer::ResidualEquation& res_eq_;
     };
 
 }