From 94c04f343d5187701bc1461fa90825af69ca9849 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 14:27:14 +0200
Subject: [PATCH] Added param initializer on fluids with param to addjust table
 length. Moved internal class SatFunc to SatFuncStone2.

---
 opm/core/fluid/BlackoilPropertiesFromDeck.cpp | 16 ++++++++-
 opm/core/fluid/BlackoilPropertiesFromDeck.hpp |  7 ++--
 opm/core/fluid/SaturationPropsFromDeck.hpp    | 33 +++++--------------
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/opm/core/fluid/BlackoilPropertiesFromDeck.cpp b/opm/core/fluid/BlackoilPropertiesFromDeck.cpp
index 004e6f88f..ae6a61306 100644
--- a/opm/core/fluid/BlackoilPropertiesFromDeck.cpp
+++ b/opm/core/fluid/BlackoilPropertiesFromDeck.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <opm/core/fluid/BlackoilPropertiesFromDeck.hpp>
-
+#include <opm/core/utility/parameters/ParameterGroup.hpp>
 namespace Opm
 {
 
@@ -34,6 +34,20 @@ namespace Opm
 	}
     }
 
+    BlackoilPropertiesFromDeck::BlackoilPropertiesFromDeck(const EclipseGridParser& deck,
+                                                           const UnstructuredGrid& grid,
+                                                           const parameter::ParameterGroup& param)
+    {
+        rock_.init(deck, grid);
+        pvt_.init(deck);
+        satprops_.init(deck, grid, param);
+
+        if (pvt_.numPhases() != satprops_.numPhases()) {
+            THROW("BlackoilPropertiesBasic::BlackoilPropertiesBasic() - Inconsistent number of phases in pvt data ("
+                  << pvt_.numPhases() << ") and saturation-dependent function data (" << satprops_.numPhases() << ").");
+        }
+    }
+
     BlackoilPropertiesFromDeck::~BlackoilPropertiesFromDeck()
     {
     }
diff --git a/opm/core/fluid/BlackoilPropertiesFromDeck.hpp b/opm/core/fluid/BlackoilPropertiesFromDeck.hpp
index a2a6c3de9..1d0a0d380 100644
--- a/opm/core/fluid/BlackoilPropertiesFromDeck.hpp
+++ b/opm/core/fluid/BlackoilPropertiesFromDeck.hpp
@@ -26,6 +26,7 @@
 #include <opm/core/fluid/blackoil/BlackoilPvtProperties.hpp>
 #include <opm/core/fluid/SaturationPropsFromDeck.hpp>
 #include <opm/core/eclipse/EclipseGridParser.hpp>
+#include <opm/core/utility/parameters/ParameterGroup.hpp>
 
 struct UnstructuredGrid;
 
@@ -43,8 +44,10 @@ namespace Opm
         ///                      mapping from cell indices (typically from a processed grid)
         ///                      to logical cartesian indices consistent with the deck.
         BlackoilPropertiesFromDeck(const EclipseGridParser& deck,
-                                   const UnstructuredGrid& grid);
-
+                                   const UnstructuredGrid& grid);        
+        BlackoilPropertiesFromDeck(const EclipseGridParser& deck,
+                                   const UnstructuredGrid& grid,
+                                   const parameter::ParameterGroup& param);
         /// Destructor.
         virtual ~BlackoilPropertiesFromDeck();
 
diff --git a/opm/core/fluid/SaturationPropsFromDeck.hpp b/opm/core/fluid/SaturationPropsFromDeck.hpp
index b83a12711..2c6a89a06 100644
--- a/opm/core/fluid/SaturationPropsFromDeck.hpp
+++ b/opm/core/fluid/SaturationPropsFromDeck.hpp
@@ -19,10 +19,11 @@
 
 #ifndef OPM_SATURATIONPROPSFROMDECK_HEADER_INCLUDED
 #define OPM_SATURATIONPROPSFROMDECK_HEADER_INCLUDED
-
+#include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <opm/core/eclipse/EclipseGridParser.hpp>
 #include <opm/core/utility/UniformTableLinear.hpp>
 #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
+#include <opm/core/fluid/SatFuncStone2.hpp>
 #include <vector>
 
 struct UnstructuredGrid;
@@ -44,6 +45,10 @@ namespace Opm
         void init(const EclipseGridParser& deck,
                   const UnstructuredGrid& grid);
 
+        void init(const EclipseGridParser& deck,
+                  const UnstructuredGrid& grid,
+                  const parameter::ParameterGroup& param);
+
         /// \return   P, the number of phases.
         int numPhases() const;
 
@@ -87,31 +92,11 @@ namespace Opm
 		      double* smax) const;
 
     private:
-        PhaseUsage phase_usage_;
-        class SatFuncSet
-        {
-        public:
-            void init(const EclipseGridParser& deck, const int table_num, PhaseUsage phase_usg);
-            void evalKr(const double* s, double* kr) const;
-            void evalKrDeriv(const double* s, double* kr, double* dkrds) const;
-            void evalPc(const double* s, double* pc) const;
-            void evalPcDeriv(const double* s, double* pc, double* dpcds) const;
-            double smin_[PhaseUsage::MaxNumPhases];
-            double smax_[PhaseUsage::MaxNumPhases];
-        private:
-            PhaseUsage phase_usage; // A copy of the outer class' phase_usage_.
-            UniformTableLinear<double> krw_;
-            UniformTableLinear<double> krow_;
-            UniformTableLinear<double> pcow_;
-            UniformTableLinear<double> krg_;
-            UniformTableLinear<double> krog_;
-            UniformTableLinear<double> pcog_;
-            double krocw_; // = krow_(s_wc)
-        };
-        std::vector<SatFuncSet> satfuncset_;
+        PhaseUsage phase_usage_;        
+        std::vector<SatFuncStone2> satfuncset_;
         std::vector<int> cell_to_func_; // = SATNUM - 1
 
-        const SatFuncSet& funcForCell(const int cell) const;
+        const SatFuncStone2& funcForCell(const int cell) const;
     };