Merge pull request #490 from plgbrts/saltp

add getSaltSaturation

opm/material/fluidstates/BlackOilFluidState.hpp

@@ -87,6 +87,19 @@ auto getSaltConcentration_(typename std::enable_if<!HasMember_saltConcentration<
                                                     const FluidState&>::type)
 { return 0.0; }
 
+OPM_GENERATE_HAS_MEMBER(saltSaturation, ) // Creates 'HasMember_saltSaturation<T>'.
+
+template <class FluidState>
+auto getSaltSaturation_(typename std::enable_if<HasMember_saltSaturation<FluidState>::value,
+                                                    const FluidState&>::type fluidState)
+{ return fluidState.saltSaturation(); }
+
+
+template <class FluidState>
+auto getSaltSaturation_(typename std::enable_if<!HasMember_saltSaturation<FluidState>::value,
+                                                    const FluidState&>::type)
+{ return 0.0; }
+
 /*!
  * \brief Implements a "tailor-made" fluid state class for the black-oil model.
  *

opm/material/fluidsystems/BlackOilFluidSystem.hpp

@@ -100,7 +100,7 @@ LhsEval getRvw_(typename std::enable_if<!HasMember_Rvw<FluidState>::value, const
 
 template <class FluidSystem, class FluidState, class LhsEval>
 auto getRvw_(typename std::enable_if<HasMember_Rvw<FluidState>::value, const FluidState&>::type fluidState,
-            unsigned regionIdx OPM_UNUSED)
+            unsigned)
     -> decltype(decay<LhsEval>(fluidState.Rvw()))
 { return decay<LhsEval>(fluidState.Rvw()); }
 
@@ -118,8 +118,8 @@ auto getSaltConcentration_(typename std::enable_if<HasMember_saltConcentration<F
 
 template <class FluidSystem, class FluidState, class LhsEval>
 LhsEval getSaltSaturation_(typename std::enable_if<!HasMember_saltSaturation<FluidState>::value,
-                              const FluidState&>::type fluidState OPM_UNUSED,
-                              unsigned regionIdx OPM_UNUSED)
+                              const FluidState&>::type,
+                              unsigned)
 {return 0.0;}
 
 template <class FluidSystem, class FluidState, class LhsEval>