From 8501254dd6199022b63d8d3308a232fa2f2d6252 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Mon, 13 Apr 2020 18:54:38 +0200
Subject: [PATCH] [cleanup][2p][efftoabs] Remove deprecated interfaces

---
 .../fluidmatrixinteractions/2p/efftoabslaw.hh    | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh b/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
index b1daf4a4ed..94502f0024 100644
--- a/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
@@ -246,10 +246,6 @@ public:
     static Scalar sweToSw(const Params &params, Scalar swe)
     { return swe*(1. - params.swr() - params.snr()) + params.swr(); }
 
-    [[deprecated("Will be removed after 3.2. Use sweToSw (without underscore suffix) instead!")]]
-    static Scalar sweToSw_(const Params &params, Scalar swe)
-    { return sweToSw(params, swe); }
-
     /*!
      * \brief Convert an effective non-wetting saturation to an absolute one.
      *
@@ -260,9 +256,7 @@ public:
      * \return Absolute saturation of the non-wetting phase.
      */
     static Scalar sneToSn(const Params &params, Scalar sne)
-    {
-        return sne*(1. - params.swr() - params.snr()) + params.snr();
-    }
+    { return sne*(1. - params.swr() - params.snr()) + params.snr(); }
 
     /*!
      * \brief Derivative of the effective saturation w.r.t. the absolute saturation.
@@ -275,10 +269,6 @@ public:
     static Scalar dswe_dsw(const Params &params)
     { return 1.0/(1. - params.swr() - params.snr()); }
 
-    [[deprecated("Will be removed after 3.2. Use dswe_dsw (without underscore suffix) instead!")]]
-    static Scalar dswe_dsw_(const Params &params)
-    { return dswe_dsw(params); }
-
     /*!
      * \brief Derivative of the absolute saturation w.r.t. the effective saturation.
      *
@@ -289,10 +279,6 @@ public:
      */
     static Scalar dsw_dswe(const Params &params)
     { return 1. - params.swr() - params.snr(); }
-
-    [[deprecated("Will be removed after 3.2. Use dsw_dswe (without underscore suffix) instead!")]]
-    static Scalar dsw_dswe_(const Params &params)
-    { return dsw_dswe(params); }
 };
 } // end namespace Dumux
 
-- 
GitLab