Merge pull request #95 from atgeirr/pure-virtual

Make BlackoilPropsAdInterface pure virtual again.

opm/autodiff/BlackoilPropsAd.cpp

@@ -817,5 +817,16 @@ namespace Opm
         return adbCapPressures;
     }
 
+
+
+    /// Saturation update for hysteresis behavior.
+    /// \param[in]  cells       Array of n cell indices to be associated with the saturation values.
+    void BlackoilPropsAd::updateSatHyst(const std::vector<double>& /* saturation */,
+                                        const std::vector<int>& /* cells */)
+    {
+        OPM_THROW(std::logic_error, "BlackoilPropsAd class does not support hysteresis.");
+    }
+
+
 } // namespace Opm
 

opm/autodiff/BlackoilPropsAd.hpp

@@ -316,6 +316,10 @@ namespace Opm
                                   const ADB& sg,
                                   const Cells& cells) const;
 
+        /// Saturation update for hysteresis behavior.
+        /// \param[in]  cells       Array of n cell indices to be associated with the saturation values.
+        void updateSatHyst(const std::vector<double>& saturation,
+                           const std::vector<int>& cells);
     private:
         const BlackoilPropertiesInterface& props_;
         PhaseUsage pu_;

opm/autodiff/BlackoilPropsAdInterface.hpp

@@ -320,7 +320,7 @@ namespace Opm
         /// \param[in]  cells       Array of n cell indices to be associated with the saturation values.
         virtual
         void updateSatHyst(const std::vector<double>& saturation,
-                           const std::vector<int>& cells) {assert(false); } // Please implement me ...
+                           const std::vector<int>& cells) = 0;
     };
 
 } // namespace Opm