From 243f2a0293bab4e7d7ecbc0c5ccadab93978fd5b Mon Sep 17 00:00:00 2001 From: Timo Koch <timo.koch@iws.uni-stuttgart.de> Date: Wed, 1 Apr 2020 14:15:20 +0200 Subject: [PATCH] [material][2p] Remove deprecation warnings --- .../material/fluidmatrixinteractions/2p/efftoabslaw.hh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh b/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh index ba4cad3a1d..b1daf4a4ed 100644 --- a/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh +++ b/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh @@ -91,7 +91,7 @@ public: */ static Scalar sw(const Params ¶ms, Scalar pc) { - return sweToSw_(params, EffLaw::sw(params, pc)); + return sweToSw(params, EffLaw::sw(params, pc)); } /*! @@ -122,7 +122,7 @@ public: */ static Scalar dpc_dsw(const Params ¶ms, Scalar sw) { - return EffLaw::dpc_dswe(params, swToSwe(params, sw) )*dswe_dsw_(params); + return EffLaw::dpc_dswe(params, swToSwe(params, sw) )*dswe_dsw(params); } /*! @@ -145,7 +145,7 @@ public: */ static Scalar dsw_dpc(const Params ¶ms, Scalar pc) { - return EffLaw::dswe_dpc(params, pc)*dsw_dswe_(params); + return EffLaw::dswe_dpc(params, pc)*dsw_dswe(params); } /*! @@ -174,7 +174,7 @@ public: */ static Scalar dkrw_dsw(const Params ¶ms, Scalar sw) { - return EffLaw::dkrw_dswe(params, swToSwe(params, sw))*dswe_dsw_(params); + return EffLaw::dkrw_dswe(params, swToSwe(params, sw))*dswe_dsw(params); } /*! @@ -203,7 +203,7 @@ public: */ static Scalar dkrn_dsw(const Params ¶ms, Scalar sw) { - return EffLaw::dkrn_dswe(params, swToSwe(params, sw))*dswe_dsw_(params); + return EffLaw::dkrn_dswe(params, swToSwe(params, sw))*dswe_dsw(params); } /*! -- GitLab