diff --git a/opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterial.hpp b/opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterial.hpp index 5b0b1dcff..19ba477ab 100644 --- a/opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterial.hpp +++ b/opm/material/fluidmatrixinteractions/PiecewiseLinearTwoPhaseMaterial.hpp @@ -146,11 +146,7 @@ public: template static Evaluation twoPhaseSatPcnwInv(const Params ¶ms, const Evaluation& pcnw) - { - return eval_(params.pcnwSamples(), - params.SwPcwnSamples(), - pcnw); - } + { return eval_(params.pcnwSamples(), params.SwPcwnSamples(), pcnw); } /*! * \brief The saturation-capillary pressure curve @@ -191,20 +187,11 @@ public: template static Evaluation twoPhaseSatKrw(const Params ¶ms, const Evaluation& Sw) - { - typedef MathToolbox Toolbox; - - const auto& res = eval_(params.SwKrwSamples(), params.krwSamples(), Sw); - return Toolbox::max(0.0, Toolbox::min(1.0, res)); - } + { return eval_(params.SwKrwSamples(), params.krwSamples(), Sw); } template static Evaluation twoPhaseSatKrwInv(const Params ¶ms, const Evaluation& krw) - { - return eval_(params.krwSamples(), - params.SwKrwSamples(), - krw); - } + { return eval_(params.krwSamples(), params.SwKrwSamples(), krw); } /*! * \brief The relative permeability for the non-wetting phase @@ -222,21 +209,11 @@ public: template static Evaluation twoPhaseSatKrn(const Params ¶ms, const Evaluation& Sw) - { - typedef MathToolbox Toolbox; - - return Toolbox::max(0.0, Toolbox::min(1.0, eval_(params.SwKrnSamples(), - params.krnSamples(), - Sw))); - } + { return eval_(params.SwKrnSamples(), params.krnSamples(), Sw); } template static Evaluation twoPhaseSatKrnInv(const Params ¶ms, const Evaluation& krn) - { - return eval_(params.krnSamples(), - params.SwKrnSamples(), - krn); - } + { return eval_(params.krnSamples(), params.SwKrnSamples(), krn); } private: template