Merge branch 'feature/efftoabs-interface-changes' into 'master'

[efftoabs][2p] Remove underscore from public member function names

See merge request !1922

dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh

@@ -243,10 +243,12 @@ public:
      *                  and then the params container is constructed accordingly. Afterwards the values are set there, too.
      * \return Absolute saturation of the non-wetting phase.
      */
+    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 swe*(1. - params.swr() - params.snr()) + params.swr();
-    }
+    { return sweToSw(params, swe); }
 
     /*!
      * \brief Derivative of the effective saturation w.r.t. the absolute saturation.
@@ -256,9 +258,13 @@ public:
      *                  and then the params container is constructed accordingly. Afterwards the values are set there, too.
      * \return Derivative of the effective saturation w.r.t. the absolute saturation.
      */
-    static Scalar dswe_dsw_(const Params &params)
+    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.
      *
@@ -267,8 +273,12 @@ public:
      *                  and then the params container is constructed accordingly. Afterwards the values are set there, too.
      * \return Derivative of the absolute saturation w.r.t. the effective saturation.
      */
-    static Scalar dsw_dswe_(const Params &params)
+    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