Added satRange() method to BlackoilPropertiesInterface.

opm/core/fluid/BlackoilPropertiesBasic.cpp

@@ -214,6 +214,21 @@ 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 BlackoilPropertiesBasic::satRange(const int n,
+                                           const int* /*cells*/,
+                                           double* smin,
+                                           double* smax) const
+    {
+	satprops_.satRange(n, smin, smax);
+    }
+
 
 } // namespace Opm
 

opm/core/fluid/BlackoilPropertiesBasic.hpp

@@ -150,6 +150,19 @@ namespace Opm
                               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/BlackoilPropertiesFromDeck.cpp

@@ -258,6 +258,21 @@ 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 BlackoilPropertiesFromDeck::satRange(const int n,
+                                              const int* cells,
+                                              double* smin,
+                                              double* smax) const
+    {
+	satprops_.satRange(n, cells, smin, smax);
+    }
+
 
 } // namespace Opm
 

opm/core/fluid/BlackoilPropertiesFromDeck.hpp

@@ -146,6 +146,19 @@ namespace Opm
                               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_;
         BlackoilPvtProperties pvt_;

opm/core/fluid/BlackoilPropertiesInterface.hpp

@@ -136,6 +136,19 @@ 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;
     };