From 6852be422c458f6deb43ef6fc22eba7b561a02e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halvor=20M=C3=B8ll=20Nilsen?= <Halvor.M.Nilsen@sintef.no>
Date: Tue, 28 Aug 2012 16:41:06 +0200
Subject: [PATCH] Added new SatFuncSimple fluid. Introduced a simple fluid
 which has no problem with strange black oil behavior. Intended for testing,
 but for now it is used in SaturationPropsFromDeck.

---
 opm/core/fluid/SaturationPropsFromDeck.hpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/opm/core/fluid/SaturationPropsFromDeck.hpp b/opm/core/fluid/SaturationPropsFromDeck.hpp
index 2c6a89a06..bd70d8029 100644
--- a/opm/core/fluid/SaturationPropsFromDeck.hpp
+++ b/opm/core/fluid/SaturationPropsFromDeck.hpp
@@ -24,6 +24,7 @@
 #include <opm/core/utility/UniformTableLinear.hpp>
 #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
 #include <opm/core/fluid/SatFuncStone2.hpp>
+#include <opm/core/fluid/SatFuncSimple.hpp>
 #include <vector>
 
 struct UnstructuredGrid;
@@ -92,11 +93,12 @@ namespace Opm
 		      double* smax) const;
 
     private:
-        PhaseUsage phase_usage_;        
-        std::vector<SatFuncStone2> satfuncset_;
+        PhaseUsage phase_usage_;
+        typedef SatFuncSimple satfunc_t;
+        std::vector<satfunc_t> satfuncset_;
         std::vector<int> cell_to_func_; // = SATNUM - 1
 
-        const SatFuncStone2& funcForCell(const int cell) const;
+        const satfunc_t& funcForCell(const int cell) const;
     };