From bac763ac419c03e0f7b1ec4db7256885abe70f29 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Fri, 24 May 2013 14:16:40 +0000
Subject: [PATCH] Partially implements FS#180 - Inconsistent naming - special
status of saturation. In particular, it deals with the capitalized "C" in the
capillary-pressure-saturation relationships: entryPC -> entryPc maxPC ->
maxPc pC -> pc pCAlpha -> pcalpha pCGW -> pcgw pCNW -> pcnw pCGN -> pcgn
pCHighSw -> pcHighSw pCLowSw -> pcLowSw setEntryPC -> setEntryPc setMaxPC ->
setMaxPc
Reviewed by Christoph.
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10758 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
.../decoupled/2p/diffusion/fv/fvpressure2p.hh | 4 +-
.../decoupled/2p/diffusion/fv/fvvelocity2p.hh | 2 +-
.../lmethod/fvmpfal2pfaboundpressure2p.hh | 4 +-
.../fvmpfal2pfaboundpressure2padaptive.hh | 4 +-
.../lmethod/fvmpfal2pfaboundvelocity2p.hh | 2 +-
.../fvmpfal2pfaboundvelocity2padaptive.hh | 2 +-
.../omethod/fvmpfao2pfaboundpressure2p.hh | 4 +-
.../omethod/fvmpfao2pfaboundvelocity2p.hh | 2 +-
.../fvmpfa/omethod/fvmpfaopressure2p.hh | 2 +-
.../2p/diffusion/mimetic/mimeticpressure2p.hh | 2 +-
.../2p/transport/fv/evalcflfluxcoats.hh | 4 +-
.../2p/transport/fv/fvsaturation2p.hh | 4 +-
dumux/decoupled/2p2c/fvpressure2p2c.hh | 4 +-
.../2p2c/fvpressure2p2cmultiphysics.hh | 2 +-
.../decoupled/2p2c/fvpressurecompositional.hh | 6 +--
dumux/decoupled/2p2c/fvtransport2p2c.hh | 6 +--
dumux/implicit/2p/2pvolumevariables.hh | 4 +-
dumux/implicit/2p2c/2p2cvolumevariables.hh | 2 +-
dumux/implicit/2pdfm/2pdfmvolumevariables.hh | 6 +--
dumux/implicit/3p3c/3p3cvolumevariables.hh | 12 ++---
dumux/implicit/co2/co2volumevariables.hh | 2 +-
.../richards/richardsnewtoncontroller.hh | 6 +--
.../richards/richardsvolumevariables.hh | 2 +-
.../fluidmatrixinteractions/2p/brookscorey.hh | 8 ++-
.../fluidmatrixinteractions/2p/efftoabslaw.hh | 8 ++-
.../2p/linearmaterial.hh | 14 ++++--
.../2p/linearmaterialparams.hh | 50 ++++++++++++++-----
.../2p/regularizedbrookscorey.hh | 30 ++++++-----
.../2p/regularizedlinearmaterial.hh | 8 ++-
.../2p/regularizedvangenuchten.hh | 50 +++++++++++--------
.../2p/regularizedvangenuchtenparams.hh | 16 +++++-
.../2p/vangenuchten.hh | 8 ++-
.../3p/parkerVanGen3p.hh | 42 +++++++++++++---
.../fluidmatrixinteractions/mp/2padapter.hh | 2 +-
.../1p/test_diffusionspatialparams.hh | 4 +-
.../2p/test_impesadaptivespatialparams.hh | 4 +-
test/decoupled/2p/test_impesspatialparams.hh | 4 +-
.../2p/test_transportspatialparams.hh | 4 +-
.../2p2c/test_dec2p2c_spatialparams.hh | 4 +-
test/implicit/2p/lensspatialparams.hh | 8 +--
test/implicit/3p3c/infiltrationproblem.hh | 4 +-
.../implicit/mpnc/forchheimerspatialparams.hh | 4 +-
test/implicit/mpnc/obstaclespatialparams.hh | 8 +--
test/implicit/richards/richardslensproblem.hh | 2 +-
.../richards/richardslensspatialparams.hh | 8 +--
45 files changed, 243 insertions(+), 135 deletions(-)
diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
index 1b6deab794..f288eab3b4 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
@@ -821,7 +821,7 @@ const Intersection& intersection, const CellData& cellData, const bool first)
Scalar pressBound = boundValues[pressureIdx];
//calculate consitutive relations depending on the kind of saturation used
- Scalar pcBound = MaterialLaw::pC(problem_.spatialParams().materialLawParams(*element), satW);
+ Scalar pcBound = MaterialLaw::pc(problem_.spatialParams().materialLawParams(*element), satW);
//determine phase pressures from primary pressure variable
Scalar pressW = 0;
@@ -1006,7 +1006,7 @@ void FVPressure2P<TypeTag>::updateMaterialLaws()
Scalar satW = cellData.saturation(wPhaseIdx);
- Scalar pc = MaterialLaw::pC(problem_.spatialParams().materialLawParams(*eIt), satW);
+ Scalar pc = MaterialLaw::pc(problem_.spatialParams().materialLawParams(*eIt), satW);
//determine phase pressures from primary pressure variable
Scalar pressW = 0;
diff --git a/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh b/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
index bfd1fb4020..5b6c3cd033 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
@@ -525,7 +525,7 @@ void FVVelocity2P<TypeTag>::calculateVelocityOnBoundary(const Intersection& inte
}
Scalar pressBound = boundValues[pressureIdx];
- Scalar pcBound = MaterialLaw::pC(problem_.spatialParams().materialLawParams(*element), satW);
+ Scalar pcBound = MaterialLaw::pc(problem_.spatialParams().materialLawParams(*element), satW);
//determine phase pressures from primary pressure variable
Scalar pressWBound = 0;
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh
index 7d69164c47..a51cfeb725 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh
@@ -1838,7 +1838,7 @@ void FVMPFAL2PFABoundPressure2P<TypeTag>::assemble()
}
- Scalar pcBound = MaterialLaw::pC(
+ Scalar pcBound = MaterialLaw::pc(
problem_.spatialParams().materialLawParams(*elementPointer), satWBound);
Scalar gravityDiffBound = (problem_.bboxMax() - globalPosFace) * gravity_
@@ -2327,7 +2327,7 @@ void FVMPFAL2PFABoundPressure2P<TypeTag>::updateMaterialLaws()
Scalar satW = cellData.saturation(wPhaseIdx);
- Scalar pc = MaterialLaw::pC(problem_.spatialParams().materialLawParams(*eIt), satW);
+ Scalar pc = MaterialLaw::pc(problem_.spatialParams().materialLawParams(*eIt), satW);
cellData.setCapillaryPressure(pc);
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2padaptive.hh
index 910fb820ec..b64ea2da64 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2padaptive.hh
@@ -2652,7 +2652,7 @@ void FVMPFAL2PFABoundPressure2PAdaptive<TypeTag>::assemble()
}
- Scalar pcBound = MaterialLaw::pC(
+ Scalar pcBound = MaterialLaw::pc(
problem_.spatialParams().materialLawParams(*elementPointer), satWBound);
Scalar gravityDiffBound = (problem_.bboxMax() - globalPosFace) * gravity_
@@ -3372,7 +3372,7 @@ void FVMPFAL2PFABoundPressure2PAdaptive<TypeTag>::updateMaterialLaws()
Scalar satW = cellData.saturation(wPhaseIdx);
- Scalar pc = MaterialLaw::pC(problem_.spatialParams().materialLawParams(*eIt), satW);
+ Scalar pc = MaterialLaw::pc(problem_.spatialParams().materialLawParams(*eIt), satW);
cellData.setCapillaryPressure(pc);
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh
index 621f1869cd..007de5449a 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh
@@ -793,7 +793,7 @@ void FVMPFAL2PFABoundVelocity2P<TypeTag>::calculateVelocity()
}
- Scalar pcBound = MaterialLaw::pC(
+ Scalar pcBound = MaterialLaw::pc(
problem_.spatialParams().materialLawParams(*elementPointer), satWBound);
Scalar gravityDiffBound = (problem_.bboxMax() - globalPosFace) * problem_.gravity()
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh
index 35737cdf94..bb3ff1be55 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh
@@ -1136,7 +1136,7 @@ void FVMPFAL2PFABoundVelocity2PAdaptive<TypeTag>::calculateVelocity()
}
- Scalar pcBound = MaterialLaw::pC(
+ Scalar pcBound = MaterialLaw::pc(
problem_.spatialParams().materialLawParams(*elementPointer), satWBound);
Scalar gravityDiffBound = (problem_.bboxMax() - globalPosFace) * problem_.gravity()
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh
index b9bd61d17c..f4caaf2448 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh
@@ -1912,7 +1912,7 @@ void FVMPFAO2PFABoundPressure2P<TypeTag>::assemble()
}
- Scalar pcBound = MaterialLaw::pC(
+ Scalar pcBound = MaterialLaw::pc(
problem_.spatialParams().materialLawParams(*elementPointer), satWBound);
Scalar gravityDiffBound = (problem_.bboxMax() - globalPosFace) * gravity_
@@ -2090,7 +2090,7 @@ void FVMPFAO2PFABoundPressure2P<TypeTag>::updateMaterialLaws()
Scalar satW = cellData.saturation(wPhaseIdx);
- Scalar pc = MaterialLaw::pC(problem_.spatialParams().materialLawParams(*eIt), satW);
+ Scalar pc = MaterialLaw::pc(problem_.spatialParams().materialLawParams(*eIt), satW);
cellData.setCapillaryPressure(pc);
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh
index 8377c781a1..fc462b40e5 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh
@@ -673,7 +673,7 @@ void FVMPFAO2PFABoundVelocity2P<TypeTag>::calculateVelocity()
}
- Scalar pcBound = MaterialLaw::pC(
+ Scalar pcBound = MaterialLaw::pc(
problem_.spatialParams().materialLawParams(*elementPointer), satWBound);
Scalar gravityDiffBound = (problem_.bboxMax() - globalPosFace) * gravity_
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh
index 7fa0459b6b..a220ec98fc 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh
@@ -2448,7 +2448,7 @@ void FVMPFAOPressure2P<TypeTag>::updateMaterialLaws()
Scalar satW = cellData.saturation(wPhaseIdx);
Scalar satNW = cellData.saturation(nPhaseIdx);
- Scalar pc = MaterialLaw::pC(problem_.spatialParams().materialLawParams(*eIt), satW);
+ Scalar pc = MaterialLaw::pc(problem_.spatialParams().materialLawParams(*eIt), satW);
cellData.setSaturation(wPhaseIdx, satW);
cellData.setSaturation(nPhaseIdx, satNW);
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
index a22645f763..73a9fea4c2 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
@@ -348,7 +348,7 @@ void MimeticPressure2P<TypeTag>::updateMaterialLaws()
//determine phase saturations from primary saturation variable
Scalar satW = cellData.saturation(wPhaseIdx);
- Scalar pc = MaterialLaw::pC(problem_.spatialParams().materialLawParams(*eIt), satW);
+ Scalar pc = MaterialLaw::pc(problem_.spatialParams().materialLawParams(*eIt), satW);
cellData.setCapillaryPressure(pc);
diff --git a/dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh b/dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh
index 09ac8a3dc6..07185097ad 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh
@@ -550,12 +550,12 @@ void EvalCflFluxCoats<TypeTag>::addCoatsFlux(Scalar& lambdaW, Scalar& lambdaNW,
case pw:
{
potWBound = bcValues[eqIdxPress] + density_[wPhaseIdx] * gdeltaZ;
- potNWBound = bcValues[eqIdxPress] + MaterialLaw::pC(problem_.spatialParams().materialLawParams(*element), satWBound) + density_[nPhaseIdx] * gdeltaZ;
+ potNWBound = bcValues[eqIdxPress] + MaterialLaw::pc(problem_.spatialParams().materialLawParams(*element), satWBound) + density_[nPhaseIdx] * gdeltaZ;
break;
}
case pn:
{
- potWBound = bcValues[eqIdxPress] - MaterialLaw::pC(problem_.spatialParams().materialLawParams(*element), satWBound) + density_[wPhaseIdx] * gdeltaZ;
+ potWBound = bcValues[eqIdxPress] - MaterialLaw::pc(problem_.spatialParams().materialLawParams(*element), satWBound) + density_[wPhaseIdx] * gdeltaZ;
potNWBound = bcValues[eqIdxPress] + density_[nPhaseIdx] * gdeltaZ;
break;
}
diff --git a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
index cd8a991fc9..5eb0ffb519 100644
--- a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
+++ b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
@@ -750,7 +750,7 @@ void FVSaturation2P<TypeTag>::getFluxOnBoundary(Scalar& update, const Intersecti
}
}
- Scalar pcBound = MaterialLaw::pC(problem_.spatialParams().materialLawParams(*elementI), satWBound);
+ Scalar pcBound = MaterialLaw::pc(problem_.spatialParams().materialLawParams(*elementI), satWBound);
Scalar lambdaW = 0;
Scalar lambdaNW = 0;
@@ -1129,7 +1129,7 @@ void FVSaturation2P<TypeTag>::updateMaterialLaws()
Scalar satW = cellData.saturation(wPhaseIdx);
Scalar satNW = cellData.saturation(nPhaseIdx);
- Scalar pc = MaterialLaw::pC(problem_.spatialParams().materialLawParams(*eIt), satW);
+ Scalar pc = MaterialLaw::pc(problem_.spatialParams().materialLawParams(*eIt), satW);
cellData.setSaturation(wPhaseIdx, satW);
cellData.setSaturation(nPhaseIdx, satNW);
diff --git a/dumux/decoupled/2p2c/fvpressure2p2c.hh b/dumux/decoupled/2p2c/fvpressure2p2c.hh
index f828162410..2cdabe8a7e 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2c.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2c.hh
@@ -988,7 +988,7 @@ void FVPressure2P2C<TypeTag>::updateMaterialLawsInElement(const Element& element
Scalar pc(0.), oldPc(0.);
if(GET_PROP_VALUE(TypeTag, EnableCapillarity))
{
- pc = MaterialLaw::pC(problem().spatialParams().materialLawParams(elementI),
+ pc = MaterialLaw::pc(problem().spatialParams().materialLawParams(elementI),
fluidState.saturation(wPhaseIdx));
int maxiter = 5; int iterout = -1;
//start iteration loop
@@ -1016,7 +1016,7 @@ void FVPressure2P2C<TypeTag>::updateMaterialLawsInElement(const Element& element
//update with better pressures
flashSolver.concentrationFlash2p2c(fluidState, Z1, pressure,
problem().spatialParams().porosity(elementI), problem().temperatureAtPos(globalPos));
- pc = MaterialLaw::pC(problem().spatialParams().materialLawParams(elementI),
+ pc = MaterialLaw::pc(problem().spatialParams().materialLawParams(elementI),
fluidState.saturation(wPhaseIdx));
// TODO: get right criterion, do output for evaluation
//converge criterion
diff --git a/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
index d7dc58268e..507226f0b5 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
@@ -881,7 +881,7 @@ void FVPressure2P2CMultiPhysics<TypeTag>::update1pMaterialLawsInElement(const El
PhaseVector pressure(0.);
Scalar pc = 0;
if(GET_PROP_VALUE(TypeTag, EnableCapillarity))
- pc = MaterialLaw::pC(problem().spatialParams().materialLawParams(elementI),
+ pc = MaterialLaw::pc(problem().spatialParams().materialLawParams(elementI),
((presentPhaseIdx == wPhaseIdx) ? 1. : 0.)); // assign Sw = 1 if wPhase present, else 0
if(pressureType == wPhaseIdx)
{
diff --git a/dumux/decoupled/2p2c/fvpressurecompositional.hh b/dumux/decoupled/2p2c/fvpressurecompositional.hh
index af615311a3..97b7018a34 100644
--- a/dumux/decoupled/2p2c/fvpressurecompositional.hh
+++ b/dumux/decoupled/2p2c/fvpressurecompositional.hh
@@ -532,7 +532,7 @@ void FVPressureCompositional<TypeTag>::initialMaterialLaws(bool compositional)
Scalar pc=0.;
if(GET_PROP_VALUE(TypeTag, EnableCapillarity))
{
- pc = MaterialLaw::pC(problem_.spatialParams().materialLawParams(*eIt),
+ pc = MaterialLaw::pc(problem_.spatialParams().materialLawParams(*eIt),
sat_0);
}
else
@@ -595,14 +595,14 @@ void FVPressureCompositional<TypeTag>::initialMaterialLaws(bool compositional)
//update with better pressures
flashSolver.concentrationFlash2p2c(fluidState, Z1_0, pressure,
problem_.spatialParams().porosity(*eIt), problem_.temperatureAtPos(globalPos));
- pc = MaterialLaw::pC(problem_.spatialParams().materialLawParams(*eIt),
+ pc = MaterialLaw::pc(problem_.spatialParams().materialLawParams(*eIt),
fluidState.saturation(wPhaseIdx));
// TODO: get right criterion, do output for evaluation
//converge criterion
if (abs(oldPc-pc)<10)
iter = maxiter;
- pc = MaterialLaw::pC(problem_.spatialParams().materialLawParams(*eIt),
+ pc = MaterialLaw::pc(problem_.spatialParams().materialLawParams(*eIt),
fluidState.saturation(wPhaseIdx));
}
}
diff --git a/dumux/decoupled/2p2c/fvtransport2p2c.hh b/dumux/decoupled/2p2c/fvtransport2p2c.hh
index beb9450b06..25a94e2835 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2c.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2c.hh
@@ -860,7 +860,7 @@ void FVTransport2P2C<TypeTag>::evalBoundary(GlobalPosition globalPosFace,
Scalar satBound = primaryVariablesOnBoundary[contiWEqIdx];
if(GET_PROP_VALUE(TypeTag, EnableCapillarity))
{
- Scalar pcBound = MaterialLaw::pC(problem().spatialParams().materialLawParams(*eIt),
+ Scalar pcBound = MaterialLaw::pc(problem().spatialParams().materialLawParams(*eIt),
satBound);
switch (pressureType)
{
@@ -894,7 +894,7 @@ void FVTransport2P2C<TypeTag>::evalBoundary(GlobalPosition globalPosFace,
if(GET_PROP_VALUE(TypeTag, EnableCapillarity))
{
- Scalar pcBound = MaterialLaw::pC(problem().spatialParams().materialLawParams(*eIt),
+ Scalar pcBound = MaterialLaw::pc(problem().spatialParams().materialLawParams(*eIt),
BCfluidState.saturation(wPhaseIdx));
int maxiter = 3;
//start iteration loop
@@ -924,7 +924,7 @@ void FVTransport2P2C<TypeTag>::evalBoundary(GlobalPosition globalPosFace,
//update with better pressures
flashSolver.concentrationFlash2p2c(BCfluidState, Z1Bound, pressBound,
problem().spatialParams().porosity(*eIt), problem().temperatureAtPos(globalPosFace));
- pcBound = MaterialLaw::pC(problem().spatialParams().materialLawParams(*eIt),
+ pcBound = MaterialLaw::pc(problem().spatialParams().materialLawParams(*eIt),
BCfluidState.saturation(wPhaseIdx));
// TODO: get right criterion, do output for evaluation
//converge criterion
diff --git a/dumux/implicit/2p/2pvolumevariables.hh b/dumux/implicit/2p/2pvolumevariables.hh
index edc7cff530..d5b2aa8088 100644
--- a/dumux/implicit/2p/2pvolumevariables.hh
+++ b/dumux/implicit/2p/2pvolumevariables.hh
@@ -137,7 +137,7 @@ public:
Scalar pW = priVars[pressureIdx];
fluidState.setPressure(wPhaseIdx, pW);
fluidState.setPressure(nPhaseIdx,
- pW + MaterialLaw::pC(materialParams, 1 - Sn));
+ pW + MaterialLaw::pc(materialParams, 1 - Sn));
}
else if (int(formulation) == pnSw) {
Scalar Sw = priVars[saturationIdx];
@@ -147,7 +147,7 @@ public:
Scalar pN = priVars[pressureIdx];
fluidState.setPressure(nPhaseIdx, pN);
fluidState.setPressure(wPhaseIdx,
- pN - MaterialLaw::pC(materialParams, Sw));
+ pN - MaterialLaw::pc(materialParams, Sw));
}
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
diff --git a/dumux/implicit/2p2c/2p2cvolumevariables.hh b/dumux/implicit/2p2c/2p2cvolumevariables.hh
index e9ba690284..8b11f7bf46 100644
--- a/dumux/implicit/2p2c/2p2cvolumevariables.hh
+++ b/dumux/implicit/2p2c/2p2cvolumevariables.hh
@@ -216,7 +216,7 @@ public:
// calculate capillary pressure
const MaterialLawParams &materialParams =
problem.spatialParams().materialLawParams(element, fvGeometry, scvIdx);
- Scalar pC = MaterialLaw::pC(materialParams, 1 - Sn);
+ Scalar pC = MaterialLaw::pc(materialParams, 1 - Sn);
if (formulation == pwSn) {
fluidState.setPressure(wPhaseIdx, priVars[pressureIdx]);
diff --git a/dumux/implicit/2pdfm/2pdfmvolumevariables.hh b/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
index c1e90cf679..a5c567e8b1 100644
--- a/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
+++ b/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
@@ -144,7 +144,7 @@ public:
satN_ = satNMatrix_;
satW_ = satWMatrix_;
- pCMatrix_ = MaterialLaw::pC(materialParamsMatrix, satWMatrix_);
+ pCMatrix_ = MaterialLaw::pc(materialParamsMatrix, satWMatrix_);
pC_ = pCMatrix_;
//pressures
pMatrix[wPhaseIdx] = priVars[pressureIdx];
@@ -169,10 +169,10 @@ public:
satNFracture_ = priVars[saturationIdx];
satWFracture_ = 1 - satNFracture_;
- pCFracture_ = MaterialLaw::pC(materialParamsFracture, satWFracture_);
+ pCFracture_ = MaterialLaw::pc(materialParamsFracture, satWFracture_);
pFract[wPhaseIdx] = priVars[pressureIdx];
pFract[nPhaseIdx] = pFract[wPhaseIdx] + pCFracture_;
- pEntryMatrix_ = MaterialLaw::pC(materialParamsMatrix, 1);
+ pEntryMatrix_ = MaterialLaw::pc(materialParamsMatrix, 1);
//use interface condition - extended capillary pressure inteface condition
if (problem.useInterfaceCondition())
diff --git a/dumux/implicit/3p3c/3p3cvolumevariables.hh b/dumux/implicit/3p3c/3p3cvolumevariables.hh
index 98c267478a..302fa03bc9 100644
--- a/dumux/implicit/3p3c/3p3cvolumevariables.hh
+++ b/dumux/implicit/3p3c/3p3cvolumevariables.hh
@@ -186,15 +186,15 @@ public:
pg_ = priVars[pressureIdx];
// calculate capillary pressures
- Scalar pCGW = MaterialLaw::pCGW(materialParams, Sw_);
- Scalar pCNW = MaterialLaw::pCNW(materialParams, Sw_);
- Scalar pCGN = MaterialLaw::pCGN(materialParams, Sw_ + Sn_);
+ Scalar pcgw = MaterialLaw::pcgw(materialParams, Sw_);
+ Scalar pcnw = MaterialLaw::pcnw(materialParams, Sw_);
+ Scalar pcgn = MaterialLaw::pcgn(materialParams, Sw_ + Sn_);
- Scalar pcAlpha = MaterialLaw::pCAlpha(materialParams, Sn_);
+ Scalar pcAlpha = MaterialLaw::pcalpha(materialParams, Sn_);
Scalar pcNW1 = 0.0; // TODO: this should be possible to assign in the problem file
- pn_ = pg_- pcAlpha * pCGN - (1.-pcAlpha)*(pCGW - pcNW1);
- pw_ = pn_ - pcAlpha * pCNW - (1.-pcAlpha)*pcNW1;
+ pn_ = pg_- pcAlpha * pcgn - (1.-pcAlpha)*(pcgw - pcNW1);
+ pw_ = pn_ - pcAlpha * pcnw - (1.-pcAlpha)*pcNW1;
fluidState_.setPressure(wPhaseIdx, pw_);
fluidState_.setPressure(gPhaseIdx, pg_);
diff --git a/dumux/implicit/co2/co2volumevariables.hh b/dumux/implicit/co2/co2volumevariables.hh
index 7d8b5cdada..d8fcae793d 100644
--- a/dumux/implicit/co2/co2volumevariables.hh
+++ b/dumux/implicit/co2/co2volumevariables.hh
@@ -159,7 +159,7 @@ public:
problem.spatialParams().materialLawParams(element, fvGeometry, scvIdx);
- Scalar pC = MaterialLaw::pC(materialParams, 1 - Sn);
+ Scalar pC = MaterialLaw::pc(materialParams, 1 - Sn);
if (formulation == pwSn) {
ParentType::fluidState_.setPressure(wPhaseIdx, priVars[pressureIdx]);
diff --git a/dumux/implicit/richards/richardsnewtoncontroller.hh b/dumux/implicit/richards/richardsnewtoncontroller.hh
index 430bf925e4..a5e7ac9a4a 100644
--- a/dumux/implicit/richards/richardsnewtoncontroller.hh
+++ b/dumux/implicit/richards/richardsnewtoncontroller.hh
@@ -102,7 +102,7 @@ public:
// calculate the old wetting phase saturation
const SpatialParams &spatialParams = this->problem_().spatialParams();
const MaterialLawParams &mp = spatialParams.materialLawParams(*elemIt, fvGeometry, scvIdx);
- Scalar pcMin = MaterialLaw::pC(mp, 1.0);
+ Scalar pcMin = MaterialLaw::pc(mp, 1.0);
Scalar pW = uLastIter[globalIdx][pwIdx];
Scalar pN = std::max(this->problem_().referencePressure(*elemIt, fvGeometry, scvIdx),
pW + pcMin);
@@ -111,8 +111,8 @@ public:
// convert into minimum and maximum wetting phase
// pressures
- Scalar pwMin = pN - MaterialLaw::pC(mp, SwOld - 0.2);
- Scalar pwMax = pN - MaterialLaw::pC(mp, SwOld + 0.2);
+ Scalar pwMin = pN - MaterialLaw::pc(mp, SwOld - 0.2);
+ Scalar pwMax = pN - MaterialLaw::pc(mp, SwOld + 0.2);
// clamp the result
pW = uCurrentIter[globalIdx][pwIdx];
diff --git a/dumux/implicit/richards/richardsvolumevariables.hh b/dumux/implicit/richards/richardsvolumevariables.hh
index dfa9c2b59b..2050d37245 100644
--- a/dumux/implicit/richards/richardsvolumevariables.hh
+++ b/dumux/implicit/richards/richardsvolumevariables.hh
@@ -123,7 +123,7 @@ public:
Scalar pnRef = problem.referencePressure(element, fvGeometry, scvIdx);
const MaterialLawParams &matParams =
problem.spatialParams().materialLawParams(element, fvGeometry, scvIdx);
- Scalar minPc = MaterialLaw::pC(matParams, 1.0);
+ Scalar minPc = MaterialLaw::pc(matParams, 1.0);
fluidState.setPressure(wPhaseIdx, priVars[pwIdx]);
fluidState.setPressure(nPhaseIdx, std::max(pnRef, priVars[pwIdx] + minPc));
diff --git a/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh b/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
index a623f0c646..93bd4f1358 100644
--- a/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh
@@ -67,13 +67,19 @@ public:
* is constructed accordingly. Afterwards the values are set there, too.
* \return Capillary pressure calculated by Brooks & Corey constitutive relation.
*/
- static Scalar pC(const Params ¶ms, Scalar Swe)
+ static Scalar pc(const Params ¶ms, Scalar Swe)
{
assert(0 <= Swe && Swe <= 1);
return params.pe()*pow(Swe, -1.0/params.lambda());
}
+ DUNE_DEPRECATED_MSG("use pc() (uncapitalized 'c') instead")
+ static Scalar pC(const Params ¶ms, Scalar Swe)
+ {
+ return pc(params, Swe);
+ }
+
/*!
* \brief The saturation-capillary pressure curve according to Brooks & Corey.
*
diff --git a/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh b/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
index 862977e13d..8f4e5e1c16 100644
--- a/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh
@@ -78,9 +78,15 @@ public:
* \return Capillary pressure calculated by specific constitutive relation (EffLaw e.g. Brooks & Corey, van Genuchten, linear...)
*
*/
+ static Scalar pc(const Params ¶ms, Scalar Sw)
+ {
+ return EffLaw::pc(params, swToSwe(params, Sw));
+ }
+
+ DUNE_DEPRECATED_MSG("use pc() (uncapitalized 'c') instead")
static Scalar pC(const Params ¶ms, Scalar Sw)
{
- return EffLaw::pC(params, swToSwe(params, Sw));
+ return pc(params, Sw);
}
/*!
diff --git a/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh b/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh
index ed17624644..e41a081d9e 100644
--- a/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh
@@ -65,9 +65,15 @@ public:
* is constructed accordingly. Afterwards the values are set there, too.
* \return Capillary pressure calculated by linear constitutive relation.
*/
+ static Scalar pc(const Params ¶ms, Scalar Swe)
+ {
+ return (1 - Swe)*(params.maxPc() - params.entryPc()) + params.entryPc();
+ }
+
+ DUNE_DEPRECATED_MSG("use pc() (uncapitalized 'c') instead")
static Scalar pC(const Params ¶ms, Scalar Swe)
{
- return (1 - Swe)*(params.maxPC() - params.entryPC()) + params.entryPC();
+ return pc(params, Swe);
}
/*!
@@ -86,7 +92,7 @@ public:
*/
static Scalar sw(const Params ¶ms, Scalar pC)
{
- 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")
@@ -112,7 +118,7 @@ public:
*/
static Scalar dpC_dSw(const Params ¶ms, Scalar Swe)
{
- return - (params.maxPC() - params.entryPC());
+ return - (params.maxPc() - params.entryPc());
}
/*!
@@ -127,7 +133,7 @@ public:
*/
static Scalar dSw_dpC(const Params ¶ms, Scalar pC)
{
- return - 1/(params.maxPC() - params.entryPC());
+ return - 1/(params.maxPc() - params.entryPc());
}
/*!
diff --git a/dumux/material/fluidmatrixinteractions/2p/linearmaterialparams.hh b/dumux/material/fluidmatrixinteractions/2p/linearmaterialparams.hh
index 0d414a5a3d..4028d758ba 100644
--- a/dumux/material/fluidmatrixinteractions/2p/linearmaterialparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/linearmaterialparams.hh
@@ -42,10 +42,10 @@ public:
LinearMaterialParams()
{}
- LinearMaterialParams(Scalar entryPC, Scalar maxPC)
+ LinearMaterialParams(Scalar entryPc, Scalar maxPc)
{
- setEntryPC(entryPC);
- setMaxPC(maxPC);
+ setEntryPc(entryPc);
+ setMaxPc(maxPc);
};
@@ -54,37 +54,61 @@ public:
*
* The entry pressure is reached at \f$\overline S_w = 1\f$
*/
- Scalar entryPC() const
- { return entryPC_; }
+ 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.
*
* The entry pressure is reached at \f$ \overline S_w = 1\f$
*/
- void setEntryPC(Scalar v)
- { entryPC_ = v; }
+ void setEntryPc(Scalar v)
+ { entryPc_ = v; }
+
+ DUNE_DEPRECATED_MSG("use setEntryPc() (uncapitalized 'c') instead")
+ Scalar setEntryPC(Scalar v)
+ {
+ return setEntryPc(v);
+ }
/*!
* \brief Return the maximum capillary pressure for the linear material law.
*
* The maximum capillary pressure is reached at \f$ \overline S_w = 0\f$
*/
- Scalar maxPC() const
- { return maxPC_; }
+ 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.
*
* The maximum capillary pressure is reached at \f$ \overline S_w = 0\f$
*/
- void setMaxPC(Scalar v)
- { maxPC_ = v; }
+ void setMaxPc(Scalar v)
+ { maxPc_ = v; }
+
+ DUNE_DEPRECATED_MSG("use setMaxPc() (uncapitalized 'c') instead")
+ Scalar setMaxPC(Scalar v)
+ {
+ return setMaxPc(v);
+ }
private:
- Scalar entryPC_;
- Scalar maxPC_;
+ Scalar entryPc_;
+ Scalar maxPc_;
};
} // namespace Dumux
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
index a96f23f794..e05736216b 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh
@@ -78,9 +78,9 @@ public:
*
* For the non-regularized part:
*
- * \copydetails BrooksCorey::pC()
+ * \copydetails BrooksCorey::pc()
*/
- static Scalar pC(const Params ¶ms, Scalar Swe)
+ static Scalar pc(const Params ¶ms, Scalar Swe)
{
const Scalar Sthres = params.thresholdSw();
@@ -92,18 +92,24 @@ public:
// temporarily is in an 'illegal' range.
if (Swe <= Sthres) {
Scalar m = BrooksCorey::dpC_dSw(params, Sthres);
- Scalar pC_SweLow = BrooksCorey::pC(params, Sthres);
+ Scalar pC_SweLow = BrooksCorey::pc(params, Sthres);
return pC_SweLow + m*(Swe - Sthres);
}
else if (Swe > 1.0) {
Scalar m = BrooksCorey::dpC_dSw(params, 1.0);
- Scalar pC_SweHigh = BrooksCorey::pC(params, 1.0);
+ Scalar pC_SweHigh = BrooksCorey::pc(params, 1.0);
return pC_SweHigh + m*(Swe - 1.0);
}
// if the effective saturation is in an 'reasonable'
// range, we use the real Brooks-Corey law...
- return BrooksCorey::pC(params, Swe);
+ return BrooksCorey::pc(params, Swe);
+ }
+
+ DUNE_DEPRECATED_MSG("use pc() (uncapitalized 'c') instead")
+ static Scalar pC(const Params ¶ms, Scalar Swe)
+ {
+ return pc(params, Swe);
}
/*!
@@ -135,14 +141,14 @@ public:
// saturation moving to the right direction if it
// temporarily is in an 'illegal' range.
if (Swe <= Sthres) {
- // invert the low saturation regularization of pC()
+ // invert the low saturation regularization of pc()
Scalar m = BrooksCorey::dpC_dSw(params, Sthres);
- Scalar pC_SweLow = BrooksCorey::pC(params, Sthres);
+ Scalar pC_SweLow = BrooksCorey::pc(params, Sthres);
return Sthres + (pC - pC_SweLow)/m;
}
else if (Swe > 1.0) {
Scalar m = BrooksCorey::dpC_dSw(params, 1.0);
- Scalar pC_SweHigh = BrooksCorey::pC(params, 1.0);
+ Scalar pC_SweHigh = BrooksCorey::pc(params, 1.0);
return 1.0 + (pC - pC_SweHigh)/m;;
}
@@ -174,12 +180,12 @@ public:
// derivative of the regualarization
if (Swe <= Sthres) {
- // calculate the slope of the straight line used in pC()
+ // calculate the slope of the straight line used in pc()
Scalar m = BrooksCorey::dpC_dSw(params, Sthres);
return m;
}
else if (Swe > 1.0) {
- // calculate the slope of the straight line used in pC()
+ // calculate the slope of the straight line used in pc()
Scalar m = BrooksCorey::dpC_dSw(params, 1.0);
return m;
}
@@ -221,12 +227,12 @@ public:
// derivative of the regularization
if (Swe <= Sthres) {
- // calculate the slope of the straight line used in pC()
+ // calculate the slope of the straight line used in pc()
Scalar m = BrooksCorey::dpC_dSw(params, Sthres);
return 1/m;
}
else if (Swe > 1.0) {
- // calculate the slope of the straight line used in pC()
+ // calculate the slope of the straight line used in pc()
Scalar m = BrooksCorey::dpC_dSw(params, 1.0);
return 1/m;
}
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh
index 3fbb4bdf03..2e56ee10be 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh
@@ -78,9 +78,15 @@ public:
* Therefore, in the (problem specific) spatialParameters first, the material law is chosen, and then the params container
* is constructed accordingly. Afterwards the values are set there, too.
*/
+ static Scalar pc(const Params ¶ms, Scalar Swe)
+ {
+ return LinearMaterial::pc(params, Swe);
+ }
+
+ DUNE_DEPRECATED_MSG("use pc() (uncapitalized 'c') instead")
static Scalar pC(const Params ¶ms, Scalar Swe)
{
- return LinearMaterial::pC(params, Swe);
+ return pc(params, Swe);
}
/*!
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
index d8293561d9..e8d6498909 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
@@ -87,14 +87,14 @@ public:
*
* For not-regularized part:
*
- \copydetails VanGenuchten::pC()
+ \copydetails VanGenuchten::pc()
*/
- static Scalar pC(const Params ¶ms, Scalar Swe)
+ static Scalar pc(const Params ¶ms, Scalar Swe)
{
// retrieve the low and the high threshold saturations for the
// unregularized capillary pressure curve from the parameters
- const Scalar SwThLow = params.pCLowSw();
- const Scalar SwThHigh = params.pCHighSw();
+ const Scalar SwThLow = params.pcLowSw();
+ const Scalar SwThHigh = params.pcHighSw();
// make sure that the capillary pressure observes a derivative
// != 0 for 'illegal' saturations. This is favourable for the
@@ -102,11 +102,11 @@ public:
// in order to get the saturation moving to the right
// direction if it temporarily is in an 'illegal' range.
if (Swe < SwThLow) {
- return VanGenuchten::pC(params, SwThLow) + mLow_(params)*(Swe - SwThLow);
+ return VanGenuchten::pc(params, SwThLow) + mLow_(params)*(Swe - SwThLow);
}
else if (Swe > SwThHigh)
{
- Scalar yTh = VanGenuchten::pC(params, SwThHigh);
+ Scalar yTh = VanGenuchten::pc(params, SwThHigh);
Scalar m1 = (0.0 - yTh)/(1.0 - SwThHigh)*2;
if (Swe < 1.0) {
@@ -125,7 +125,13 @@ public:
// if the effective saturation is in an 'reasonable'
// range, we use the real van genuchten law...
- return VanGenuchten::pC(params, Swe);
+ return VanGenuchten::pc(params, Swe);
+ }
+
+ DUNE_DEPRECATED_MSG("use pc() (uncapitalized 'c') instead")
+ static Scalar pC(const Params ¶ms, Scalar Swe)
+ {
+ return pc(params, Swe);
}
/*!
@@ -146,8 +152,8 @@ public:
{
// retrieve the low and the high threshold saturations for the
// unregularized capillary pressure curve from the parameters
- const Scalar SwThLow = params.pCLowSw();
- const Scalar SwThHigh = params.pCHighSw();
+ const Scalar SwThLow = params.pcLowSw();
+ const Scalar SwThHigh = params.pcHighSw();
// calculate the saturation which corrosponds to the
// saturation in the non-regularized verision of van
@@ -155,7 +161,7 @@ public:
Scalar Sw;
if (pC <= 0) {
// invert straight line for Swe > 1.0
- Scalar yTh = VanGenuchten::pC(params, SwThHigh);
+ Scalar yTh = VanGenuchten::pc(params, SwThHigh);
Scalar m1 = (0.0 - yTh)/(1.0 - SwThHigh)*2;
return pC/m1 + 1.0;
}
@@ -164,13 +170,13 @@ public:
// invert the regularization if necessary
if (Sw <= SwThLow) {
- // invert the low saturation regularization of pC()
- Scalar pC_SwLow = VanGenuchten::pC(params, SwThLow);
+ // invert the low saturation regularization of pc()
+ Scalar pC_SwLow = VanGenuchten::pc(params, SwThLow);
return (pC - pC_SwLow)/mLow_(params) + SwThLow;
}
else if (Sw > SwThHigh)
{
- Scalar yTh = VanGenuchten::pC(params, SwThHigh);
+ Scalar yTh = VanGenuchten::pc(params, SwThHigh);
Scalar m1 = (0.0 - yTh)/(1.0 - SwThHigh)*2;
// invert spline between threshold Swe and 1.0
@@ -208,12 +214,12 @@ public:
static Scalar dpC_dSw(const Params ¶ms, Scalar Swe)
{
// derivative of the regualarization
- if (Swe < params.pCLowSw()) {
- // the slope of the straight line used in pC()
+ if (Swe < params.pcLowSw()) {
+ // the slope of the straight line used in pc()
return mLow_(params);
}
- else if (Swe > params.pCHighSw()) {
- // the slope of the straight line used in pC()
+ else if (Swe > params.pcHighSw()) {
+ // the slope of the straight line used in pc()
return mHigh_(params);
}
@@ -244,11 +250,11 @@ public:
Sw = VanGenuchten::sw(params, pC);
// derivative of the regularization
- if (Sw < params.pCLowSw()) {
+ if (Sw < params.pcLowSw()) {
// same as in dpC_dSw() but inverted
return 1/mLow_(params);
}
- if (Sw > params.pCHighSw()) {
+ if (Sw > params.pcHighSw()) {
// same as in dpC_dSw() but inverted
return 1/mHigh_(params);
}
@@ -342,7 +348,7 @@ private:
*/
static Scalar mLow_(const Params ¶ms)
{
- const Scalar SwThLow = params.pCLowSw();
+ const Scalar SwThLow = params.pcLowSw();
return VanGenuchten::dpC_dSw(params, SwThLow);
}
@@ -357,9 +363,9 @@ private:
*/
static Scalar mHigh_(const Params ¶ms)
{
- const Scalar SwThHigh = params.pCHighSw();
+ const Scalar SwThHigh = params.pcHighSw();
- Scalar pC_SwHigh = VanGenuchten::pC(params, SwThHigh);
+ Scalar pC_SwHigh = VanGenuchten::pc(params, SwThHigh);
return (0 - pC_SwHigh)/(1.0 - SwThHigh);
}
};
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh
index 6caa3c3384..4e5424a2b1 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh
@@ -60,7 +60,7 @@ public:
* This is just 1%. If you need a different value, overload this
* class.
*/
- Scalar pCLowSw() const
+ Scalar pcLowSw() const
{
// Some problems are very sensitive to this value
// (e.g. making it smaller might result in negative
@@ -74,6 +74,12 @@ 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.
@@ -81,7 +87,7 @@ public:
* This is just 99%. If you need a different value, overload this
* class.
*/
- Scalar pCHighSw() const
+ Scalar pcHighSw() const
{
// Some problems are very sensitive to this value
// (e.g. making it smaller might result in negative
@@ -95,6 +101,12 @@ 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.
diff --git a/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh b/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
index 42be026b9d..7d349950e6 100644
--- a/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/vangenuchten.hh
@@ -65,12 +65,18 @@ public:
* Therefore, in the (problem specific) spatialParameters first, the material law is chosen, and then the params container
* is constructed accordingly. Afterwards the values are set there, too.
*/
- static Scalar pC(const Params ¶ms, Scalar Swe)
+ static Scalar pc(const Params ¶ms, Scalar Swe)
{
assert(0 <= Swe && Swe <= 1);
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 ¶ms, Scalar Swe)
+ {
+ return pc(params, Swe);
+ }
+
/*!
* \brief The saturation-capillary pressure curve according to van Genuchten.
*
diff --git a/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh b/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh
index c7ea5c9bdc..7c44d54e89 100644
--- a/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh
@@ -55,12 +55,18 @@ public:
* \brief The capillary pressure-saturation curve.
*
*/
- static Scalar pC(const Params ¶ms, Scalar Sw)
+ static Scalar pc(const Params ¶ms, Scalar Sw)
{
- DUNE_THROW(Dune::NotImplemented, "Capillary pressures for three phases is not so simple! Use pCGN, pCNW, and pcGW");
+ DUNE_THROW(Dune::NotImplemented, "Capillary pressures for three phases is not so simple! Use pcgn, pcnw, and pcgw");
}
- static Scalar pCGW(const Params ¶ms, Scalar Sw)
+ DUNE_DEPRECATED_MSG("use pc() (uncapitalized 'c') instead")
+ static Scalar pC(const Params ¶ms, Scalar Swe)
+ {
+ return pc(params, Swe);
+ }
+
+ static Scalar pcgw(const Params ¶ms, Scalar Sw)
{
/*
Sw = wetting phase saturation, or,
@@ -104,7 +110,13 @@ public:
}
}
- static Scalar pCNW(const Params ¶ms, Scalar Sw)
+ DUNE_DEPRECATED_MSG("use pcgw() (uncapitalized 'cgw') instead")
+ static Scalar pCGW(const Params ¶ms, Scalar Sw)
+ {
+ return pcgw(params, Sw);
+ }
+
+ static Scalar pcnw(const Params ¶ms, Scalar Sw)
{
/*
Sw = wetting phase saturation, or,
@@ -148,7 +160,13 @@ public:
}
}
- static Scalar pCGN(const Params ¶ms, Scalar St)
+ DUNE_DEPRECATED_MSG("use pcnw() (uncapitalized 'cnw') instead")
+ static Scalar pCNW(const Params ¶ms, Scalar Sw)
+ {
+ return pcnw(params, Sw);
+ }
+
+ static Scalar pcgn(const Params ¶ms, Scalar St)
{
/*
St = sum of wetting (liquid) phase saturations
@@ -191,7 +209,13 @@ public:
}
}
- static Scalar pCAlpha(const Params ¶ms, Scalar Sn)
+ DUNE_DEPRECATED_MSG("use pcgn() (uncapitalized 'cgn') instead")
+ static Scalar pCGN(const Params ¶ms, Scalar St)
+ {
+ return pcgn(params, St);
+ }
+
+ static Scalar pcalpha(const Params ¶ms, Scalar Sn)
{
/* continuous transition to zero */
Scalar alpha,Sne;
@@ -210,6 +234,12 @@ public:
return(alpha);
}
+ DUNE_DEPRECATED_MSG("use pcalpha() (uncapitalized 'ca') instead")
+ static Scalar pCAlpha(const Params ¶ms, Scalar Sn)
+ {
+ return pcalpha(params, Sn);
+ }
+
/*!
* \brief The saturation-capillary pressure curve.
*
diff --git a/dumux/material/fluidmatrixinteractions/mp/2padapter.hh b/dumux/material/fluidmatrixinteractions/mp/2padapter.hh
index a0aa9f32c8..d58d5dee98 100644
--- a/dumux/material/fluidmatrixinteractions/mp/2padapter.hh
+++ b/dumux/material/fluidmatrixinteractions/mp/2padapter.hh
@@ -62,7 +62,7 @@ public:
values[nPhaseIdx] = 0;
// wetting phase does not get anything added
- values[wPhaseIdx] = - TwoPLaw::pC(params, state.saturation(wPhaseIdx));
+ values[wPhaseIdx] = - TwoPLaw::pc(params, state.saturation(wPhaseIdx));
}
/*!
diff --git a/test/decoupled/1p/test_diffusionspatialparams.hh b/test/decoupled/1p/test_diffusionspatialparams.hh
index 04ec2fef17..48dbcfe924 100644
--- a/test/decoupled/1p/test_diffusionspatialparams.hh
+++ b/test/decoupled/1p/test_diffusionspatialparams.hh
@@ -145,8 +145,8 @@ public:
materialLawParams_.setSnr(0.0);
// parameters for the linear entry pressure function
- materialLawParams_.setEntryPC(0);
- materialLawParams_.setMaxPC(0);
+ materialLawParams_.setEntryPc(0);
+ materialLawParams_.setMaxPc(0);
}
private:
diff --git a/test/decoupled/2p/test_impesadaptivespatialparams.hh b/test/decoupled/2p/test_impesadaptivespatialparams.hh
index 1e48193268..172c20bddd 100644
--- a/test/decoupled/2p/test_impesadaptivespatialparams.hh
+++ b/test/decoupled/2p/test_impesadaptivespatialparams.hh
@@ -115,8 +115,8 @@ public:
// parameters for the linear
// entry pressures function
-// materialLawParams_.setEntryPC(0);
-// materialLawParams_.setMaxPC(0);
+// materialLawParams_.setEntryPc(0);
+// materialLawParams_.setMaxPc(0);
}
private:
diff --git a/test/decoupled/2p/test_impesspatialparams.hh b/test/decoupled/2p/test_impesspatialparams.hh
index a7846f9c3d..bf50e55883 100644
--- a/test/decoupled/2p/test_impesspatialparams.hh
+++ b/test/decoupled/2p/test_impesspatialparams.hh
@@ -115,8 +115,8 @@ public:
// parameters for the linear
// entry pressures function
-// materialLawParams_.setEntryPC(0);
-// materialLawParams_.setMaxPC(0);
+// materialLawParams_.setEntryPc(0);
+// materialLawParams_.setMaxPc(0);
}
private:
diff --git a/test/decoupled/2p/test_transportspatialparams.hh b/test/decoupled/2p/test_transportspatialparams.hh
index 7b5385a3aa..bbf3e83e9b 100644
--- a/test/decoupled/2p/test_transportspatialparams.hh
+++ b/test/decoupled/2p/test_transportspatialparams.hh
@@ -102,8 +102,8 @@ public:
materialLawParams_.setSnr(0.0);
// parameters for the linear entry pressures function
- materialLawParams_.setEntryPC(0);
- materialLawParams_.setMaxPC(0);
+ materialLawParams_.setEntryPc(0);
+ materialLawParams_.setMaxPc(0);
}
private:
diff --git a/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh b/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
index de09806bdf..de51400f09 100644
--- a/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
+++ b/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
@@ -115,8 +115,8 @@ public:
// parameters for the linear
// entry pressures function
- materialLawParams_.setEntryPC(0);
- materialLawParams_.setMaxPC(10000);
+ materialLawParams_.setEntryPc(0);
+ materialLawParams_.setMaxPc(10000);
for(int i = 0; i < dim; i++)
{
diff --git a/test/implicit/2p/lensspatialparams.hh b/test/implicit/2p/lensspatialparams.hh
index d2f0ab37b4..0a683ced7e 100644
--- a/test/implicit/2p/lensspatialparams.hh
+++ b/test/implicit/2p/lensspatialparams.hh
@@ -124,10 +124,10 @@ public:
// parameters for the linear law
// minimum and maximum pressures
- // lensMaterialParams_.setEntryPC(0);
-// outerMaterialParams_.setEntryPC(0);
-// lensMaterialParams_.setMaxPC(0);
-// outerMaterialParams_.setMaxPC(0);
+ // lensMaterialParams_.setEntryPc(0);
+// outerMaterialParams_.setEntryPc(0);
+// lensMaterialParams_.setMaxPc(0);
+// outerMaterialParams_.setMaxPc(0);
lensK_ = 9.05e-12;
outerK_ = 4.6e-10;
diff --git a/test/implicit/3p3c/infiltrationproblem.hh b/test/implicit/3p3c/infiltrationproblem.hh
index 5af9a97a9d..a0c90be723 100644
--- a/test/implicit/3p3c/infiltrationproblem.hh
+++ b/test/implicit/3p3c/infiltrationproblem.hh
@@ -263,7 +263,7 @@ public:
//initial_(values, globalPos, element);
//const MaterialLawParams& materialParams = this->spatialParams().materialLawParams();;
- //MaterialLaw::pCGW(materialParams, 1.0);
+ //MaterialLaw::pcgw(materialParams, 1.0);
}
/*!
@@ -381,7 +381,7 @@ private:
for (k=1; k<=25; k++)
{
Sw = 0.5*(upper+lower);
- pcGW = MaterialLaw::pCGW(pcParams, Sw);
+ pcGW = MaterialLaw::pcgw(pcParams, Sw);
Scalar delta = pcGW-pcIn;
if (delta<0.) delta*=-1.;
if (delta<bisLimit)
diff --git a/test/implicit/mpnc/forchheimerspatialparams.hh b/test/implicit/mpnc/forchheimerspatialparams.hh
index c428ca1508..b0c25bdb41 100644
--- a/test/implicit/mpnc/forchheimerspatialparams.hh
+++ b/test/implicit/mpnc/forchheimerspatialparams.hh
@@ -112,8 +112,8 @@ public:
// parameters for the linear law, i.e. minimum and maximum
// pressures
- materialParams_.setEntryPC(0.0);
- materialParams_.setMaxPC(0.0);
+ materialParams_.setEntryPc(0.0);
+ materialParams_.setMaxPc(0.0);
/*
diff --git a/test/implicit/mpnc/obstaclespatialparams.hh b/test/implicit/mpnc/obstaclespatialparams.hh
index ab3be7bc9a..4eb0da1793 100644
--- a/test/implicit/mpnc/obstaclespatialparams.hh
+++ b/test/implicit/mpnc/obstaclespatialparams.hh
@@ -113,10 +113,10 @@ public:
// parameters for the linear law, i.e. minimum and maximum
// pressures
- fineMaterialParams_.setEntryPC(0.0);
- coarseMaterialParams_.setEntryPC(0.0);
- fineMaterialParams_.setMaxPC(0.0);
- coarseMaterialParams_.setMaxPC(0.0);
+ fineMaterialParams_.setEntryPc(0.0);
+ coarseMaterialParams_.setEntryPc(0.0);
+ fineMaterialParams_.setMaxPc(0.0);
+ coarseMaterialParams_.setMaxPc(0.0);
/*
// entry pressures for Brooks-Corey
diff --git a/test/implicit/richards/richardslensproblem.hh b/test/implicit/richards/richardslensproblem.hh
index 6dfb590edb..b390809aa2 100644
--- a/test/implicit/richards/richardslensproblem.hh
+++ b/test/implicit/richards/richardslensproblem.hh
@@ -296,7 +296,7 @@ private:
{
Scalar Sw = 0.0;
Scalar pc =
- MaterialLaw::pC(this->spatialParams().materialLawParams(pos),
+ MaterialLaw::pc(this->spatialParams().materialLawParams(pos),
Sw);
values[pwIdx] = pnRef_ - pc;
}
diff --git a/test/implicit/richards/richardslensspatialparams.hh b/test/implicit/richards/richardslensspatialparams.hh
index 38ac66a32a..ad994d30da 100644
--- a/test/implicit/richards/richardslensspatialparams.hh
+++ b/test/implicit/richards/richardslensspatialparams.hh
@@ -114,10 +114,10 @@ public:
// parameters for the linear law
// minimum and maximum pressures
-// lensMaterialParams_.setEntryPC(0);
-// outerMaterialParams_.setEntryPC(0);
-// lensMaterialParams_.setMaxPC(0);
-// outerMaterialParams_.setMaxPC(0);
+// lensMaterialParams_.setEntryPc(0);
+// outerMaterialParams_.setEntryPc(0);
+// lensMaterialParams_.setMaxPc(0);
+// outerMaterialParams_.setMaxPc(0);
lensK_ = 1e-12;
outerK_ = 5e-12;
--
GitLab