From 5f4167d800ac78a4a3883dd2e0d8b8184137d3c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Mon, 27 May 2013 10:26:41 +0200
Subject: [PATCH] New interface methods rsMax() in BlackoilPropsAdInterface.

Notes:
 - Interface was already present, just disabled.
 - Class BlackoilPropsAd cannot properly implement rsMax() with derivatives,
   and implements only a throw statement.
---
 opm/autodiff/BlackoilPropsAd.cpp          | 4 ++--
 opm/autodiff/BlackoilPropsAd.hpp          | 4 ++--
 opm/autodiff/BlackoilPropsAdInterface.hpp | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/opm/autodiff/BlackoilPropsAd.cpp b/opm/autodiff/BlackoilPropsAd.cpp
index 24b02bcdb..d9b82490c 100644
--- a/opm/autodiff/BlackoilPropsAd.cpp
+++ b/opm/autodiff/BlackoilPropsAd.cpp
@@ -447,7 +447,6 @@ namespace Opm
     }
 
 
-#if 0
     // ------ Rs bubble point curve ------
 
     /// Bubble point curve for Rs as function of oil pressure.
@@ -457,6 +456,7 @@ namespace Opm
     V BlackoilPropsAd::rsMax(const V& po,
                              const Cells& cells) const
     {
+        THROW("Method rsMax() not implemented.");
     }
 
     /// Bubble point curve for Rs as function of oil pressure.
@@ -466,8 +466,8 @@ namespace Opm
     ADB BlackoilPropsAd::rsMax(const ADB& po,
                                const Cells& cells) const
     {
+        THROW("Method rsMax() not implemented.");
     }
-#endif
 
     // ------ Relative permeability ------
 
diff --git a/opm/autodiff/BlackoilPropsAd.hpp b/opm/autodiff/BlackoilPropsAd.hpp
index 912cdbbb9..28696961a 100644
--- a/opm/autodiff/BlackoilPropsAd.hpp
+++ b/opm/autodiff/BlackoilPropsAd.hpp
@@ -189,7 +189,7 @@ namespace Opm
 
 
         // ------ Rs bubble point curve ------
-#if 0
+
         /// Bubble point curve for Rs as function of oil pressure.
         /// \param[in]  po     Array of n oil pressure values.
         /// \param[in]  cells  Array of n cell indices to be associated with the pressure values.
@@ -203,7 +203,7 @@ namespace Opm
         /// \return            Array of n bubble point values for Rs.
         ADB rsMax(const ADB& po,
                   const Cells& cells) const;
-#endif
+
 
         // ------ Relative permeability ------
 
diff --git a/opm/autodiff/BlackoilPropsAdInterface.hpp b/opm/autodiff/BlackoilPropsAdInterface.hpp
index 01b47bcaa..fb376d1a9 100644
--- a/opm/autodiff/BlackoilPropsAdInterface.hpp
+++ b/opm/autodiff/BlackoilPropsAdInterface.hpp
@@ -198,7 +198,7 @@ namespace Opm
 
 
         // ------ Rs bubble point curve ------
-#if 0
+
         /// Bubble point curve for Rs as function of oil pressure.
         /// \param[in]  po     Array of n oil pressure values.
         /// \param[in]  cells  Array of n cell indices to be associated with the pressure values.
@@ -214,7 +214,6 @@ namespace Opm
         virtual
         ADB rsMax(const ADB& po,
                   const Cells& cells) const = 0;
-#endif
 
         // ------ Relative permeability ------