Commit 5e31a9f8 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

remove deprecated stuff from dumux/material/fluidmatrixinteractions

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11762 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 23488530
......@@ -74,12 +74,6 @@ public:
return params.pe()*pow(swe, -1.0/params.lambda());
}
DUNE_DEPRECATED_MSG("use pc() (uncapitalized 'c') instead")
static Scalar pC(const Params &params, Scalar swe)
{
return pc(params, swe);
}
/*!
* \brief The saturation-capillary pressure curve according to Brooks & Corey.
*
......@@ -102,12 +96,6 @@ public:
return std::min(std::max(tmp, Scalar(0.0)), Scalar(1.0));
}
DUNE_DEPRECATED_MSG("use sw() (uncapitalized 's') instead")
static Scalar Sw(const Params &params, Scalar pc)
{
return sw(params, pc);
}
/*!
* \brief The partial derivative of the capillary
* pressure w.r.t. the effective saturation according to Brooks & Corey.
......@@ -131,12 +119,6 @@ public:
return - params.pe()/params.lambda() * pow(swe, -1/params.lambda() - 1);
}
DUNE_DEPRECATED_MSG("use dpc_dsw() (uncapitalized 'c', 's') instead")
static Scalar dpC_dSw(const Params &params, Scalar swe)
{
return dpc_dsw(params, swe);
}
/*!
* \brief The partial derivative of the effective
* saturation w.r.t. the capillary pressure according to Brooks & Corey.
......@@ -154,12 +136,6 @@ public:
return -params.lambda()/params.pe() * pow(pc/params.pe(), - params.lambda() - 1);
}
DUNE_DEPRECATED_MSG("use dsw_dpc() (uncapitalized 's', 'c') instead")
static Scalar dSw_dpC(const Params &params, Scalar pc)
{
return dsw_dpc(params, pc);
}
/*!
* \brief The relative permeability for the wetting phase of
* the medium implied by the Brooks-Corey
......@@ -196,12 +172,6 @@ public:
return (2.0/params.lambda() + 3)*pow(swe, 2.0/params.lambda() + 2);
};
DUNE_DEPRECATED_MSG("use dkrw_dsw() (uncapitalized 's') instead")
static Scalar dkrw_dSw(const Params &params, Scalar swe)
{
return dkrw_dsw(params, swe);
}
/*!
* \brief The relative permeability for the non-wetting phase of
* the medium as implied by the Brooks-Corey
......@@ -248,12 +218,6 @@ public:
);
}
DUNE_DEPRECATED_MSG("use dkrn_dsw() (uncapitalized 's') instead")
static Scalar dkrn_dSw(const Params &params, Scalar swe)
{
return dkrn_dsw(params, swe);
}
};
}
......
......@@ -83,12 +83,6 @@ public:
return EffLaw::pc(params, swToSwe(params, sw));
}
DUNE_DEPRECATED_MSG("use pc() (uncapitalized 'c') instead")
static Scalar pC(const Params &params, Scalar sw)
{
return pc(params, sw);
}
/*!
* \brief The saturation-capillary pressure curve.
*
......@@ -105,12 +99,6 @@ public:
return sweToSw_(params, EffLaw::sw(params, pc));
}
DUNE_DEPRECATED_MSG("use sw() (uncapitalized 's') instead")
static Scalar Sw(const Params &params, Scalar pc)
{
return sw(params, pc);
}
/*!
* \brief Returns the partial derivative of the capillary
* pressure w.r.t the absolute saturation.
......@@ -131,12 +119,6 @@ public:
return EffLaw::dpc_dsw(params, swToSwe(params, sw) )*dswe_dsw_(params);
}
DUNE_DEPRECATED_MSG("use dpc_dsw() (uncapitalized 'c', 's') instead")
static Scalar dpC_dSw(const Params &params, Scalar sw)
{
return dpc_dsw(params, sw);
}
/*!
* \brief Returns the partial derivative of the absolute
* saturation w.r.t. the capillary pressure.
......@@ -159,12 +141,6 @@ public:
return EffLaw::dsw_dpc(params, pc)*dsw_dswe_(params);
}
DUNE_DEPRECATED_MSG("use dsw_dpc() (uncapitalized 's', 'c') instead")
static Scalar dSw_dpC(const Params &params, Scalar pc)
{
return dsw_dpc(params, pc);
}
/*!
* \brief The relative permeability for the wetting phase.
*
......@@ -210,12 +186,6 @@ public:
return (sw - params.swr())/(1. - params.swr() - params.snr());
}
DUNE_DEPRECATED_MSG("use swToSwe() (uncapitalized 's') instead")
static Scalar SwToSwe(const Params &params, Scalar sw)
{
return swToSwe(params, sw);
}
/*!
* \brief Convert an absolute non-wetting saturation to an effective one.
*
......@@ -230,12 +200,6 @@ public:
return (sn - params.snr())/(1. - params.swr() - params.snr());
}
DUNE_DEPRECATED_MSG("use snToSne() (uncapitalized 's') instead")
static Scalar SnToSne(const Params &params, Scalar sn)
{
return snToSne(params, sn);
}
//private:
/*!
* \brief Convert an effective wetting saturation to an absolute one.
......
......@@ -52,10 +52,6 @@ public:
Scalar swr() const
{ return swr_; }
DUNE_DEPRECATED_MSG("use swr() (uncapitalized 's') instead")
Scalar Swr() const
{ return swr(); }
/*!
* \brief Set the residual wetting saturation.
*/
......@@ -68,10 +64,6 @@ public:
Scalar snr() const
{ return snr_; }
DUNE_DEPRECATED_MSG("use snr() (uncapitalized 's') instead")
Scalar Snr() const
{ return snr(); }
/*!
* \brief Set the residual non-wetting saturation.
*/
......
......@@ -70,12 +70,6 @@ public:
return (1 - swe)*(params.maxPc() - params.entryPc()) + params.entryPc();
}
DUNE_DEPRECATED_MSG("use pc() (uncapitalized 'c') instead")
static Scalar pC(const Params &params, Scalar swe)
{
return pc(params, swe);
}
/*!
* \brief The saturation-capillary pressure curve.
*
......@@ -95,12 +89,6 @@ public:
return 1 - (pc - params.entryPc())/(params.maxPc() - params.entryPc());
}
DUNE_DEPRECATED_MSG("use sw() (uncapitalized 's') instead")
static Scalar Sw(const Params &params, Scalar pc)
{
return sw(params, pc);
}
/*!
* \brief Returns the partial derivative of the capillary
* pressure w.r.t. the effective saturation.
......@@ -121,12 +109,6 @@ public:
return - (params.maxPc() - params.entryPc());
}
DUNE_DEPRECATED_MSG("use dpc_dsw() (uncapitalized 'c', 's') instead")
static Scalar dpC_dSw(const Params &params, Scalar swe)
{
return dpc_dsw(params, swe);
}
/*!
* \brief Returns the partial derivative of the effective
* saturation to the capillary pressure.
......@@ -142,12 +124,6 @@ public:
return - 1/(params.maxPc() - params.entryPc());
}
DUNE_DEPRECATED_MSG("use dsw_dpc() (uncapitalized 's', 'c') instead")
static Scalar dSw_dpC(const Params &params, Scalar pc)
{
return dsw_dpc(params, pc);
}
/*!
* \brief The relative permeability for the wetting phase.
*
......
......@@ -57,12 +57,6 @@ public:
Scalar entryPc() const
{ return entryPc_; }
DUNE_DEPRECATED_MSG("use entryPc() (uncapitalized 'c') instead")
Scalar entryPC()
{
return entryPc();
}
/*!
* \brief Set the entry pressure for the linear material law.
*
......@@ -71,12 +65,6 @@ public:
void setEntryPc(Scalar v)
{ entryPc_ = v; }
DUNE_DEPRECATED_MSG("use setEntryPc() (uncapitalized 'c') instead")
void setEntryPC(Scalar v)
{
setEntryPc(v);
}
/*!
* \brief Return the maximum capillary pressure for the linear material law.
*
......@@ -85,12 +73,6 @@ public:
Scalar maxPc() const
{ return maxPc_; }
DUNE_DEPRECATED_MSG("use maxPc() (uncapitalized 'c') instead")
Scalar maxPC()
{
return maxPc();
}
/*!
* \brief Set the maximum capillary pressure for the linear material law.
*
......@@ -99,13 +81,6 @@ public:
void setMaxPc(Scalar v)
{ maxPc_ = v; }
DUNE_DEPRECATED_MSG("use setMaxPc() (uncapitalized 'c') instead")
void setMaxPC(Scalar v)
{
setMaxPc(v);
}
private:
Scalar entryPc_;
Scalar maxPc_;
......
......@@ -106,12 +106,6 @@ public:
return BrooksCorey::pc(params, swe);
}
DUNE_DEPRECATED_MSG("use pc() (uncapitalized 'c') instead")
static Scalar pC(const Params &params, Scalar swe)
{
return pc(params, swe);
}
/*!
* \brief A regularized Brooks-Corey saturation-capillary pressure curve.
*
......@@ -155,12 +149,6 @@ public:
return BrooksCorey::sw(params, pc);
}
DUNE_DEPRECATED_MSG("use sw() (uncapitalized 's') instead")
static Scalar Sw(const Params &params, Scalar pc)
{
return sw(params, pc);
}
/*!
* \brief A regularized version of the partial derivative
* of the \f$p_c(\overline S_w)\f$ w.r.t. effective saturation
......@@ -193,12 +181,6 @@ public:
return BrooksCorey::dpc_dsw(params, swe);
}
DUNE_DEPRECATED_MSG("use dpc_dsw() (uncapitalized 'c', 's') instead")
static Scalar dpC_dSw(const Params &params, Scalar swe)
{
return dpc_dsw(params, swe);
}
/*!
* \brief A regularized version of the partial derivative
* of the \f$\overline S_w(p_c)\f$ w.r.t. cap.pressure
......@@ -245,12 +227,6 @@ public:
return 1.0/BrooksCorey::dpc_dsw(params, swe);
}
DUNE_DEPRECATED_MSG("use dsw_dpc() (uncapitalized 's', 'c') instead")
static Scalar dSw_dpC(const Params &params, Scalar pc)
{
return dsw_dpc(params, pc);
}
/*!
* \brief Regularized version of the relative permeability
* for the wetting phase of
......
......@@ -83,12 +83,6 @@ public:
return LinearMaterial::pc(params, swe);
}
DUNE_DEPRECATED_MSG("use pc() (uncapitalized 'c') instead")
static Scalar pC(const Params &params, Scalar swe)
{
return pc(params, swe);
}
/*!
* \brief The saturation-capillary pressure curve.
*
......@@ -108,12 +102,6 @@ public:
return LinearMaterial::sw(params, pc);
}
DUNE_DEPRECATED_MSG("use sw() (uncapitalized 's') instead")
static Scalar Sw(const Params &params, Scalar pc)
{
return sw(params, pc);
}
/*!
* \brief Returns the partial derivative of the capillary
* pressure to the effective saturation.
......@@ -133,12 +121,6 @@ public:
return LinearMaterial::dpc_dsw(params, swe);
}
DUNE_DEPRECATED_MSG("use dpc_dsw() (uncapitalized 'c', 's') instead")
static Scalar dpC_dSw(const Params &params, Scalar swe)
{
return dpc_dsw(params, swe);
}
/*!
* \brief Returns the partial derivative of the effective
* saturation to the capillary pressure.
......@@ -153,12 +135,6 @@ public:
return LinearMaterial::dsw_dpc(params, pc);
}
DUNE_DEPRECATED_MSG("use dsw_dpc() (uncapitalized 's', 'c') instead")
static Scalar dSw_dpC(const Params &params, Scalar pc)
{
return dsw_dpc(params, pc);
}
/*!
* \brief The relative permeability for the wetting phase.
*
......
......@@ -128,12 +128,6 @@ public:
return VanGenuchten::pc(params, swe);
}
DUNE_DEPRECATED_MSG("use pc() (uncapitalized 'c') instead")
static Scalar pC(const Params &params, Scalar swe)
{
return pc(params, swe);
}
/*!
* \brief A regularized van Genuchten saturation-capillary pressure curve.
*
......@@ -191,12 +185,6 @@ public:
return sw;
}
DUNE_DEPRECATED_MSG("use sw() (uncapitalized 's') instead")
static Scalar Sw(const Params &params, Scalar pc)
{
return sw(params, pc);
}
/*!
* \brief A regularized version of the partial derivative
* of the \f$p_c(\overline S_w)\f$ w.r.t. effective saturation
......@@ -226,12 +214,6 @@ public:
return VanGenuchten::dpc_dsw(params, swe);
}
DUNE_DEPRECATED_MSG("use dpc_dsw() (uncapitalized 'c', 's') instead")
static Scalar dpC_dSw(const Params &params, Scalar swe)
{
return dpc_dsw(params, swe);
}
/*!
* \brief A regularized version of the partial derivative
* of the \f$\overline S_w(p_c)\f$ w.r.t. cap.pressure
......@@ -268,12 +250,6 @@ public:
return VanGenuchten::dsw_dpc(params, pc);
}
DUNE_DEPRECATED_MSG("use dsw_dpc() (uncapitalized 's', 'c') instead")
static Scalar dSw_dpC(const Params &params, Scalar pc)
{
return dsw_dpc(params, pc);
}
/*!
* \brief Regularized version of the relative permeability
* for the wetting phase of
......
......@@ -74,12 +74,6 @@ public:
* COMMENT ABOVE! */
}
DUNE_DEPRECATED_MSG("use pcLowSw() (uncapitalized 'c') instead")
Scalar pCLowSw()
{
return pcLowSw();
}
/*!
* \brief Threshold saturation above which the capillary pressure
* is regularized.
......@@ -101,12 +95,6 @@ public:
* COMMENT ABOVE! */
}
DUNE_DEPRECATED_MSG("use pcHighSw() (uncapitalized 'c') instead")
Scalar pCHighSw()
{
return pcHighSw();
}
/*!
* \brief Threshold saturation below which the relative
* permeability of the non-wetting phase gets regularized.
......
......@@ -71,12 +71,6 @@ public:
return pow(pow(swe, -1.0/params.vgm()) - 1, 1.0/params.vgn())/params.vgAlpha();
}
DUNE_DEPRECATED_MSG("use pc() (uncapitalized 'c') instead")
static Scalar pC(const Params &params, Scalar swe)
{
return pc(params, swe);
}
/*!
* \brief The saturation-capillary pressure curve according to van Genuchten.
*
......@@ -98,12 +92,6 @@ public:
return pow(pow(params.vgAlpha()*pc, params.vgn()) + 1, -params.vgm());
}
DUNE_DEPRECATED_MSG("use sw() (uncapitalized 's') instead")
static Scalar Sw(const Params &params, Scalar pc)
{
return sw(params, pc);
}
/*!
* \brief The partial derivative of the capillary
* pressure w.r.t. the effective saturation according to van Genuchten.
......@@ -129,12 +117,6 @@ public:
* powSwe/swe/params.vgm();
}
DUNE_DEPRECATED_MSG("use dpc_dsw() (uncapitalized 'c', 's') instead")
static Scalar dpC_dSw(const Params &params, Scalar swe)
{
return dpc_dsw(params, swe);
}
/*!
* \brief The partial derivative of the effective
* saturation to the capillary pressure according to van Genuchten.
......@@ -153,12 +135,6 @@ public:
params.vgm()*powAlphaPc/pc*params.vgn();
}
DUNE_DEPRECATED_MSG("use dsw_dpc() (uncapitalized 's', 'c') instead")
static Scalar dSw_dpC(const Params &params, Scalar pc)
{
return dsw_dpc(params, pc);
}
/*!
* \brief The relative permeability for the wetting phase of
* the medium implied by van Genuchten's
......@@ -195,13 +171,6 @@ public:
return (1.0 - xToM)/std::sqrt(swe) * ( (1.0 - xToM)/2 + 2*xToM*(1.0-x)/x );
};
DUNE_DEPRECATED_MSG("use dkrw_dsw() (uncapitalized 's') instead")
static Scalar dkrw_dSw(const Params &params, Scalar swe)
{
return dkrw_dsw(params, swe);
}
/*!
* \brief The relative permeability for the non-wetting phase
* of the medium implied by van Genuchten's
......@@ -243,12 +212,6 @@ public:
*(1.0/3 + 2*x/swe);
}
DUNE_DEPRECATED_MSG("use dkrn_dsw() (uncapitalized 's') instead")
static Scalar dkrn_dSw(const Params &params, Scalar swe)
{
return dkrn_dsw(params, swe);
}
};
}
......
......@@ -73,10 +73,6 @@ public:
Scalar vgm() const
{ return vgm_; }
DUNE_DEPRECATED_MSG("use vgm() (uncapitalized 'm') instead")
Scalar vgM() const
{ return vgm(); }
/*!
* \brief Set the \f$m\f$ shape parameter [-] of van Genuchten's
* curve.
......@@ -86,10 +82,6 @@ public:
void setVgm(Scalar m)
{ vgm_ = m; vgn_ = 1/(1 - vgm_); }
DUNE_DEPRECATED_MSG("use setVgm() (uncapitalized 'm') instead")
void setVgM(Scalar m)
{ setVgm(m); }
/*!
* \brief Return the \f$n\f$ shape parameter [-] of van Genuchten's
* curve.
......@@ -97,10 +89,6 @@ public:
Scalar vgn() const
{ return vgn_; }
DUNE_DEPRECATED_MSG("use vgn() (uncapitalized 'n') instead")
Scalar vgN() const
{ return vgn(); }
/*!
* \brief Set the \f$n\f$ shape parameter [-] of van Genuchten's
* curve.
......@@ -110,10 +98,6 @@ public:
void setVgn(Scalar n)
{ vgn_ = n; vgm_ = 1 - 1/vgn_; }
DUNE_DEPRECATED_MSG("use setVgn() (uncapitalized 'n') instead")
void setVgN(Scalar n)
{ setVgn(n); }
private:
Scalar vgAlpha_;
Scalar vgm_;
......
......@@ -60,12 +60,6 @@ public:
DUNE_THROW(Dune::NotImplemented, "Capillary pressures for three phases is not so simple! Use pcgn, pcnw, and pcgw");
}
DUNE_DEPRECATED_MSG("use pc() (uncapitalized 'c') instead")
static Scalar pC(const Params &params, Scalar swe)
{
return pc(params, swe);
}
static Scalar pcgw(const Params &params, Scalar sw)
{
/*
......@@ -110,12 +104,6 @@ public:
}
}
DUNE_DEPRECATED_MSG("use pcgw() (uncapitalized 'cgw') instead")
static Scalar pCGW(const Params &params, Scalar sw)
{
return pcgw(params, sw);
}
static Scalar pcnw(const Params &params, Scalar sw)
{
/*
......@@ -160,12 +148,6 @@ public:
}