From 9ee3b6e3dec867973b37923f0cede40531478f19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Tue, 23 Nov 2010 09:02:09 +0100
Subject: [PATCH] Tpfa tess compiles with BlackoilFluid.

---
 dune/porsol/blackoil/BlackoilFluid.hpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/dune/porsol/blackoil/BlackoilFluid.hpp b/dune/porsol/blackoil/BlackoilFluid.hpp
index 914ceb6b..589479d3 100644
--- a/dune/porsol/blackoil/BlackoilFluid.hpp
+++ b/dune/porsol/blackoil/BlackoilFluid.hpp
@@ -31,13 +31,10 @@
 namespace Opm
 {
 
-    class BlackoilFluid
+    class BlackoilFluid : public BlackoilDefs
     {
     public:
-        enum { numPhases = 3 };
-        enum { numComponents = 3 };
-        typedef Dune::FieldVector<double, numPhases> PhaseVec;
-        typedef Dune::FieldVector<double, numComponents> CompVec;
+        typedef FluidStateBlackoil FluidState;
 
         void init(const Dune::EclipseGridParser& parser)
         {
@@ -45,9 +42,9 @@ namespace Opm
             FluidSystemBlackoil<>::init(parser);
         }
 
-        FluidStateBlackoil computeState(PhaseVec phase_pressure, CompVec z)
+        FluidState computeState(PhaseVec phase_pressure, CompVec z) const
         {
-            FluidStateBlackoil state;
+            FluidState state;
             state.temperature_ = 300;
             state.phase_pressure_ = phase_pressure;
             state.surface_volume_ = z;