From 864cce5f5e351e7b241f2c5de7d35c604e48993a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Thu, 14 Mar 2013 13:59:31 +0100
Subject: [PATCH] Adapt to moved opm-core headers.

---
 examples/sim_poly2p_comp_reorder.cpp              | 6 +++---
 examples/sim_poly2p_incomp_reorder.cpp            | 6 +++---
 examples/test_singlecellsolves.cpp                | 6 +++---
 opm/polymer/CompressibleTpfaPolymer.cpp           | 4 ++--
 opm/polymer/IncompPropertiesDefaultPolymer.hpp    | 2 +-
 opm/polymer/IncompTpfaPolymer.cpp                 | 4 ++--
 opm/polymer/SimulatorCompressiblePolymer.cpp      | 4 ++--
 opm/polymer/SimulatorPolymer.cpp                  | 4 ++--
 opm/polymer/TransportModelCompressiblePolymer.cpp | 2 +-
 opm/polymer/TransportModelPolymer.cpp             | 2 +-
 opm/polymer/polymerUtilities.hpp                  | 6 +++---
 11 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/examples/sim_poly2p_comp_reorder.cpp b/examples/sim_poly2p_comp_reorder.cpp
index 69b28f1d9..02aec9902 100644
--- a/examples/sim_poly2p_comp_reorder.cpp
+++ b/examples/sim_poly2p_comp_reorder.cpp
@@ -35,9 +35,9 @@
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 
-#include <opm/core/fluid/BlackoilPropertiesBasic.hpp>
-#include <opm/core/fluid/BlackoilPropertiesFromDeck.hpp>
-#include <opm/core/fluid/RockCompressibility.hpp>
+#include <opm/core/props/BlackoilPropertiesBasic.hpp>
+#include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
+#include <opm/core/props/rock/RockCompressibility.hpp>
 
 #include <opm/core/linalg/LinearSolverFactory.hpp>
 
diff --git a/examples/sim_poly2p_incomp_reorder.cpp b/examples/sim_poly2p_incomp_reorder.cpp
index 1829938f6..208894ac3 100644
--- a/examples/sim_poly2p_incomp_reorder.cpp
+++ b/examples/sim_poly2p_incomp_reorder.cpp
@@ -35,9 +35,9 @@
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 
-#include <opm/core/fluid/IncompPropertiesBasic.hpp>
-#include <opm/core/fluid/IncompPropertiesFromDeck.hpp>
-#include <opm/core/fluid/RockCompressibility.hpp>
+#include <opm/core/props/IncompPropertiesBasic.hpp>
+#include <opm/core/props/IncompPropertiesFromDeck.hpp>
+#include <opm/core/props/rock/RockCompressibility.hpp>
 
 #include <opm/core/linalg/LinearSolverFactory.hpp>
 
diff --git a/examples/test_singlecellsolves.cpp b/examples/test_singlecellsolves.cpp
index e5a143d7b..b18a87751 100644
--- a/examples/test_singlecellsolves.cpp
+++ b/examples/test_singlecellsolves.cpp
@@ -35,9 +35,9 @@
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 
-#include <opm/core/fluid/IncompPropertiesBasic.hpp>
-#include <opm/core/fluid/IncompPropertiesFromDeck.hpp>
-#include <opm/core/fluid/RockCompressibility.hpp>
+#include <opm/core/props/IncompPropertiesBasic.hpp>
+#include <opm/core/props/IncompPropertiesFromDeck.hpp>
+#include <opm/core/props/rock/RockCompressibility.hpp>
 
 #include <opm/core/linalg/LinearSolverFactory.hpp>
 
diff --git a/opm/polymer/CompressibleTpfaPolymer.cpp b/opm/polymer/CompressibleTpfaPolymer.cpp
index 0c0a5d2f8..5f9261367 100644
--- a/opm/polymer/CompressibleTpfaPolymer.cpp
+++ b/opm/polymer/CompressibleTpfaPolymer.cpp
@@ -20,8 +20,8 @@
 
 #include <opm/polymer/PolymerBlackoilState.hpp>
 #include <opm/polymer/CompressibleTpfaPolymer.hpp>
-#include <opm/core/fluid/BlackoilPropertiesInterface.hpp>
-#include <opm/core/fluid/RockCompressibility.hpp>
+#include <opm/core/props/BlackoilPropertiesInterface.hpp>
+#include <opm/core/props/rock/RockCompressibility.hpp>
 #include <opm/core/pressure/tpfa/ifs_tpfa.h>
 #include <opm/core/pressure/tpfa/trans_tpfa.h>
 #include <opm/core/pressure/mimetic/mimetic.h>
diff --git a/opm/polymer/IncompPropertiesDefaultPolymer.hpp b/opm/polymer/IncompPropertiesDefaultPolymer.hpp
index 3376780ce..b58d8bb0d 100644
--- a/opm/polymer/IncompPropertiesDefaultPolymer.hpp
+++ b/opm/polymer/IncompPropertiesDefaultPolymer.hpp
@@ -20,7 +20,7 @@
 #ifndef OPM_INCOMPPROPERTIESDEFAULTPOLYMER_HEADER_INCLUDED
 #define OPM_INCOMPPROPERTIESDEFAULTPOLYMER_HEADER_INCLUDED
 
