Skip to content

GitLab

Commit c692b1e4 authored by Timo Koch's avatar Timo Koch
Browse files

Merge branch 'cherry-pick-1bc37771' into 'releases/3.4' 

Merge branch 'feature/header-check-lecture-v3.4' into 'master'

See merge request !152
parents 8595b018 208bd37b
Hide whitespace changes
Inline Side-by-side
lecture/mm/heavyoil/3p/parkervangenuchtenzero.hh
View file @ c692b1e4
......@@ -55,56 +55,26 @@ 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)
{
return 0;
}
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)
{
return 0;
}
DUNE_DEPRECATED_MSG("use pcnw() (uncapitalized 'cnw') instead")
static Scalar pCNW(const Params &params, Scalar sw)
{
return pcnw(params, sw);
}
static Scalar pcgn(const Params &params, Scalar St)
{
return 0;
}
DUNE_DEPRECATED_MSG("use pcgn() (uncapitalized 'cgn') instead")
static Scalar pCGN(const Params &params, Scalar St)
{
return pcgn(params, St);
}
static Scalar pcAlpha(const Params &params, Scalar sn)
{
return(1);
}
DUNE_DEPRECATED_MSG("use pcAlpha() (uncapitalized 'c') instead")
static Scalar pCAlpha(const Params &params, Scalar sn)
{
return pcAlpha(params, sn);
}
/*!
* \brief The saturation-capillary pressure curve.
*
......@@ -114,13 +84,6 @@ public:
DUNE_THROW(Dune::NotImplemented, "sw(pc) for three phases not implemented! Do it yourself!");
}
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.
......@@ -131,12 +94,6 @@ public:
DUNE_THROW(Dune::NotImplemented, "dpc/dsw for three phases not implemented! Do it yourself!");
}
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 effective
* saturation to the capillary pressure.
......@@ -146,12 +103,6 @@ public:
DUNE_THROW(Dune::NotImplemented, "dsw/dpc for three phases not implemented! Do it yourself!");
}
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
......
lecture/mm/heavyoil/3p/parkervangenuchtenzerohysteresis.hh
View file @ c692b1e4
......@@ -25,8 +25,10 @@
#ifndef DUMUX_PARKERVANGENZEROHYST_3P_HH
#define DUMUX_PARKERVANGENZEROHYST_3P_HH
#include <cmath>
#include <algorithm>
#include <dune/common/fvector.hh>
#include <dumux/material/fluidmatrixinteractions/fluidmatrixinteraction.hh>
namespace Dumux::FluidMatrix {
......
lecture/mm/heavyoil/3p/parkervangenuchtenzerohysteresisparams.hh
View file @ c692b1e4
......@@ -108,12 +108,6 @@ public:
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.
......@@ -125,12 +119,6 @@ public:
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.
......@@ -140,12 +128,6 @@ public:
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.
......@@ -157,12 +139,6 @@ public:
vgn_ = n; vgm_ = 1 - 1/vgn_;
}
DUNE_DEPRECATED_MSG("use setVgn() (uncapitalized 'n') instead")
void setVgN(Scalar n)
{
setVgn(n);
}
/*!
* \brief Return the residual saturation.
*/
......@@ -194,7 +170,6 @@ public:
setSgr(residualSaturation[2]);
}
/*!
* \brief Return the residual wetting saturation.
*/
......@@ -203,12 +178,6 @@ public:
return swr_;
}
DUNE_DEPRECATED_MSG("use swr() (uncapitalized 's') instead")
Scalar Swr() const
{
return swr();
}
/*!
* \brief Set the residual wetting saturation.
*/
......@@ -225,12 +194,6 @@ public:
return snr_;
}
DUNE_DEPRECATED_MSG("use snr() (uncapitalized 's') instead")
Scalar Snr() const
{
return snr();
}
/*!
* \brief Set the residual nonwetting saturation.
*/
......@@ -247,12 +210,6 @@ public:
return sgr_;
}
DUNE_DEPRECATED_MSG("use sgr() (uncapitalized 's') instead")
Scalar Sgr() const
{
return sgr();
}
/*!
* \brief Set the residual gas saturation.
*/
......@@ -266,12 +223,6 @@ public:
return swrx_;
}
DUNE_DEPRECATED_MSG("use swrx() (uncapitalized 's') instead")
Scalar Swrx() const
{
return swrx();
}
/*!
* \brief Set the residual gas saturation.
*/
......@@ -288,34 +239,16 @@ public:
betaNw_ = input;
}
DUNE_DEPRECATED_MSG("use setBetaNw() (uncapitalized 'w') instead")
void setBetaNW(Scalar input)
{
setBetaNw(input);
}
void setBetaGn(Scalar input)
{
betaGn_ = input;
}
DUNE_DEPRECATED_MSG("use setBetaGn() (uncapitalized 'n') instead")
void setBetaGN(Scalar input)
{
setBetaGn(input);
}
void setBetaGw(Scalar input)
{
betaGw_ = input;
}
DUNE_DEPRECATED_MSG("use setBetaGw() (uncapitalized 'w') instead")
void setBetaGW(Scalar input)
{
setBetaGw(input);
}
/*!
* \brief Return the values for the beta scaling parameters of capillary pressure between the phases
*/
......@@ -324,34 +257,16 @@ public:
return betaNw_;
}
DUNE_DEPRECATED_MSG("use betaNw() (uncapitalized 'w') instead")
Scalar betaNW() const
{
return betaNw();
}
Scalar betaGn() const
{
return betaGn_;
}
DUNE_DEPRECATED_MSG("use betaGn() (uncapitalized 'n') instead")
Scalar betaGN() const
{
return betaGn();
}
Scalar betaGw() const
{
return betaGw_;
}
DUNE_DEPRECATED_MSG("use betaGw() (uncapitalized 'w') instead")
Scalar betaGW() const
{
return betaGw();
}
/*!
* \brief defines if residual n-phase saturation should be regarded in its relative permeability.
*/
......@@ -360,12 +275,6 @@ public:
krRegardsSnr_ = input;
}
DUNE_DEPRECATED_MSG("use setKrRegardsSnr() (capitalized 'K') instead")
void setkrRegardsSnr(bool input)
{
setKrRegardsSnr(input);
}
/*!
* \brief Calls if residual n-phase saturation should be regarded in its relative permeability.
*/
......@@ -374,7 +283,6 @@ public:
return krRegardsSnr_;
}
/*!
* \brief Return the bulk density of the porous medium
*/
......
lecture/mm/heavyoil/3p/parkervangenuchtenzeroparams.hh
View file @ c692b1e4
......@@ -106,12 +106,6 @@ public:
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.
......@@ -123,12 +117,6 @@ public:
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.
......@@ -138,12 +126,6 @@ public:
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.
......@@ -155,12 +137,6 @@ public:
vgn_ = n; vgm_ = 1 - 1/vgn_;
}
DUNE_DEPRECATED_MSG("use setVgn() (uncapitalized 'n') instead")
void setVgN(Scalar n)
{
setVgn(n);
}
/*!
* \brief Return the residual saturation.
*/
......@@ -199,12 +175,6 @@ public:
return swr_;
}
DUNE_DEPRECATED_MSG("use swr() (uncapitalized 's') instead")
Scalar Swr() const
{
return swr();
}
/*!
* \brief Set the residual wetting saturation.
*/
......@@ -221,12 +191,6 @@ public:
return snr_;
}
DUNE_DEPRECATED_MSG("use snr() (uncapitalized 's') instead")
Scalar Snr() const
{
return snr();
}
/*!
* \brief Set the residual nonwetting saturation.
*/
......@@ -243,12 +207,6 @@ public:
return sgr_;
}
DUNE_DEPRECATED_MSG("use sgr() (uncapitalized 's') instead")
Scalar Sgr() const
{
return sgr();
}
/*!
* \brief Set the residual gas saturation.
*/
......@@ -262,12 +220,6 @@ public:
return swrx_;
}
DUNE_DEPRECATED_MSG("use swrx() (uncapitalized 's') instead")
Scalar Swrx() const
{
return swrx();
}
/*!
* \brief Set the residual gas saturation.
*/
......@@ -284,34 +236,16 @@ public:
betaNw_ = input;
}
DUNE_DEPRECATED_MSG("use setBetaNw() (uncapitalized 'w') instead")
void setBetaNW(Scalar input)
{
setBetaNw(input);
}
void setBetaGn(Scalar input)
{
betaGn_ = input;
}
DUNE_DEPRECATED_MSG("use setBetaGn() (uncapitalized 'n') instead")
void setBetaGN(Scalar input)
{
setBetaGn(input);
}
void setBetaGw(Scalar input)
{
betaGw_ = input;
}
DUNE_DEPRECATED_MSG("use setBetaGw() (uncapitalized 'w') instead")
void setBetaGW(Scalar input)
{
setBetaGw(input);
}
/*!
* \brief Return the values for the beta scaling parameters of capillary pressure between the phases
*/
......@@ -320,34 +254,16 @@ public:
return betaNw_;
}
DUNE_DEPRECATED_MSG("use betaNw() (uncapitalized 'w') instead")
Scalar betaNW() const
{
return betaNw();
}
Scalar betaGn() const
{
return betaGn_;
}
DUNE_DEPRECATED_MSG("use betaGn() (uncapitalized 'n') instead")
Scalar betaGN() const
{
return betaGn();
}
Scalar betaGw() const
{
return betaGw_;
}
DUNE_DEPRECATED_MSG("use betaGw() (uncapitalized 'w') instead")
Scalar betaGW() const
{
return betaGw();
}
/*!
* \brief defines if residual n-phase saturation should be regarded in its relative permeability.
*/
......@@ -356,12 +272,6 @@ public:
krRegardsSnr_ = input;
}
DUNE_DEPRECATED_MSG("use setKrRegardsSnr() (capitalized 'K') instead")
void setkrRegardsSnr(bool input)
{
setKrRegardsSnr(input);
}
/*!
* \brief Calls if residual n-phase saturation should be regarded in its relative permeability.
*/
......
lecture/mm/heavyoil/3p/relativepermeabilityhysteresis.hh
View file @ c692b1e4
......@@ -52,90 +52,41 @@ 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)
{
return 0;
}
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)
{
return 0;
}
DUNE_DEPRECATED_MSG("use pcnw() (uncapitalized 'cnw') instead")
static Scalar pCNW(const Params &params, Scalar sw)
{
return pcnw(params, sw);
}
static Scalar pcgn(const Params &params, Scalar St)
{
return 0;
}
DUNE_DEPRECATED_MSG("use pcgn() (uncapitalized 'cgn') instead")
static Scalar pCGN(const Params &params, Scalar St)
{
return pcgn(params, St);
}
static Scalar pcAlpha(const Params &params, Scalar sn)
{
return(1);
}
DUNE_DEPRECATED_MSG("use pcAlpha() (uncapitalized 'c') instead")
static Scalar pCAlpha(const Params &params, Scalar sn)
{
return pcAlpha(params, sn);
}
static Scalar sw(const Params &params, Scalar pc)
{
DUNE_THROW(Dune::NotImplemented, "sw(pc) for three phases not implemented! Do it yourself!");
}
DUNE_DEPRECATED_MSG("use sw() (uncapitalized 's') instead")
static Scalar Sw(const Params &params, Scalar pc)
{
return sw(params, pc);
}
static Scalar dpc_dsw(const Params &params, Scalar sw)
{
DUNE_THROW(Dune::NotImplemented, "dpc/dsw for three phases not implemented! Do it yourself!");
}
DUNE_DEPRECATED_MSG("use dpc_dsw() (uncapitalized 'c', 's') instead")
static Scalar dpC_dSw(const Params &params, Scalar sw)
{
return dpc_dsw(params, sw);
}
static Scalar dsw_dpc(const Params &params, Scalar pc)
{
DUNE_THROW(Dune::NotImplemented, "dsw/dpc for three phases not implemented! Do it yourself!");
}
DUNE_DEPRECATED_MSG("use dsw_dpc() (uncapitalized 's', 'c') instead")
static Scalar dSw_dpC(const Params &params, Scalar pc)
{
return dsw_dpc(params, pc);
}
static Scalar C1_w(const Params &params, Scalar sw, Scalar sn, Scalar sg)
{
Scalar C1_w_ = ((sn - params.Snc())*params.C1_wn() + (sg - params.Sgc())*params.C1_wg()) / (1-sw-params.Snc()- params.Sgc());
......
lecture/mm/heavyoil/3p/relativepermeabilityhysteresisparams.hh
View file @ c692b1e4
......@@ -480,12 +480,6 @@ public:
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.
......@@ -497,12 +491,6 @@ public:
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.
......@@ -512,12 +500,6 @@ public:
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