diff --git a/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh b/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh
index c6a5d3a06a232f727f55baedd4303c58314529fe..4f0d7561f27224d340148560aab2197e3fa0052b 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh
@@ -232,8 +232,8 @@ private:
template<class TypeTag>
typename EvalCflFluxDefault<TypeTag>::Scalar EvalCflFluxDefault<TypeTag>::getCFLFluxFunction(const Element& element)
{
- Scalar residualSatW = problem_.spatialParams().materialLawParams(element).Swr();
- Scalar residualSatNW = problem_.spatialParams().materialLawParams(element).Snr();
+ Scalar residualSatW = problem_.spatialParams().materialLawParams(element).swr();
+ Scalar residualSatNW = problem_.spatialParams().materialLawParams(element).snr();
// compute dt restriction
Scalar volumeCorrectionFactor = 1 - residualSatW - residualSatNW;
diff --git a/dumux/decoupled/2p2c/fvtransport2p2c.hh b/dumux/decoupled/2p2c/fvtransport2p2c.hh
index bb4ea0a676d4f4615a955b34925879b138d0a608..beb9450b06e7b4173424eae2487937b245874be8 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2c.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2c.hh
@@ -402,10 +402,10 @@ void FVTransport2P2C<TypeTag>::getFlux(Dune::FieldVector<Scalar, 2>& fluxEntries
PhaseVector SmobI(0.);
SmobI[wPhaseIdx] = std::max((cellDataI.saturation(wPhaseIdx)
- - problem().spatialParams().materialLawParams(*elementPtrI).Swr())
+ - problem().spatialParams().materialLawParams(*elementPtrI).swr())
, 1e-2);
SmobI[nPhaseIdx] = std::max((cellDataI.saturation(nPhaseIdx)
- - problem().spatialParams().materialLawParams(*elementPtrI).Snr())
+ - problem().spatialParams().materialLawParams(*elementPtrI).snr())
, 1e-2);
Scalar densityWI (0.), densityNWI(0.);
@@ -649,10 +649,10 @@ void FVTransport2P2C<TypeTag>::getFluxOnBoundary(Dune::FieldVector<Scalar, 2>& f
DimMatrix K_I(problem().spatialParams().intrinsicPermeability(*elementPtrI));
Scalar SwmobI = std::max((cellDataI.saturation(wPhaseIdx)
- - problem().spatialParams().materialLawParams(*elementPtrI).Swr())
+ - problem().spatialParams().materialLawParams(*elementPtrI).swr())
, 1e-2);
Scalar SnmobI = std::max((cellDataI.saturation(nPhaseIdx)
- - problem().spatialParams().materialLawParams(*elementPtrI).Snr())
+ - problem().spatialParams().materialLawParams(*elementPtrI).snr())
, 1e-2);
Scalar densityWI (0.), densityNWI(0.);
diff --git a/dumux/decoupled/2p2c/fvtransport2p2cadaptive.hh b/dumux/decoupled/2p2c/fvtransport2p2cadaptive.hh
index a64c3f0c6910f51a0e10f2e99e2d5bc48433d1cc..3aa724d7cd99f07b3e5c5517b38b57aca5dc9836 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2cadaptive.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2cadaptive.hh
@@ -316,10 +316,10 @@ void FVTransport2P2CAdaptive<TypeTag>::getMpfaFlux(Dune::FieldVector<Scalar, 2>&
PhaseVector SmobI(0.);
SmobI[wPhaseIdx] = std::max((cellDataI.saturation(wPhaseIdx)
- - problem().spatialParams().materialLawParams(*elementI).Swr())
+ - problem().spatialParams().materialLawParams(*elementI).swr())
, 1e-2);
SmobI[nPhaseIdx] = std::max((cellDataI.saturation(nPhaseIdx)
- - problem().spatialParams().materialLawParams(*elementI).Snr())
+ - problem().spatialParams().materialLawParams(*elementI).snr())
, 1e-2);
Scalar densityWI (0.), densityNWI(0.);
diff --git a/dumux/implicit/2pdfm/2pdfmvolumevariables.hh b/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
index 22605f37ea071b7f20fcba4c3e7bd71ab31409a1..c1e90cf67934ea46f8d102a02dbf4e49181c6eee 100644
--- a/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
+++ b/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
@@ -244,7 +244,7 @@ public:
/*
* Inverse capillary pressure function SwM = pcM^(-1)(pcF(SwF))
*/
- satWMatrix_ = MaterialLaw::Sw(materialParamsMatrix, pCFracture_);
+ satWMatrix_ = MaterialLaw::sw(materialParamsMatrix, pCFracture_);
satNMatrix_ = 1 - satWMatrix_;
}
}
diff --git a/dumux/implicit/richards/richardsnewtoncontroller.hh b/dumux/implicit/richards/richardsnewtoncontroller.hh
index 0b8bbd62ab8920147225b31f428ea6777a7547f6..430bf925e4bdcb99523b961e843656042c8d6b3e 100644
--- a/dumux/implicit/richards/richardsnewtoncontroller.hh
+++ b/dumux/implicit/richards/richardsnewtoncontroller.hh
@@ -107,7 +107,7 @@ public:
Scalar pN = std::max(this->problem_().referencePressure(*elemIt, fvGeometry, scvIdx),
pW + pcMin);
Scalar pcOld = pN - pW;
- Scalar SwOld = std::max<Scalar>(0.0, MaterialLaw::Sw(mp, pcOld));
+ Scalar SwOld = std::max<Scalar>(0.0, MaterialLaw::sw(mp, pcOld));
// convert into minimum and maximum wetting phase
// pressures
diff --git a/dumux/implicit/richards/richardsvolumevariables.hh b/dumux/implicit/richards/richardsvolumevariables.hh
index 8e1409fdda1e409918ce835822b8a56ee422d9d9..dfa9c2b59b9aa6332823b26df2689fab9af69b22 100644
--- a/dumux/implicit/richards/richardsvolumevariables.hh
+++ b/dumux/implicit/richards/richardsvolumevariables.hh
@@ -128,7 +128,7 @@ public:
fluidState.setPressure(nPhaseIdx, std::max(pnRef, priVars[pwIdx] + minPc));
// saturations
- Scalar Sw = MaterialLaw::Sw(matParams, fluidState.pressure(nPhaseIdx) - fluidState.pressure(wPhaseIdx));
+ Scalar Sw = MaterialLaw::sw(matParams, fluidState.pressure(nPhaseIdx) - fluidState.pressure(wPhaseIdx));
fluidState.setSaturation(wPhaseIdx, Sw);
fluidState.setSaturation(nPhaseIdx, 1 - Sw);
diff --git a/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh b/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
index f351cc75977c01c824063acbf19af449581400d1..a623f0c646ed8401b5d688e9eb707827c985a55d 100644
--- a/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
@@ -88,7 +88,7 @@ public:
* is constructed accordingly. Afterwards the values are set there, too.
* \return Effective wetting phase saturation calculated as inverse of BrooksCorey constitutive relation.
*/
- static Scalar Sw(const Params ¶ms, Scalar pC)
+ static Scalar sw(const Params ¶ms, Scalar pC)
{
assert(pC >= 0);
@@ -96,6 +96,12 @@ 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 ¶ms, Scalar pC)
+ {
+ return sw(params, pC);
+ }
+
/*!
* \brief The partial derivative of the capillary
* pressure w.r.t. the effective saturation according to Brooks & Corey.
diff --git a/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh b/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
index e3d4677bfe23bf30e491cf0391489024c2d6c7fc..862977e13dcc483f643e22d266d55f12774c3ca1 100644
--- a/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
@@ -80,7 +80,7 @@ public:
*/
static Scalar pC(const Params ¶ms, Scalar Sw)
{
- return EffLaw::pC(params, SwToSwe(params, Sw));
+ return EffLaw::pC(params, swToSwe(params, Sw));
}
/*!
@@ -94,9 +94,15 @@ public:
*
* \return The absolute saturation of the wetting phase \f$S_w\f$
*/
+ static Scalar sw(const Params ¶ms, Scalar pC)
+ {
+ return sweToSw_(params, EffLaw::sw(params, pC));
+ }
+
+ DUNE_DEPRECATED_MSG("use sw() (uncapitalized 's') instead")
static Scalar Sw(const Params ¶ms, Scalar pC)
{
- return SweToSw_(params, EffLaw::Sw(params, pC));
+ return sw(params, pC);
}
/*!
@@ -116,7 +122,7 @@ public:
*/
static Scalar dpC_dSw(const Params ¶ms, Scalar Sw)
{
- return EffLaw::dpC_dSw(params, SwToSwe(params, Sw) )*dSwe_dSw_(params);
+ return EffLaw::dpC_dSw(params, swToSwe(params, Sw) )*dSwe_dSw_(params);
}
/*!
@@ -154,7 +160,7 @@ public:
*/
static Scalar krw(const Params ¶ms, Scalar Sw)
{
- return EffLaw::krw(params, SwToSwe(params, Sw));
+ return EffLaw::krw(params, swToSwe(params, Sw));
};
/*!
@@ -169,7 +175,7 @@ public:
*/
static Scalar krn(const Params ¶ms, Scalar Sw)
{
- return EffLaw::krn(params, SwToSwe(params, Sw));
+ return EffLaw::krn(params, swToSwe(params, Sw));
}
/*!
@@ -181,9 +187,15 @@ public:
* is constructed accordingly. Afterwards the values are set there, too.
* \return Effective saturation of the wetting phase.
*/
+ static Scalar swToSwe(const Params ¶ms, Scalar Sw)
+ {
+ return (Sw - params.swr())/(1 - params.swr() - params.snr());
+ }
+
+ DUNE_DEPRECATED_MSG("use swToSwe() (uncapitalized 's') instead")
static Scalar SwToSwe(const Params ¶ms, Scalar Sw)
{
- return (Sw - params.Swr())/(1 - params.Swr() - params.Snr());
+ return swToSwe(params, Sw);
}
/*!
@@ -195,9 +207,15 @@ public:
* is constructed accordingly. Afterwards the values are set there, too.
* \return Effective saturation of the non-wetting phase.
*/
+ static Scalar snToSne(const Params ¶ms, Scalar Sn)
+ {
+ return (Sn - params.snr())/(1 - params.swr() - params.snr());
+ }
+
+ DUNE_DEPRECATED_MSG("use snToSne() (uncapitalized 's') instead")
static Scalar SnToSne(const Params ¶ms, Scalar Sn)
{
- return (Sn - params.Snr())/(1 - params.Swr() - params.Snr());
+ return snToSne(params, Sn);
}
private:
@@ -210,9 +228,9 @@ private:
* is constructed accordingly. Afterwards the values are set there, too.
* \return Absolute saturation of the non-wetting phase.
*/
- static Scalar SweToSw_(const Params ¶ms, Scalar Swe)
+ static Scalar sweToSw_(const Params ¶ms, Scalar Swe)
{
- return Swe*(1 - params.Swr() - params.Snr()) + params.Swr();
+ return Swe*(1 - params.swr() - params.snr()) + params.swr();
}
/*!
@@ -224,7 +242,7 @@ private:
* \return Derivative of the effective saturation w.r.t. the absolute saturation.
*/
static Scalar dSwe_dSw_(const Params ¶ms)
- { return 1.0/(1 - params.Swr() - params.Snr()); }
+ { return 1.0/(1 - params.swr() - params.snr()); }
/*!
* \brief Derivative of the absolute saturation w.r.t. the effective saturation.
@@ -235,7 +253,7 @@ private:
* \return Derivative of the absolute saturation w.r.t. the effective saturation.
*/
static Scalar dSw_dSwe_(const Params ¶ms)
- { return 1 - params.Swr() - params.Snr(); }
+ { return 1 - params.swr() - params.snr(); }
};
}
diff --git a/dumux/material/fluidmatrixinteractions/2p/efftoabslawparams.hh b/dumux/material/fluidmatrixinteractions/2p/efftoabslawparams.hh
index 1837f3617e324055b86ee0b50eda466e78b62aa5..65164c8e0473cdf0886afa7641ecf071492576ad 100644
--- a/dumux/material/fluidmatrixinteractions/2p/efftoabslawparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/efftoabslawparams.hh
@@ -44,35 +44,43 @@ public:
EffToAbsLawParams()
: EffLawParams()
- { Swr_ = Snr_ = 0; }
+ { swr_ = snr_ = 0; }
/*!
* \brief Return the residual wetting saturation.
*/
+ Scalar swr() const
+ { return swr_; }
+
+ DUNE_DEPRECATED_MSG("use swr() (uncapitalized 's') instead")
Scalar Swr() const
- { return Swr_; }
+ { return swr(); }
/*!
* \brief Set the residual wetting saturation.
*/
void setSwr(Scalar v)
- { Swr_ = v; }
+ { swr_ = v; }
/*!
* \brief Return the residual non-wetting saturation.
*/
+ Scalar snr() const
+ { return snr_; }
+
+ DUNE_DEPRECATED_MSG("use snr() (uncapitalized 's') instead")
Scalar Snr() const
- { return Snr_; }
+ { return snr(); }
/*!
* \brief Set the residual non-wetting saturation.
*/
void setSnr(Scalar v)
- { Snr_ = v; }
+ { snr_ = v; }
private:
- Scalar Swr_;
- Scalar Snr_;
+ Scalar swr_;
+ Scalar snr_;
};
}
diff --git a/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh b/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh
index e346dda92c6639bf692ac04f766120b2bcb66971..ed176246448f72ce92f44706deae1cfcc19ed7b7 100644
--- a/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh
@@ -84,11 +84,17 @@ public:
* is constructed accordingly. Afterwards the values are set there, too.
* \return Effective wetting phase saturation calculated as inverse of the linear constitutive relation.
*/
- static Scalar Sw(const Params ¶ms, Scalar pC)
+ static Scalar sw(const Params ¶ms, Scalar pC)
{
return 1 - (pC - params.entryPC())/(params.maxPC() - params.entryPC());
}
+ DUNE_DEPRECATED_MSG("use sw() (uncapitalized 's') instead")
+ static Scalar Sw(const Params ¶ms, Scalar pC)
+ {
+ return sw(params, pC);
+ }
+
/*!
* \brief Returns the partial derivative of the capillary
* pressure w.r.t. the effective saturation.
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
index 1b9b5533d4ebf99516de0d116a597c810b3fc29a..a96f23f794340dfdff069e288cee4207325c5e21 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
@@ -117,16 +117,16 @@ public:
*
* For the non-regularized part:
*
- * \copydetails BrooksCorey::Sw()
+ * \copydetails BrooksCorey::sw()
*/
- static Scalar Sw(const Params ¶ms, Scalar pC)
+ static Scalar sw(const Params ¶ms, Scalar pC)
{
const Scalar Sthres = params.thresholdSw();
// calculate the saturation which corrosponds to the
// saturation in the non-regularized version of
// the Brooks-Corey law
- Scalar Swe = BrooksCorey::Sw(params, pC);
+ Scalar Swe = BrooksCorey::sw(params, pC);
// make sure that the capilary pressure observes a
// derivative != 0 for 'illegal' saturations. This is
@@ -146,7 +146,13 @@ public:
return 1.0 + (pC - pC_SweHigh)/m;;
}
- return BrooksCorey::Sw(params, pC);
+ return BrooksCorey::sw(params, pC);
+ }
+
+ DUNE_DEPRECATED_MSG("use sw() (uncapitalized 's') instead")
+ static Scalar Sw(const Params ¶ms, Scalar pC)
+ {
+ return sw(params, pC);
}
/*!
@@ -211,7 +217,7 @@ public:
if (pC < 0)
Swe = 1.5; // make sure we regularize below
else
- Swe = BrooksCorey::Sw(params, pC);
+ Swe = BrooksCorey::sw(params, pC);
// derivative of the regularization
if (Swe <= Sthres) {
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh
index 4c4ce07fd36499ad8bbd284f40baa4cd50d240be..3fbb4bdf034cde6ac05c41bbbc5fda90395223c8 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh
@@ -97,9 +97,15 @@ public:
* is constructed accordingly. Afterwards the values are set there, too.
* \return The effective saturation of the wetting phase \f$\overline{S}_w\f$
*/
+ static Scalar sw(const Params ¶ms, Scalar pC)
+ {
+ return LinearMaterial::sw(params, pC);
+ }
+
+ DUNE_DEPRECATED_MSG("use sw() (uncapitalized 's') instead")
static Scalar Sw(const Params ¶ms, Scalar pC)
{
- return LinearMaterial::Sw(params, pC);
+ return sw(params, pC);
}
/*!
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
index c3be9bfa2e35e4e44a06d30356d58852e6f3c652..d8293561d947051dafdaf0299e7cb7398c9fe738 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
@@ -139,10 +139,10 @@ public:
*
* For not-regularized part:
*
- \copydetails VanGenuchten::Sw()
+ \copydetails VanGenuchten::sw()
*
*/
- static Scalar Sw(const Params ¶ms, Scalar pC)
+ static Scalar sw(const Params ¶ms, Scalar pC)
{
// retrieve the low and the high threshold saturations for the
// unregularized capillary pressure curve from the parameters
@@ -160,7 +160,7 @@ public:
return pC/m1 + 1.0;
}
else
- Sw = VanGenuchten::Sw(params, pC);
+ Sw = VanGenuchten::sw(params, pC);
// invert the regularization if necessary
if (Sw <= SwThLow) {
@@ -185,6 +185,12 @@ public:
return Sw;
}
+ DUNE_DEPRECATED_MSG("use sw() (uncapitalized 's') instead")
+ static Scalar Sw(const Params ¶ms, 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
@@ -235,7 +241,7 @@ public:
if (pC < 0)
Sw = 1.5; // make sure we regularize below
else
- Sw = VanGenuchten::Sw(params, pC);
+ Sw = VanGenuchten::sw(params, pC);
// derivative of the regularization
if (Sw < params.pCLowSw()) {
diff --git a/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh b/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
index 40f4c411b1fe672234f76203162640d03b91b3d1..42be026b9d3a13fe7f4a15eddfb0ff9bcea5f008 100644
--- a/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
@@ -85,13 +85,19 @@ public:
* is constructed accordingly. Afterwards the values are set there, too.
* \return The effective saturation of the wetting phase \f$\overline{S}_w\f$
*/
- static Scalar Sw(const Params ¶ms, Scalar pC)
+ static Scalar sw(const Params ¶ms, Scalar pC)
{
assert(pC >= 0);
return pow(pow(params.vgAlpha()*pC, params.vgN()) + 1, -params.vgM());
}
+ DUNE_DEPRECATED_MSG("use sw() (uncapitalized 's') instead")
+ static Scalar Sw(const Params ¶ms, Scalar pC)
+ {
+ return sw(params, pC);
+ }
+
/*!
* \brief The partial derivative of the capillary
* pressure w.r.t. the effective saturation according to van Genuchten.
diff --git a/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh b/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh
index 4e5143e5f9c13dc24c60e5c29474331114b65740..c7ea5c9bdcc5e1243c3e3bf085836e4ea05a2716 100644
--- a/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh
@@ -73,7 +73,7 @@ public:
Scalar pc,pc_prime,Se_regu;
Scalar PC_VG_REG = 0.01;
- Se = (Sw-params.Swr())/(1.-params.Sgr());
+ Se = (Sw-params.swr())/(1.-params.sgr());
/* Snr = 0.0; test version */
@@ -96,7 +96,7 @@ public:
/* value and derivative at regularization point */
if (Se<=PC_VG_REG) Se_regu = PC_VG_REG; else Se_regu = 1-PC_VG_REG;
pc = std::pow(std::pow(Se_regu,-1/vg_m)-1,1/params.vgN())/params.vgAlpha();
- pc_prime = std::pow(std::pow(Se_regu,-1/vg_m)-1,1/params.vgN()-1)*std::pow(Se_regu,-1/vg_m-1)*(-1/vg_m)/params.vgAlpha()/(1-params.Sgr()-params.Swr())/params.vgN();
+ pc_prime = std::pow(std::pow(Se_regu,-1/vg_m)-1,1/params.vgN()-1)*std::pow(Se_regu,-1/vg_m-1)*(-1/vg_m)/params.vgAlpha()/(1-params.sgr()-params.swr())/params.vgN();
/* evaluate tangential */
r = (Se-Se_regu)*pc_prime+pc;
@@ -117,7 +117,7 @@ public:
Scalar pc,pc_prime,Se_regu;
Scalar PC_VG_REG = 0.01;
- Se = (Sw-params.Swr())/(1.-params.Snr());
+ Se = (Sw-params.swr())/(1.-params.snr());
/* Snr = 0.0; test version */
@@ -140,7 +140,7 @@ public:
/* value and derivative at regularization point */
if (Se<=PC_VG_REG) Se_regu = PC_VG_REG; else Se_regu = 1-PC_VG_REG;
pc = std::pow(std::pow(Se_regu,-1/vg_m)-1,1/params.vgN())/params.vgAlpha();
- pc_prime = std::pow(std::pow(Se_regu,-1/vg_m)-1,1/params.vgN()-1)*std::pow(Se_regu,-1/vg_m-1)*(-1/vg_m)/params.vgAlpha()/(1-params.Snr()-params.Swr())/params.vgN();
+ pc_prime = std::pow(std::pow(Se_regu,-1/vg_m)-1,1/params.vgN()-1)*std::pow(Se_regu,-1/vg_m-1)*(-1/vg_m)/params.vgAlpha()/(1-params.snr()-params.swr())/params.vgN();
/* evaluate tangential */
r = (Se-Se_regu)*pc_prime+pc;
@@ -160,7 +160,7 @@ public:
Scalar pc,pc_prime,Se_regu;
Scalar PC_VG_REG = 0.01;
- Se = (St-params.Swrx())/(1.-params.Swrx());
+ Se = (St-params.swrx())/(1.-params.swrx());
/* Snr = 0.0; test version */
@@ -183,7 +183,7 @@ public:
/* value and derivative at regularization point */
if (Se<=PC_VG_REG) Se_regu = PC_VG_REG; else Se_regu = 1-PC_VG_REG;
pc = std::pow(std::pow(Se_regu,-1/vg_m)-1,1/params.vgN())/params.vgAlpha();
- pc_prime = std::pow(std::pow(Se_regu,-1/vg_m)-1,1/params.vgN()-1)*std::pow(Se_regu,-1/vg_m-1)*(-1/vg_m)/params.vgAlpha()/(1-params.Sgr()-params.Swrx())/params.vgN();
+ pc_prime = std::pow(std::pow(Se_regu,-1/vg_m)-1,1/params.vgN()-1)*std::pow(Se_regu,-1/vg_m-1)*(-1/vg_m)/params.vgAlpha()/(1-params.sgr()-params.swrx())/params.vgN();
/* evaluate tangential */
r = (Se-Se_regu)*pc_prime+pc;
@@ -201,10 +201,10 @@ public:
if (Sne<=0.001) Sne=0.0;
if (Sne>=1.0) Sne=1.0;
- if (Sne>params.Snr()) alpha = 1.0;
+ if (Sne>params.snr()) alpha = 1.0;
else
{
- if (params.Snr()>=0.001) alpha = Sne/params.Snr();
+ if (params.snr()>=0.001) alpha = Sne/params.snr();
else alpha = 0.0;
}
return(alpha);
@@ -214,11 +214,18 @@ public:
* \brief The saturation-capillary pressure curve.
*
*/
- static Scalar Sw(const Params ¶ms, Scalar pC)
+ static Scalar sw(const Params ¶ms, 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 ¶ms, Scalar pC)
+ {
+ return sw(params, pC);
+ }
+
/*!
* \brief Returns the partial derivative of the capillary
* pressure to the effective saturation.
@@ -256,7 +263,7 @@ public:
{
//transformation to effective saturation
- Scalar Se = (saturation - params.Swr()) / (1-params.Swr());
+ Scalar Se = (saturation - params.swr()) / (1-params.swr());
/* regularization */
if(Se > 1.0) return 1.;
@@ -286,8 +293,8 @@ public:
static Scalar krn(const Params ¶ms, Scalar Sw, Scalar saturation, Scalar Sg)
{
- Scalar Swe = std::min((Sw - params.Swr()) / (1 - params.Swr()), 1.);
- Scalar Ste = std::min((Sw + saturation - params.Swr()) / (1 - params.Swr()), 1.);
+ Scalar Swe = std::min((Sw - params.swr()) / (1 - params.swr()), 1.);
+ Scalar Ste = std::min((Sw + saturation - params.swr()) / (1 - params.swr()), 1.);
// regularization
if(Swe <= 0.0) Swe = 0.;
@@ -302,11 +309,11 @@ public:
if (params.krRegardsSnr())
{
// regard Snr in the permeability of the n-phase, see Helmig1997
- Scalar resIncluded = std::max(std::min((saturation - params.Snr()/ (1-params.Swr())), 1.), 0.);
+ Scalar resIncluded = std::max(std::min((saturation - params.snr()/ (1-params.swr())), 1.), 0.);
krn_ *= std::sqrt(resIncluded );
}
else
- krn_ *= std::sqrt(saturation / (1 - params.Swr())); // Hint: (Ste - Swe) = Sn / (1-Srw)
+ krn_ *= std::sqrt(saturation / (1 - params.swr())); // Hint: (Ste - Swe) = Sn / (1-Srw)
return krn_;
@@ -331,7 +338,7 @@ public:
{
// Se = (Sw+Sn - Sgr)/(1-Sgr)
- Scalar Se = std::min(((1-saturation) - params.Sgr()) / (1 - params.Sgr()), 1.);
+ Scalar Se = std::min(((1-saturation) - params.sgr()) / (1 - params.sgr()), 1.);
/* regularization */
@@ -340,7 +347,7 @@ public:
Scalar scalFact = 1.;
if (saturation<=0.1)
{
- scalFact = (saturation - params.Sgr())/(0.1 - params.Sgr());
+ scalFact = (saturation - params.sgr())/(0.1 - params.sgr());
if (scalFact < 0.) scalFact = 0.;
}
diff --git a/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3pparams.hh b/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3pparams.hh
index d96ef62b27dc3384fb77b1be5b89b163ac58b56a..054648973c40da9987d544f021edd710df43521e 100644
--- a/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3pparams.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3pparams.hh
@@ -114,13 +114,13 @@ public:
switch (phaseIdx)
{
case 0:
- return Swr_;
+ return swr_;
break;
case 1:
- return Snr_;
+ return snr_;
break;
case 2:
- return Sgr_;
+ return sgr_;
break;
}
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
@@ -140,47 +140,63 @@ public:
/*!
* \brief Return the residual wetting saturation.
*/
+ Scalar swr() const
+ { return swr_; }
+
+ DUNE_DEPRECATED_MSG("use swr() (uncapitalized 's') instead")
Scalar Swr() const
- { return Swr_; }
+ { return swr(); }
/*!
* \brief Set the residual wetting saturation.
*/
void setSwr(Scalar input)
- { Swr_ = input; }
+ { swr_ = input; }
/*!
* \brief Return the residual non-wetting saturation.
*/
+ Scalar snr() const
+ { return snr_; }
+
+ DUNE_DEPRECATED_MSG("use snr() (uncapitalized 's') instead")
Scalar Snr() const
- { return Snr_; }
+ { return snr(); }
/*!
* \brief Set the residual non-wetting saturation.
*/
void setSnr(Scalar input)
- { Snr_ = input; }
+ { snr_ = input; }
/*!
* \brief Return the residual gas saturation.
*/
+ Scalar sgr() const
+ { return sgr_; }
+
+ DUNE_DEPRECATED_MSG("use sgr() (uncapitalized 's') instead")
Scalar Sgr() const
- { return Sgr_; }
+ { return sgr(); }
/*!
* \brief Set the residual gas saturation.
*/
void setSgr(Scalar input)
- { Sgr_ = input; }
+ { sgr_ = input; }
+
+ Scalar swrx() const
+ { return swrx_; }
+ DUNE_DEPRECATED_MSG("use swrx() (uncapitalized 's') instead")
Scalar Swrx() const
- { return Swrx_; }
+ { return swrx(); }
/*!
* \brief Set the residual gas saturation.
*/
void setSwrx(Scalar input)
- { Swrx_ = input; }
+ { swrx_ = input; }
/*!
* \brief defines the scaling parameters of capillary pressure between the phases (=1 for Gas-Water)
@@ -247,10 +263,10 @@ private:
Scalar vgAlpha_;
Scalar vgM_;
Scalar vgN_;
- Scalar Swr_;
- Scalar Snr_;
- Scalar Sgr_;
- Scalar Swrx_; /* (Sw+Sn)_r */
+ Scalar swr_;
+ Scalar snr_;
+ Scalar sgr_;
+ Scalar swrx_; /* (Sw+Sn)_r */
Scalar KdNAPL_;
Scalar rhoBulk_;
diff --git a/dumux/material/fluidmatrixinteractions/mp/mplinearmaterialparams.hh b/dumux/material/fluidmatrixinteractions/mp/mplinearmaterialparams.hh
index 935e63f8c8d0ec07f279dcf98b1bd15bb0b16573..a4223ad7a4a3e013af38960c2e5ea6c7439778e6 100644
--- a/dumux/material/fluidmatrixinteractions/mp/mplinearmaterialparams.hh
+++ b/dumux/material/fluidmatrixinteractions/mp/mplinearmaterialparams.hh
@@ -52,9 +52,13 @@ public:
*
* This is simply 10%
*/
- Scalar Sreg(int phaseIdx) const
+ Scalar sreg(int phaseIdx) const
{ return 0.10; }
+ DUNE_DEPRECATED_MSG("use sreg() (uncapitalized 's') instead")
+ Scalar Sreg() const
+ { return sreg(); }
+
/*!
* \brief Return the capillary pressure for a phase \f$\alpha\f$ at \f$S_\alpha=0\f$.
*/
diff --git a/test/decoupled/2p/buckleyleverettanalyticsolution.hh b/test/decoupled/2p/buckleyleverettanalyticsolution.hh
index ca12e04be8a541b18879dc2e6fd02e37e1fa5721..b415293af834a89751abadea531d1b742b92d9b5 100644
--- a/test/decoupled/2p/buckleyleverettanalyticsolution.hh
+++ b/test/decoupled/2p/buckleyleverettanalyticsolution.hh
@@ -121,8 +121,8 @@ private:
ElementIterator dummyElement = problem_.gridView().template begin<0>();
const MaterialLawParams& materialLawParams(problem_.spatialParams().materialLawParams(*dummyElement));
- swr_ = materialLawParams.Swr();
- snr_ = materialLawParams.Snr();
+ swr_ = materialLawParams.swr();
+ snr_ = materialLawParams.snr();
Scalar porosity = problem_.spatialParams().porosity(*dummyElement);
FluidState fluidState;
diff --git a/test/decoupled/2p/mcwhorteranalyticsolution.hh b/test/decoupled/2p/mcwhorteranalyticsolution.hh
index dc3c388bfa1e3fc105a5349a38c086b34c0b322e..1ae652582d2f654c289806501d26d8bbe49d0ed8 100644
--- a/test/decoupled/2p/mcwhorteranalyticsolution.hh
+++ b/test/decoupled/2p/mcwhorteranalyticsolution.hh
@@ -140,8 +140,8 @@ private:
ElementIterator dummyElement = problem_.gridView().template begin<0>();
const MaterialLawParams& materialLawParams(problem_.spatialParams().materialLawParams(*dummyElement));
- swr_ = materialLawParams.Swr();
- snr_ = materialLawParams.Snr();
+ swr_ = materialLawParams.swr();
+ snr_ = materialLawParams.snr();
porosity_ = problem_.spatialParams().porosity(*dummyElement);
permeability_ = problem_.spatialParams().intrinsicPermeability(*dummyElement)[0][0];
PrimaryVariables initVec;