From b39e579197b248fcf801ecfd9edca39fa7bae9a3 Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Wed, 17 Feb 2016 12:24:13 +0100
Subject: [PATCH] fix the fallout of the removal of the opm-core black-oil PVT
 classes

---
 opm/autodiff/BlackoilPropsAdFromDeck.cpp | 23 ++++++++---------------
 opm/autodiff/SolventPropsAdFromDeck.cpp  |  4 ++--
 opm/autodiff/SolventPropsAdFromDeck.hpp  |  4 +---
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/opm/autodiff/BlackoilPropsAdFromDeck.cpp b/opm/autodiff/BlackoilPropsAdFromDeck.cpp
index 904c4faad..97468642c 100644
--- a/opm/autodiff/BlackoilPropsAdFromDeck.cpp
+++ b/opm/autodiff/BlackoilPropsAdFromDeck.cpp
@@ -22,27 +22,20 @@
 #include <config.h>
 
 #include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
+#include <opm/autodiff/AutoDiffHelpers.hpp>
+
+#include <opm/core/props/BlackoilPropertiesInterface.hpp>
+#include <opm/core/props/BlackoilPhases.hpp>
+#include <opm/core/utility/Units.hpp>
+#include <opm/core/utility/extractPvtTableIndex.hpp>
 
 #include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
 
-#include <opm/autodiff/AutoDiffHelpers.hpp>
-#include <opm/core/props/BlackoilPropertiesInterface.hpp>
-#include <opm/core/props/BlackoilPhases.hpp>
-#include <opm/core/props/pvt/PvtInterface.hpp>
-#include <opm/core/props/pvt/PvtConstCompr.hpp>
-#include <opm/core/props/pvt/PvtDead.hpp>
-#include <opm/core/props/pvt/PvtDeadSpline.hpp>
-#include <opm/core/props/pvt/PvtLiveOil.hpp>
-#include <opm/core/props/pvt/PvtLiveGas.hpp>
-#include <opm/core/props/pvt/ThermalWaterPvtWrapper.hpp>
-#include <opm/core/props/pvt/ThermalOilPvtWrapper.hpp>
-#include <opm/core/props/pvt/ThermalGasPvtWrapper.hpp>
-#include <opm/common/ErrorMacros.hpp>
-#include <opm/core/utility/Units.hpp>
-
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
 
+#include <opm/common/ErrorMacros.hpp>
+
 namespace Opm
 {
     // Making these typedef to make the code more readable.
diff --git a/opm/autodiff/SolventPropsAdFromDeck.cpp b/opm/autodiff/SolventPropsAdFromDeck.cpp
index 2fd967021..880c7fad6 100644
--- a/opm/autodiff/SolventPropsAdFromDeck.cpp
+++ b/opm/autodiff/SolventPropsAdFromDeck.cpp
@@ -21,12 +21,13 @@
 #include <opm/autodiff/SolventPropsAdFromDeck.hpp>
 #include <opm/autodiff/AutoDiffHelpers.hpp>
 
+#include <opm/core/utility/extractPvtTableIndex.hpp>
+
 #include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/PvdsTable.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/SsfnTable.hpp>
 #include <opm/parser/eclipse/EclipseState/Tables/Sof2Table.hpp>
 
-
 namespace Opm
 {
 // Making these typedef to make the code more readable.
@@ -383,7 +384,6 @@ ADB SolventPropsAdFromDeck::makeADBfromTables(const ADB& X_AD,
 }
 
 
-
 V SolventPropsAdFromDeck::solventSurfaceDensity(const Cells& cells) const {
     const int n = cells.size();
     V density(n);
diff --git a/opm/autodiff/SolventPropsAdFromDeck.hpp b/opm/autodiff/SolventPropsAdFromDeck.hpp
index 4aa69b4c4..e22f01847 100644
--- a/opm/autodiff/SolventPropsAdFromDeck.hpp
+++ b/opm/autodiff/SolventPropsAdFromDeck.hpp
@@ -23,8 +23,7 @@
 #include <opm/autodiff/BlackoilPropsAdInterface.hpp>
 #include <opm/autodiff/AutoDiffBlock.hpp>
 
-#include <opm/core/props/pvt/PvtDead.hpp>
-#include <opm/core/props/pvt/PvtInterface.hpp>
+#include <opm/core/utility/NonuniformTableLinear.hpp>
 
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
@@ -139,7 +138,6 @@ public:
 
 
 private:
-
     /// Makes ADB from table values
     /// \param[in]  X               Array of n table lookup values.
     /// \param[in]  cells           Array of n cell indices to be associated with the fraction values.