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: ...@@ -74,12 +74,6 @@ public:
return params.pe()*pow(swe, -1.0/params.lambda()); 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. * \brief The saturation-capillary pressure curve according to Brooks & Corey.
* *
...@@ -102,12 +96,6 @@ public: ...@@ -102,12 +96,6 @@ public:
return std::min(std::max(tmp, Scalar(0.0)), Scalar(1.0)); 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 * \brief The partial derivative of the capillary
* pressure w.r.t. the effective saturation according to Brooks & Corey. * pressure w.r.t. the effective saturation according to Brooks & Corey.
...@@ -131,12 +119,6 @@ public: ...@@ -131,12 +119,6 @@ public:
return - params.pe()/params.lambda() * pow(swe, -1/params.lambda() - 1); 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 * \brief The partial derivative of the effective
* saturation w.r.t. the capillary pressure according to Brooks & Corey. * saturation w.r.t. the capillary pressure according to Brooks & Corey.
...@@ -154,12 +136,6 @@ public: ...@@ -154,12 +136,6 @@ public:
return -params.lambda()/params.pe() * pow(pc/params.pe(), - params.lambda() - 1); 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 * \brief The relative permeability for the wetting phase of
* the medium implied by the Brooks-Corey * the medium implied by the Brooks-Corey
...@@ -196,12 +172,6 @@ public: ...@@ -196,12 +172,6 @@ public:
return (2.0/params.lambda() + 3)*pow(swe, 2.0/params.lambda() + 2); 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 * \brief The relative permeability for the non-wetting phase of
* the medium as implied by the Brooks-Corey * the medium as implied by the Brooks-Corey
...@@ -248,12 +218,6 @@ public: ...@@ -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: ...@@ -83,12 +83,6 @@ public:
return EffLaw::pc(params, swToSwe(params, sw)); 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. * \brief The saturation-capillary pressure curve.
* *
...@@ -105,12 +99,6 @@ public: ...@@ -105,12 +99,6 @@ public:
return sweToSw_(params, EffLaw::sw(params, pc)); 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 * \brief Returns the partial derivative of the capillary
* pressure w.r.t the absolute saturation. * pressure w.r.t the absolute saturation.
...@@ -131,12 +119,6 @@ public: ...@@ -131,12 +119,6 @@ public:
return EffLaw::dpc_dsw(params, swToSwe(params, sw) )*dswe_dsw_(params); 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 * \brief Returns the partial derivative of the absolute
* saturation w.r.t. the capillary pressure. * saturation w.r.t. the capillary pressure.
...@@ -159,12 +141,6 @@ public: ...@@ -159,12 +141,6 @@ public:
return EffLaw::dsw_dpc(params, pc)*dsw_dswe_(params); 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. * \brief The relative permeability for the wetting phase.
* *
...@@ -210,12 +186,6 @@ public: ...@@ -210,12 +186,6 @@ public:
return (sw - params.swr())/(1. - params.swr() - params.snr()); 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. * \brief Convert an absolute non-wetting saturation to an effective one.
* *
...@@ -230,12 +200,6 @@ public: ...@@ -230,12 +200,6 @@ public:
return (sn - params.snr())/(1. - params.swr() - params.snr()); 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: //private:
/*! /*!
* \brief Convert an effective wetting saturation to an absolute one. * \brief Convert an effective wetting saturation to an absolute one.
......
...@@ -52,10 +52,6 @@ public: ...@@ -52,10 +52,6 @@ public:
Scalar swr() const Scalar swr() const
{ return swr_; } { return swr_; }
DUNE_DEPRECATED_MSG("use swr() (uncapitalized 's') instead")
Scalar Swr() const
{ return swr(); }
/*! /*!
* \brief Set the residual wetting saturation. * \brief Set the residual wetting saturation.
*/ */
...@@ -68,10 +64,6 @@ public: ...@@ -68,10 +64,6 @@ public:
Scalar snr() const Scalar snr() const
{ return snr_; } { return snr_; }
DUNE_DEPRECATED_MSG("use snr() (uncapitalized 's') instead")
Scalar Snr() const
{ return snr(); }
/*! /*!
* \brief Set the residual non-wetting saturation. * \brief Set the residual non-wetting saturation.
*/ */
......
...@@ -70,12 +70,6 @@ public: ...@@ -70,12 +70,6 @@ public:
return (1 - swe)*(params.maxPc() - params.entryPc()) + params.entryPc(); 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. * \brief The saturation-capillary pressure curve.
* *
...@@ -95,12 +89,6 @@ public: ...@@ -95,12 +89,6 @@ public:
return 1 - (pc - params.entryPc())/(params.maxPc() - params.entryPc()); 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 * \brief Returns the partial derivative of the capillary
* pressure w.r.t. the effective saturation. * pressure w.r.t. the effective saturation.
...@@ -121,12 +109,6 @@ public: ...@@ -121,12 +109,6 @@ public:
return - (params.maxPc() - params.entryPc()); 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 * \brief Returns the partial derivative of the effective
* saturation to the capillary pressure. * saturation to the capillary pressure.
...@@ -142,12 +124,6 @@ public: ...@@ -142,12 +124,6 @@ public:
return - 1/(params.maxPc() - params.entryPc()); 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. * \brief The relative permeability for the wetting phase.
* *
......
...@@ -57,12 +57,6 @@ public: ...@@ -57,12 +57,6 @@ public:
Scalar entryPc() const Scalar entryPc() const
{ return entryPc_; } { return entryPc_; }
DUNE_DEPRECATED_MSG("use entryPc() (uncapitalized 'c') instead")
Scalar entryPC()
{
return entryPc();
}
/*! /*!
* \brief Set the entry pressure for the linear material law. * \brief Set the entry pressure for the linear material law.
* *
...@@ -71,12 +65,6 @@ public: ...@@ -71,12 +65,6 @@ public:
void setEntryPc(Scalar v) void setEntryPc(Scalar v)
{ entryPc_ = 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. * \brief Return the maximum capillary pressure for the linear material law.
* *
...@@ -85,12 +73,6 @@ public: ...@@ -85,12 +73,6 @@ public:
Scalar maxPc() const Scalar maxPc() const
{ return maxPc_; } { 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. * \brief Set the maximum capillary pressure for the linear material law.
* *
...@@ -99,13 +81,6 @@ public: ...@@ -99,13 +81,6 @@ public:
void setMaxPc(Scalar v) void setMaxPc(Scalar v)
{ maxPc_ = v; } { maxPc_ = v; }
DUNE_DEPRECATED_MSG("use setMaxPc() (uncapitalized 'c') instead")
void setMaxPC(Scalar v)
{
setMaxPc(v);
}
private: private:
Scalar entryPc_; Scalar entryPc_;
Scalar maxPc_; Scalar maxPc_;
......
...@@ -106,12 +106,6 @@ public: ...@@ -106,12 +106,6 @@ public:
return BrooksCorey::pc(params, swe); 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. * \brief A regularized Brooks-Corey saturation-capillary pressure curve.
* *
...@@ -155,12 +149,6 @@ public: ...@@ -155,12 +149,6 @@ public:
return BrooksCorey::sw(params, pc); 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 * \brief A regularized version of the partial derivative
* of the \f$p_c(\overline S_w)\f$ w.r.t. effective saturation * of the \f$p_c(\overline S_w)\f$ w.r.t. effective saturation
...@@ -193,12 +181,6 @@ public: ...@@ -193,12 +181,6 @@ public:
return BrooksCorey::dpc_dsw(params, swe); 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 * \brief A regularized version of the partial derivative
* of the \f$\overline S_w(p_c)\f$ w.r.t. cap.pressure * of the \f$\overline S_w(p_c)\f$ w.r.t. cap.pressure
...@@ -245,12 +227,6 @@ public: ...@@ -245,12 +227,6 @@ public:
return 1.0/BrooksCorey::dpc_dsw(params, swe); 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 * \brief Regularized version of the relative permeability
* for the wetting phase of * for the wetting phase of
......
...@@ -83,12 +83,6 @@ public: ...@@ -83,12 +83,6 @@ public:
return LinearMaterial::pc(params, swe); 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. * \brief The saturation-capillary pressure curve.
* *
...@@ -108,12 +102,6 @@ public: ...@@ -108,12 +102,6 @@ public:
return LinearMaterial::sw(params, pc); 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 * \brief Returns the partial derivative of the capillary
* pressure to the effective saturation. * pressure to the effective saturation.
...@@ -133,12 +121,6 @@ public: ...@@ -133,12 +121,6 @@ public:
return LinearMaterial::dpc_dsw(params, swe); 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 * \brief Returns the partial derivative of the effective
* saturation to the capillary pressure. * saturation to the capillary pressure.
...@@ -153,12 +135,6 @@ public: ...@@ -153,12 +135,6 @@ public:
return LinearMaterial::dsw_dpc(params, pc); 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. * \brief The relative permeability for the wetting phase.
* *
......
...@@ -128,12 +128,6 @@ public: ...@@ -128,12 +128,6 @@ public:
return VanGenuchten::pc(params, swe); 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. * \brief A regularized van Genuchten saturation-capillary pressure curve.
* *
...@@ -191,12 +185,6 @@ public: ...@@ -191,12 +185,6 @@ public:
return sw; 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 * \brief A regularized version of the partial derivative
* of the \f$p_c(\overline S_w)\f$ w.r.t. effective saturation * of the \f$p_c(\overline S_w)\f$ w.r.t. effective saturation
...@@ -226,12 +214,6 @@ public: ...@@ -226,12 +214,6 @@ public:
return VanGenuchten::dpc_dsw(params, swe); 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 * \brief A regularized version of the partial derivative
* of the \f$\overline S_w(p_c)\f$ w.r.t. cap.pressure * of the \f$\overline S_w(p_c)\f$ w.r.t. cap.pressure
...@@ -268,12 +250,6 @@ public: ...@@ -268,12 +250,6 @@ public:
return VanGenuchten::dsw_dpc(params, pc); 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 * \brief Regularized version of the relative permeability
* for the wetting phase of * for the wetting phase of
......
...@@ -74,12 +74,6 @@ public: ...@@ -74,12 +74,6 @@ public:
* COMMENT ABOVE! */