-#include <opm/core/fluid/IncompPropertiesBasic.hpp>
+#include <opm/core/props/IncompPropertiesBasic.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/utility/ErrorMacros.hpp>
 #include <opm/core/utility/linearInterpolation.hpp>
diff --git a/opm/polymer/IncompTpfaPolymer.cpp b/opm/polymer/IncompTpfaPolymer.cpp
index e641ba107..de2d7c0d3 100644
--- a/opm/polymer/IncompTpfaPolymer.cpp
+++ b/opm/polymer/IncompTpfaPolymer.cpp
@@ -20,8 +20,8 @@
 
 #include <opm/polymer/IncompTpfaPolymer.hpp>
 
-#include <opm/core/fluid/IncompPropertiesInterface.hpp>
-#include <opm/core/fluid/RockCompressibility.hpp>
+#include <opm/core/props/IncompPropertiesInterface.hpp>
+#include <opm/core/props/rock/RockCompressibility.hpp>
 #include <opm/core/pressure/tpfa/ifs_tpfa.h>
 #include <opm/core/pressure/tpfa/trans_tpfa.h>
 #include <opm/core/pressure/mimetic/mimetic.h>
diff --git a/opm/polymer/SimulatorCompressiblePolymer.cpp b/opm/polymer/SimulatorCompressiblePolymer.cpp
index 4570901da..23681d2ce 100644
--- a/opm/polymer/SimulatorCompressiblePolymer.cpp
+++ b/opm/polymer/SimulatorCompressiblePolymer.cpp
@@ -40,8 +40,8 @@
 
 #include <opm/core/wells/WellsManager.hpp>
 
-#include <opm/core/fluid/BlackoilPropertiesInterface.hpp>
-#include <opm/core/fluid/RockCompressibility.hpp>
+#include <opm/core/props/BlackoilPropertiesInterface.hpp>
+#include <opm/core/props/rock/RockCompressibility.hpp>
 
 #include <opm/core/utility/ColumnExtract.hpp>
 #include <opm/core/utility/Units.hpp>
diff --git a/opm/polymer/SimulatorPolymer.cpp b/opm/polymer/SimulatorPolymer.cpp
index 291b9bd06..539ae9575 100644
--- a/opm/polymer/SimulatorPolymer.cpp
+++ b/opm/polymer/SimulatorPolymer.cpp
@@ -40,8 +40,8 @@
 
 #include <opm/core/wells/WellsManager.hpp>
 
-#include <opm/core/fluid/IncompPropertiesInterface.hpp>
-#include <opm/core/fluid/RockCompressibility.hpp>
+#include <opm/core/props/IncompPropertiesInterface.hpp>
+#include <opm/core/props/rock/RockCompressibility.hpp>
 
 #include <opm/core/utility/ColumnExtract.hpp>
 #include <opm/core/utility/Units.hpp>
diff --git a/opm/polymer/TransportModelCompressiblePolymer.cpp b/opm/polymer/TransportModelCompressiblePolymer.cpp
index 8e3d51e56..3b39b7169 100644
--- a/opm/polymer/TransportModelCompressiblePolymer.cpp
+++ b/opm/polymer/TransportModelCompressiblePolymer.cpp
@@ -19,7 +19,7 @@
 
 
 #include <opm/polymer/TransportModelCompressiblePolymer.hpp>
-#include <opm/core/fluid/BlackoilPropertiesInterface.hpp>
+#include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/transport/reorder/reordersequence.h>
 #include <opm/core/utility/RootFinders.hpp>
diff --git a/opm/polymer/TransportModelPolymer.cpp b/opm/polymer/TransportModelPolymer.cpp
index af79968d9..7389efc4f 100644
--- a/opm/polymer/TransportModelPolymer.cpp
+++ b/opm/polymer/TransportModelPolymer.cpp
@@ -19,7 +19,7 @@
 
 
 #include <opm/polymer/TransportModelPolymer.hpp>
-#include <opm/core/fluid/IncompPropertiesInterface.hpp>
+#include <opm/core/props/IncompPropertiesInterface.hpp>
 #include <opm/core/grid.h>
 #include <opm/core/utility/RootFinders.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
diff --git a/opm/polymer/polymerUtilities.hpp b/opm/polymer/polymerUtilities.hpp
index b6510b9dc..4328a3c9c 100644
--- a/opm/polymer/polymerUtilities.hpp
+++ b/opm/polymer/polymerUtilities.hpp
@@ -22,12 +22,12 @@
 
 
 #include <opm/core/grid.h>
-#include <opm/core/fluid/IncompPropertiesInterface.hpp>
-#include <opm/core/fluid/BlackoilPropertiesInterface.hpp>
+#include <opm/core/props/IncompPropertiesInterface.hpp>
+#include <opm/core/props/BlackoilPropertiesInterface.hpp>
 #include <opm/polymer/PolymerProperties.hpp>
 #include <opm/polymer/PolymerState.hpp>
 #include <opm/polymer/PolymerBlackoilState.hpp>
-#include <opm/core/fluid/RockCompressibility.hpp>
+#include <opm/core/props/rock/RockCompressibility.hpp>
 #include <opm/core/utility/SparseVector.hpp>
 #include <vector>