Added satRange() method to Incomp* classes and Saturation* classes.

So far not yet added to BlackoilPropertiesInterface.

opm/core/fluid/IncompPropertiesBasic.cpp

@@ -136,6 +136,20 @@ namespace Opm
     }
 
 
+    /// Obtain the range of allowable saturation values.
+    /// In cell cells[i], saturation of phase p is allowed to be
+    /// in the interval [smin[i*P + p], smax[i*P + p]].
+    /// \param[in]  n      Number of data points.
+    /// \param[in]  cells  Array of n cell indices.
+    /// \param[out] smin   Array of nP minimum s values, array must be valid before calling.
+    /// \param[out] smax   Array of nP maximum s values, array must be valid before calling.
+    void IncompPropertiesBasic::satRange(const int n,
+					 const int* /*cells*/,
+					 double* smin,
+					 double* smax) const
+    {
+	satprops_.satRange(n, smin, smax);
+    }
 
 } // namespace Opm
 

opm/core/fluid/IncompPropertiesBasic.hpp

@@ -114,6 +114,19 @@ namespace Opm
                               const int* cells,
                               double* pc,
                               double* dpcds) const;
+
+
+	/// Obtain the range of allowable saturation values.
+	/// In cell cells[i], saturation of phase p is allowed to be
+	/// in the interval [smin[i*P + p], smax[i*P + p]].
+        /// \param[in]  n      Number of data points.
+        /// \param[in]  cells  Array of n cell indices.
+        /// \param[out] smin   Array of nP minimum s values, array must be valid before calling.
+        /// \param[out] smax   Array of nP maximum s values, array must be valid before calling.
+        virtual void satRange(const int n,
+                              const int* cells,
+                              double* smin,
+                              double* smax) const;
     private:
         RockBasic rock_;
 	PvtPropertiesBasic pvt_;

opm/core/fluid/IncompPropertiesFromDeck.cpp

@@ -128,6 +128,20 @@ namespace Opm
     }
 
 
+    /// Obtain the range of allowable saturation values.
+    /// In cell cells[i], saturation of phase p is allowed to be
+    /// in the interval [smin[i*P + p], smax[i*P + p]].
+    /// \param[in]  n      Number of data points.
+    /// \param[in]  cells  Array of n cell indices.
+    /// \param[out] smin   Array of nP minimum s values, array must be valid before calling.
+    /// \param[out] smax   Array of nP maximum s values, array must be valid before calling.
+    void IncompPropertiesFromDeck::satRange(const int n,
+					    const int* /*cells*/,
+					    double* smin,
+					    double* smax) const
+    {
+	satprops_.satRange(n, smin, smax);
+    }
 
 } // namespace Opm
 

opm/core/fluid/IncompPropertiesFromDeck.hpp

@@ -111,6 +111,19 @@ namespace Opm
                               const int* cells,
                               double* pc,
                               double* dpcds) const;
+
+
+	/// Obtain the range of allowable saturation values.
+	/// In cell cells[i], saturation of phase p is allowed to be
+	/// in the interval [smin[i*P + p], smax[i*P + p]].
+        /// \param[in]  n      Number of data points.
+        /// \param[in]  cells  Array of n cell indices.
+        /// \param[out] smin   Array of nP minimum s values, array must be valid before calling.
+        /// \param[out] smax   Array of nP maximum s values, array must be valid before calling.
+        virtual void satRange(const int n,
+                              const int* cells,
+                              double* smin,
+                              double* smax) const;
     private:
         RockFromDeck rock_;
 	PvtPropertiesIncompFromDeck pvt_;

opm/core/fluid/IncompPropertiesInterface.hpp

@@ -95,6 +95,18 @@ namespace Opm
                               const int* cells,
                               double* pc,
                               double* dpcds) const = 0;
+
+	/// Obtain the range of allowable saturation values.
+	/// In cell cells[i], saturation of phase p is allowed to be
+	/// in the interval [smin[i*P + p], smax[i*P + p]].
+        /// \param[in]  n      Number of data points.
+        /// \param[in]  cells  Array of n cell indices.
+        /// \param[out] smin   Array of nP minimum s values, array must be valid before calling.
+        /// \param[out] smax   Array of nP maximum s values, array must be valid before calling.
+        virtual void satRange(const int n,
+                              const int* cells,
+                              double* smin,
+                              double* smax) const = 0;
     };
 
 

opm/core/fluid/SaturationPropsBasic.cpp

@@ -197,6 +197,17 @@ namespace Opm
 
 
 
+    /// Obtain the range of allowable saturation values.
+    /// \param[in]  n      Number of data points.
+    /// \param[out] smin   Array of nP minimum s values, array must be valid before calling.
+    /// \param[out] smax   Array of nP maximum s values, array must be valid before calling.
+    void SaturationPropsBasic::satRange(const int n,
+					double* smin,
+					double* smax) const
+    {
+	std::fill(smin, smin + num_phases_*n, 0.0);
+	std::fill(smax, smax + num_phases_*n, 1.0);
+    }
 
 
 

opm/core/fluid/SaturationPropsBasic.hpp

@@ -76,6 +76,13 @@ namespace Opm
                       double* pc,
                       double* dpcds) const;
 
+	/// Obtain the range of allowable saturation values.
+        /// \param[in]  n      Number of data points.
+        /// \param[out] smin   Array of nP minimum s values, array must be valid before calling.
+        /// \param[out] smax   Array of nP maximum s values, array must be valid before calling.
+	void satRange(const int n,
+		      double* smin,
+		      double* smax) const;
     private:
 	enum RelPermFunc { Constant, Linear, Quadratic };
 	int num_phases_;

opm/core/fluid/SaturationPropsFromDeck.hpp

@@ -67,6 +67,13 @@ namespace Opm
                       double* pc,
                       double* dpcds) const;
 
+	/// Obtain the range of allowable saturation values.
+        /// \param[in]  n      Number of data points.
+        /// \param[out] smin   Array of nP minimum s values, array must be valid before calling.
+        /// \param[out] smax   Array of nP maximum s values, array must be valid before calling.
+	void satRange(const int n,
+		      double* smin,
+		      double* smax) const;
     private:
         void evalKr(const double* s, double* kr) const;
         void evalKrDeriv(const double* s, double* kr, double* dkrds) const;
@@ -82,6 +89,8 @@ namespace Opm
         utils::UniformTableLinear<double> krog_;
         utils::UniformTableLinear<double> pcog_;
         double krocw_; // = krow_(s_wc)
+	double smin_[PhaseUsage::MaxNumPhases];
+	double smax_[PhaseUsage::MaxNumPhases];
     };