diff --git a/dumux/freeflow/stokes/stokesmodel.hh b/dumux/freeflow/stokes/stokesmodel.hh
index caf7a42a5eac82489fe1ca29cb595ad64ae8fab2..f235da44e99ec89bacc8c26e8a46087d2fac856b 100644
--- a/dumux/freeflow/stokes/stokesmodel.hh
+++ b/dumux/freeflow/stokes/stokesmodel.hh
@@ -147,7 +147,7 @@ public:
// create the required scalar fields
unsigned numVertices = this->gridView_().size(dim);
- ScalarField &pN = *writer.allocateManagedBuffer(numVertices);
+ ScalarField &pn = *writer.allocateManagedBuffer(numVertices);
ScalarField &delP = *writer.allocateManagedBuffer(numVertices);
ScalarField &rho = *writer.allocateManagedBuffer(numVertices);
ScalarField &mu = *writer.allocateManagedBuffer(numVertices);
@@ -181,14 +181,14 @@ public:
i,
false);
- pN[globalIdx] = volVars.pressure();
+ pn[globalIdx] = volVars.pressure();
delP[globalIdx] = volVars.pressure() - 1e5;
rho[globalIdx] = volVars.density();
mu[globalIdx] = volVars.dynamicViscosity();
velocity[globalIdx] = volVars.velocity();
}
}
- writer.attachVertexData(pN, "P");
+ writer.attachVertexData(pn, "P");
writer.attachVertexData(delP, "delP");
writer.attachVertexData(rho, "rho");
writer.attachVertexData(mu, "mu");
diff --git a/dumux/freeflow/stokes2c/stokes2cmodel.hh b/dumux/freeflow/stokes2c/stokes2cmodel.hh
index 8d1e815dd3f83956a659da60952a4d9a71786f37..8aacb7c671b3229a978f41c4c752169e27d14393 100644
--- a/dumux/freeflow/stokes2c/stokes2cmodel.hh
+++ b/dumux/freeflow/stokes2c/stokes2cmodel.hh
@@ -96,7 +96,7 @@ public:
// create the required scalar fields
unsigned numVertices = this->gridView_().size(dim);
- ScalarField &pN = *writer.allocateManagedBuffer(numVertices);
+ ScalarField &pn = *writer.allocateManagedBuffer(numVertices);
ScalarField &delP = *writer.allocateManagedBuffer(numVertices);
ScalarField &Xw = *writer.allocateManagedBuffer(numVertices);
ScalarField &rho = *writer.allocateManagedBuffer(numVertices);
@@ -131,7 +131,7 @@ public:
i,
false);
- pN[globalIdx] = volVars.pressure()*scale_;
+ pn[globalIdx] = volVars.pressure()*scale_;
delP[globalIdx] = volVars.pressure()*scale_ - 1e5;
Xw[globalIdx] = volVars.fluidState().massFraction(phaseIdx, transportCompIdx);
rho[globalIdx] = volVars.density()*scale_*scale_*scale_;
@@ -140,7 +140,7 @@ public:
velocity[globalIdx] *= 1/scale_;
}
}
- writer.attachVertexData(pN, "P");
+ writer.attachVertexData(pn, "P");
writer.attachVertexData(delP, "delP");
std::ostringstream outputNameX;
outputNameX << "X^" << FluidSystem::componentName(transportCompIdx);
diff --git a/dumux/freeflow/stokes2cni/stokes2cnimodel.hh b/dumux/freeflow/stokes2cni/stokes2cnimodel.hh
index b817cbc369fa3989434bc8d60715bb921f5df536..e9de43616f8043473f928a1ce99f890d0e3f32b8 100644
--- a/dumux/freeflow/stokes2cni/stokes2cnimodel.hh
+++ b/dumux/freeflow/stokes2cni/stokes2cnimodel.hh
@@ -104,7 +104,7 @@ public:
// create the required scalar fields
unsigned numVertices = this->gridView_().size(dim);
- ScalarField &pN = *writer.allocateManagedBuffer(numVertices);
+ ScalarField &pn = *writer.allocateManagedBuffer(numVertices);
ScalarField &delP = *writer.allocateManagedBuffer(numVertices);
ScalarField &Xw = *writer.allocateManagedBuffer(numVertices);
ScalarField &T = *writer.allocateManagedBuffer(numVertices);
@@ -142,7 +142,7 @@ public:
vertexIdx,
false);
- pN [globalIdx] = volVars.pressure();
+ pn [globalIdx] = volVars.pressure();
delP[globalIdx] = volVars.pressure() - 1e5;
Xw [globalIdx] = volVars.fluidState().massFraction(phaseIdx, transportCompIdx);
T [globalIdx] = volVars.temperature();
@@ -153,7 +153,7 @@ public:
velocity[globalIdx] = volVars.velocity();
}
}
- writer.attachVertexData(pN, "pg");
+ writer.attachVertexData(pn, "pg");
writer.attachVertexData(delP, "delP");
// writer.attachVertexData(D, "Dwg");
std::ostringstream outputNameX;
diff --git a/dumux/implicit/2p/2pindices.hh b/dumux/implicit/2p/2pindices.hh
index d3df9e6a7268ac88de277d868ae5ebee313a6719..e007d6e7af45aafc45e62ef7207bf81176d0d085 100644
--- a/dumux/implicit/2p/2pindices.hh
+++ b/dumux/implicit/2p/2pindices.hh
@@ -34,15 +34,15 @@ namespace Dumux
/*!
* \ingroup TwoPBoxModel
* \ingroup ImplicitIndices
- * \brief Specificy whether a pw-Sn or a pn-Sw formulation is used.
+ * \brief Specificy whether a pw-sn or a pn-sw formulation is used.
*/
struct TwoPFormulation
{
- static const int pwsn = 0; //!< Pw and Sn as primary variables
+ static const int pwsn = 0; //!< pw and sn as primary variables
DUNE_DEPRECATED_MSG("use pwsn (uncapitalized 'S') instead")
static const int pwSn = pwsn; //!< \deprecated
- static const int pnsw = 1; //!< Pn and Sw as primary variables
+ static const int pnsw = 1; //!< pn and sw as primary variables
DUNE_DEPRECATED_MSG("use pnsw (uncapitalized 'S') instead")
static const int pnSw = pnsw; //!< \deprecated
};
diff --git a/dumux/implicit/2p/2pmodel.hh b/dumux/implicit/2p/2pmodel.hh
index 3d64da3563e44488cdd0006103425fa6d32c7c80..eabbd11bc8cd7e71e4b43b0483fcb957b51dc472 100644
--- a/dumux/implicit/2p/2pmodel.hh
+++ b/dumux/implicit/2p/2pmodel.hh
@@ -121,11 +121,11 @@ public:
unsigned numDofs = this->numDofs();
// create the required scalar fields
- ScalarField *pW = writer.allocateManagedBuffer(numDofs);
- ScalarField *pN = writer.allocateManagedBuffer(numDofs);
- ScalarField *pC = writer.allocateManagedBuffer(numDofs);
- ScalarField *Sw = writer.allocateManagedBuffer(numDofs);
- ScalarField *Sn = writer.allocateManagedBuffer(numDofs);
+ ScalarField *pw = writer.allocateManagedBuffer(numDofs);
+ ScalarField *pn = writer.allocateManagedBuffer(numDofs);
+ ScalarField *pc = writer.allocateManagedBuffer(numDofs);
+ ScalarField *sw = writer.allocateManagedBuffer(numDofs);
+ ScalarField *sn = writer.allocateManagedBuffer(numDofs);
ScalarField *rhoW = writer.allocateManagedBuffer(numDofs);
ScalarField *rhoN = writer.allocateManagedBuffer(numDofs);
ScalarField *mobW = writer.allocateManagedBuffer(numDofs);
@@ -169,11 +169,11 @@ public:
{
int globalIdx = this->dofMapper().map(*elemIt, scvIdx, dofCodim);
- (*pW)[globalIdx] = elemVolVars[scvIdx].pressure(wPhaseIdx);
- (*pN)[globalIdx] = elemVolVars[scvIdx].pressure(nPhaseIdx);
- (*pC)[globalIdx] = elemVolVars[scvIdx].capillaryPressure();
- (*Sw)[globalIdx] = elemVolVars[scvIdx].saturation(wPhaseIdx);
- (*Sn)[globalIdx] = elemVolVars[scvIdx].saturation(nPhaseIdx);
+ (*pw)[globalIdx] = elemVolVars[scvIdx].pressure(wPhaseIdx);
+ (*pn)[globalIdx] = elemVolVars[scvIdx].pressure(nPhaseIdx);
+ (*pc)[globalIdx] = elemVolVars[scvIdx].capillaryPressure();
+ (*sw)[globalIdx] = elemVolVars[scvIdx].saturation(wPhaseIdx);
+ (*sn)[globalIdx] = elemVolVars[scvIdx].saturation(nPhaseIdx);
(*rhoW)[globalIdx] = elemVolVars[scvIdx].density(wPhaseIdx);
(*rhoN)[globalIdx] = elemVolVars[scvIdx].density(nPhaseIdx);
(*mobW)[globalIdx] = elemVolVars[scvIdx].mobility(wPhaseIdx);
@@ -187,11 +187,11 @@ public:
velocityOutput.calculateVelocity(*velocityN, elemVolVars, fvGeometry, *elemIt, nPhaseIdx);
}
- writer.attachDofData(*Sn, "Sn", isBox);
- writer.attachDofData(*Sw, "Sw", isBox);
- writer.attachDofData(*pN, "pn", isBox);
- writer.attachDofData(*pW, "pw", isBox);
- writer.attachDofData(*pC, "pc", isBox);
+ writer.attachDofData(*sn, "sn", isBox);
+ writer.attachDofData(*sw, "sw", isBox);
+ writer.attachDofData(*pn, "pn", isBox);
+ writer.attachDofData(*pw, "pw", isBox);
+ writer.attachDofData(*pc, "pc", isBox);
writer.attachDofData(*rhoW, "rhoW", isBox);
writer.attachDofData(*rhoN, "rhoN", isBox);
writer.attachDofData(*mobW, "mobW", isBox);
diff --git a/dumux/implicit/2p/2pvolumevariables.hh b/dumux/implicit/2p/2pvolumevariables.hh
index de0fd13827f0789ad3330d085e55cf852a608f5f..19159e7252d198183cc39ab7ebda11b0025d19ff 100644
--- a/dumux/implicit/2p/2pvolumevariables.hh
+++ b/dumux/implicit/2p/2pvolumevariables.hh
@@ -130,24 +130,24 @@ public:
if (int(formulation) == pwsn) {
- Scalar Sn = priVars[saturationIdx];
- fluidState.setSaturation(nPhaseIdx, Sn);
- fluidState.setSaturation(wPhaseIdx, 1 - Sn);
+ Scalar sn = priVars[saturationIdx];
+ fluidState.setSaturation(nPhaseIdx, sn);
+ fluidState.setSaturation(wPhaseIdx, 1 - sn);
- Scalar pW = priVars[pressureIdx];
- fluidState.setPressure(wPhaseIdx, pW);
+ 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];
- fluidState.setSaturation(wPhaseIdx, Sw);
- fluidState.setSaturation(nPhaseIdx, 1 - Sw);
+ Scalar sw = priVars[saturationIdx];
+ fluidState.setSaturation(wPhaseIdx, sw);
+ fluidState.setSaturation(nPhaseIdx, 1 - sw);
- Scalar pN = priVars[pressureIdx];
- fluidState.setPressure(nPhaseIdx, pN);
+ 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/2p2cindices.hh b/dumux/implicit/2p2c/2p2cindices.hh
index d8efd62178eb17df6854aae4beff13c16d912d9b..4d433729e845635a7801f905cd06f90fc377899e 100644
--- a/dumux/implicit/2p2c/2p2cindices.hh
+++ b/dumux/implicit/2p2c/2p2cindices.hh
@@ -37,11 +37,11 @@ namespace Dumux
*/
struct TwoPTwoCFormulation
{
- static const int pwsn = 0; //!< Pw and Sn as primary variables
+ static const int pwsn = 0; //!< pw and sn as primary variables
DUNE_DEPRECATED_MSG("use pwsn (uncapitalized 'S') instead")
static const int pwSn = pwsn; //!< \deprecated
- static const int pnsw = 1; //!< Pn and Sw as primary variables
+ static const int pnsw = 1; //!< pn and sw as primary variables
DUNE_DEPRECATED_MSG("use pnsw (uncapitalized 'S') instead")
static const int pnSw = pnsw; //!< \deprecated
};
@@ -94,7 +94,7 @@ public:
/*!
* \ingroup TwoPTwoCModel
* \ingroup ImplicitIndices
- * \brief The indices for the isothermal TwoPTwoC model in the pn-Sw
+ * \brief The indices for the isothermal TwoPTwoC model in the pn-sw
* formulation.
*
* \tparam PVOffset The first index in a primary variable vector.
diff --git a/dumux/implicit/2p2c/2p2cmodel.hh b/dumux/implicit/2p2c/2p2cmodel.hh
index fc25f97ce6577d21ceda802f1d687d752cdd84ef..afce2cdd5ce86552e9a6168a8af4466c6e1371ed 100644
--- a/dumux/implicit/2p2c/2p2cmodel.hh
+++ b/dumux/implicit/2p2c/2p2cmodel.hh
@@ -295,9 +295,9 @@ public:
// create the required scalar fields
ScalarField *sN = writer.allocateManagedBuffer(numDofs);
ScalarField *sW = writer.allocateManagedBuffer(numDofs);
- ScalarField *pN = writer.allocateManagedBuffer(numDofs);
- ScalarField *pW = writer.allocateManagedBuffer(numDofs);
- ScalarField *pC = writer.allocateManagedBuffer(numDofs);
+ ScalarField *pn = writer.allocateManagedBuffer(numDofs);
+ ScalarField *pw = writer.allocateManagedBuffer(numDofs);
+ ScalarField *pc = writer.allocateManagedBuffer(numDofs);
ScalarField *rhoW = writer.allocateManagedBuffer(numDofs);
ScalarField *rhoN = writer.allocateManagedBuffer(numDofs);
ScalarField *mobW = writer.allocateManagedBuffer(numDofs);
@@ -348,9 +348,9 @@ public:
(*sN)[globalIdx] = elemVolVars[scvIdx].saturation(nPhaseIdx);
(*sW)[globalIdx] = elemVolVars[scvIdx].saturation(wPhaseIdx);
- (*pN)[globalIdx] = elemVolVars[scvIdx].pressure(nPhaseIdx);
- (*pW)[globalIdx] = elemVolVars[scvIdx].pressure(wPhaseIdx);
- (*pC)[globalIdx] = elemVolVars[scvIdx].capillaryPressure();
+ (*pn)[globalIdx] = elemVolVars[scvIdx].pressure(nPhaseIdx);
+ (*pw)[globalIdx] = elemVolVars[scvIdx].pressure(wPhaseIdx);
+ (*pc)[globalIdx] = elemVolVars[scvIdx].capillaryPressure();
(*rhoW)[globalIdx] = elemVolVars[scvIdx].fluidState().density(wPhaseIdx);
(*rhoN)[globalIdx] = elemVolVars[scvIdx].fluidState().density(nPhaseIdx);
(*mobW)[globalIdx] = elemVolVars[scvIdx].mobility(wPhaseIdx);
@@ -375,11 +375,11 @@ public:
} // loop over elements
- writer.attachDofData(*sN, "Sn", isBox);
- writer.attachDofData(*sW, "Sw", isBox);
- writer.attachDofData(*pN, "pN", isBox);
- writer.attachDofData(*pW, "pW", isBox);
- writer.attachDofData(*pC, "pC", isBox);
+ writer.attachDofData(*sN, "sn", isBox);
+ writer.attachDofData(*sW, "sw", isBox);
+ writer.attachDofData(*pn, "pn", isBox);
+ writer.attachDofData(*pw, "pw", isBox);
+ writer.attachDofData(*pc, "pc", isBox);
writer.attachDofData(*rhoW, "rhoW", isBox);
writer.attachDofData(*rhoN, "rhoN", isBox);
writer.attachDofData(*mobW, "mobW", isBox);
@@ -634,7 +634,7 @@ public:
wouldSwitch = true;
// nonwetting phase disappears
std::cout << "Nonwetting phase disappears at vertex " << globalIdx
- << ", coordinates: " << globalPos << ", Sn: "
+ << ", coordinates: " << globalPos << ", sn: "
<< volVars.saturation(nPhaseIdx) << std::endl;
newPhasePresence = wPhaseOnly;
@@ -646,7 +646,7 @@ public:
wouldSwitch = true;
// wetting phase disappears
std::cout << "Wetting phase disappears at vertex " << globalIdx
- << ", coordinates: " << globalPos << ", Sw: "
+ << ", coordinates: " << globalPos << ", sw: "
<< volVars.saturation(wPhaseIdx) << std::endl;
newPhasePresence = nPhaseOnly;
diff --git a/dumux/implicit/2p2c/2p2cpropertydefaults.hh b/dumux/implicit/2p2c/2p2cpropertydefaults.hh
index 488936adc5cf2fa093ab4cde5109cf8122dda4ed..6aa279c55aca97f5503cf6016fd80acc4ad913ba 100644
--- a/dumux/implicit/2p2c/2p2cpropertydefaults.hh
+++ b/dumux/implicit/2p2c/2p2cpropertydefaults.hh
@@ -84,7 +84,7 @@ SET_PROP(TwoPTwoC, NumPhases)
SET_INT_PROP(TwoPTwoC, NumEq, 2); //!< set the number of equations to 2
-//! Set the default formulation to pw-Sn
+//! Set the default formulation to pw-sn
SET_INT_PROP(TwoPTwoC,
Formulation,
TwoPTwoCFormulation::pwsn);
diff --git a/dumux/implicit/2p2c/2p2cvolumevariables.hh b/dumux/implicit/2p2c/2p2cvolumevariables.hh
index 03318c6d3b225cab0a671fab2e16c607d08fbd3a..537090802e15fd66d6c42fdc33411caec045816b 100644
--- a/dumux/implicit/2p2c/2p2cvolumevariables.hh
+++ b/dumux/implicit/2p2c/2p2cvolumevariables.hh
@@ -192,22 +192,22 @@ public:
/////////////
// set the saturations
/////////////
- Scalar Sn;
+ Scalar sn;
if (phasePresence == nPhaseOnly)
- Sn = 1.0;
+ sn = 1.0;
else if (phasePresence == wPhaseOnly) {
- Sn = 0.0;
+ sn = 0.0;
}
else if (phasePresence == bothPhases) {
if (formulation == pwsn)
- Sn = priVars[switchIdx];
+ sn = priVars[switchIdx];
else if (formulation == pnsw)
- Sn = 1.0 - priVars[switchIdx];
+ sn = 1.0 - priVars[switchIdx];
else DUNE_THROW(Dune::InvalidStateException, "Formulation: " << formulation << " is invalid.");
}
else DUNE_THROW(Dune::InvalidStateException, "phasePresence: " << phasePresence << " is invalid.");
- fluidState.setSaturation(wPhaseIdx, 1 - Sn);
- fluidState.setSaturation(nPhaseIdx, Sn);
+ fluidState.setSaturation(wPhaseIdx, 1 - sn);
+ fluidState.setSaturation(nPhaseIdx, sn);
/////////////
// set the pressures of the fluid phases
@@ -216,15 +216,15 @@ 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]);
- fluidState.setPressure(nPhaseIdx, priVars[pressureIdx] + pC);
+ fluidState.setPressure(nPhaseIdx, priVars[pressureIdx] + pc);
}
else if (formulation == pnsw) {
fluidState.setPressure(nPhaseIdx, priVars[pressureIdx]);
- fluidState.setPressure(wPhaseIdx, priVars[pressureIdx] - pC);
+ fluidState.setPressure(wPhaseIdx, priVars[pressureIdx] - pc);
}
else DUNE_THROW(Dune::InvalidStateException, "Formulation: " << formulation << " is invalid.");
diff --git a/dumux/implicit/2pdfm/2pdfmlocalresidual.hh b/dumux/implicit/2pdfm/2pdfmlocalresidual.hh
index 871674664bfa2eb155e9967c98ec7a639f3a3219..a11af4fe9acb89e9ae63fb934a3378a9ba020b4a 100644
--- a/dumux/implicit/2pdfm/2pdfmlocalresidual.hh
+++ b/dumux/implicit/2pdfm/2pdfmlocalresidual.hh
@@ -121,17 +121,17 @@ public:
const Element &elem = this->element_();
bool isFracture = this->problem_().spatialParams().isVertexFracture(elem, scvIdx);
/*
- * Sn = w_F * SnF + w_M * SnM
- * First simple case before determining the real w_F is to assume that it is 0
- * and w_M = 1
+ * sn = wf * SnF + wm * SnM
+ * First simple case before determining the real wf is to assume that it is 0
+ * and wm = 1
*
*/
///////////////////////////////////////////////////////////////////////
- Scalar w_F, w_M; //volumetric fractions of fracture and matrix;
+ Scalar wf, wm; //volumetric fractions of fracture and matrix;
Scalar fractureVolume = 0.0;
- w_F = 0.0;
+ wf = 0.0;
/*
- * Calculate the fracture volume fraction w_F = 0.5 * Fwidth * 0.5 * Length
+ * Calculate the fracture volume fraction wf = 0.5 * Fwidth * 0.5 * Length
*/
Dune::GeometryType gt = elem.geometry().type();
const typename Dune::GenericReferenceElementContainer<DT,dim>::value_type&
@@ -160,8 +160,8 @@ public:
fractureVolume += 0.5 * fracture_length * fracture_width;
}
}
- w_F = fractureVolume/vol;
- w_M = 1-w_F;
+ wf = fractureVolume/vol;
+ wm = 1-wf;
///////////////////////////////////////////////////////////////////////
Scalar storageFracture[numPhases];
Scalar storageMatrix [numPhases];
@@ -171,10 +171,10 @@ public:
storageMatrix[nPhaseIdx] = 0.0;
// const GlobalPosition &globalPos = elem.geometry().corner(scvIdx);
- Scalar dSM_dSF = vertDat.dsm_dsf();
+ Scalar dsm_dsf = vertDat.dsm_dsf();
if (!this->problem_().useInterfaceCondition())
{
- dSM_dSF = 1.0;
+ dsm_dsf = 1.0;
}
if (isFracture)
@@ -183,12 +183,12 @@ public:
{
storageFracture[phaseIdx] = vertDat.density(phaseIdx)
* vertDat.porosityFracture()
- * w_F
+ * wf
* vertDat.saturationFracture(phaseIdx);
storageMatrix[phaseIdx] = vertDat.density(phaseIdx)
* vertDat.porosity()
- * w_M
- * dSM_dSF
+ * wm
+ * dsm_dsf
* vertDat.saturationMatrix(phaseIdx);
}
}
diff --git a/dumux/implicit/2pdfm/2pdfmvolumevariables.hh b/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
index 911313ea35625e1c99fe71a6e8419a0f3ecf68a6..8cb95273560bccbfdc3bdf9b5b26a575643d3eea 100644
--- a/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
+++ b/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
@@ -144,11 +144,11 @@ public:
satN_ = satNMatrix_;
satW_ = satWMatrix_;
- pCMatrix_ = MaterialLaw::pc(materialParamsMatrix, satWMatrix_);
- pC_ = pCMatrix_;
+ pcMatrix_ = MaterialLaw::pc(materialParamsMatrix, satWMatrix_);
+ pc_ = pcMatrix_;
//pressures
pMatrix[wPhaseIdx] = priVars[pressureIdx];
- pMatrix[nPhaseIdx] = pMatrix[wPhaseIdx] + pCMatrix_;
+ pMatrix[nPhaseIdx] = pMatrix[wPhaseIdx] + pcMatrix_;
//Initialize pFract with the same values as the ones in the matrix
pFract[wPhaseIdx] = pMatrix[wPhaseIdx];
pFract[nPhaseIdx] = satNMatrix_;
@@ -169,9 +169,9 @@ 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_;
+ pFract[nPhaseIdx] = pFract[wPhaseIdx] + pcFracture_;
pEntryMatrix_ = MaterialLaw::pc(materialParamsMatrix, 1);
//use interface condition - extended capillary pressure inteface condition
@@ -179,7 +179,7 @@ public:
{
interfaceCondition(materialParamsMatrix);
}
- pC_ = pCFracture_;
+ pc_ = pcFracture_;
satW_ = satWFracture_; //for plotting we are interested in the saturations of the fracture
satN_ = satNFracture_;
mobilityFracture_[wPhaseIdx] =
@@ -191,10 +191,10 @@ public:
/ fluidStateFracture_.viscosity(nPhaseIdx);
// derivative resulted from BrooksCorey pc_Sw formulation
- dSM_dSF_ = (1 - problem.spatialParams().SwrM_) / (1 - problem.spatialParams().SwrF_)
- * pow((problem.spatialParams().pdM_/ problem.spatialParams().pdF_),problem.spatialParams().lambdaM_)
+ dsm_dsf_ = (1 - problem.spatialParams().swrm_) / (1 - problem.spatialParams().swrf_)
+ * pow((problem.spatialParams().pdm_/ problem.spatialParams().pdf_),problem.spatialParams().lambdaM_)
* (problem.spatialParams().lambdaM_ / problem.spatialParams().lambdaF_)
- * pow((satWFracture_ - problem.spatialParams().SwrF_ ) / (1 - problem.spatialParams().SwrF_),
+ * pow((satWFracture_ - problem.spatialParams().swrf_ ) / (1 - problem.spatialParams().swrf_),
(problem.spatialParams().lambdaM_ / problem.spatialParams().lambdaF_) - 1);
}// end if (node)
///////////////////////////////////////////////////////////////////////////////
@@ -204,7 +204,7 @@ public:
there are no fracture are set unphysical*/
satNFracture_ = -1;
satWFracture_ = -1;
- pCFracture_ = -1e100;
+ pcFracture_ = -1e100;
pFract[wPhaseIdx] = -1e100;
pFract[nPhaseIdx] = -1e100;
pEntryMatrix_ = -1e100;
@@ -213,7 +213,7 @@ public:
}
///////////////////////////////////////////////////////////////////////////////
pressure[wPhaseIdx] = priVars[pressureIdx];
- pressure[nPhaseIdx] = pressure[wPhaseIdx] + pC_;
+ pressure[nPhaseIdx] = pressure[wPhaseIdx] + pc_;
porosityFracture_ = problem.spatialParams().porosityFracture(element,
fvGeometry,
@@ -223,7 +223,7 @@ public:
/*!
* \brief Extended capillary pressure saturation interface condition
*
- * \param materialParamsMatrix the material law o calculate the Sw as inverse of capillary pressure function
+ * \param materialParamsMatrix the material law o calculate the sw as inverse of capillary pressure function
*
* This method is called by updateFracture
*/
@@ -233,7 +233,7 @@ public:
* if the capillary pressure in the fracture is smaller than the entry pressure
* in the matrix than in the matrix
* */
- if (pCFracture_ <= pEntryMatrix_)
+ if (pcFracture_ <= pEntryMatrix_)
{
satWMatrix_ = 1.0;
satNMatrix_ = 1 - satWMatrix_;
@@ -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_;
}
}
@@ -347,7 +347,7 @@ public:
* \brief Returns the derivative dsm/dsf
*/
Scalar dsm_dsf() const
- { return dSM_dSF_;}
+ { return dsm_dsf_;}
DUNE_DEPRECATED_MSG("use dsm_dsf() (uncapitalized) instead")
Scalar dSM_dSF() const
@@ -372,11 +372,11 @@ protected:
Scalar satNFracture_;
Scalar satNMatrix_;
- Scalar pC_;
- Scalar pCFracture_;
- Scalar pCMatrix_;
+ Scalar pc_;
+ Scalar pcFracture_;
+ Scalar pcMatrix_;
Scalar pEntryMatrix_;
- Scalar dSM_dSF_;
+ Scalar dsm_dsf_;
bool isNodeOnFracture_;
diff --git a/dumux/implicit/3p3c/3p3cmodel.hh b/dumux/implicit/3p3c/3p3cmodel.hh
index b171e3283cf7e64aca7f9228a84f0f850098169d..a0df51ee81ae8d49d2582dd368b3b5f64281e919 100644
--- a/dumux/implicit/3p3c/3p3cmodel.hh
+++ b/dumux/implicit/3p3c/3p3cmodel.hh
@@ -379,9 +379,9 @@ public:
}
- writer.attachDofData(*saturation[wPhaseIdx], "Sw", isBox);
- writer.attachDofData(*saturation[nPhaseIdx], "Sn", isBox);
- writer.attachDofData(*saturation[gPhaseIdx], "Sg", isBox);
+ writer.attachDofData(*saturation[wPhaseIdx], "sw", isBox);
+ writer.attachDofData(*saturation[nPhaseIdx], "sn", isBox);
+ writer.attachDofData(*saturation[gPhaseIdx], "sg", isBox);
writer.attachDofData(*pressure[wPhaseIdx], "pw", isBox);
writer.attachDofData(*pressure[nPhaseIdx], "pn", isBox);
writer.attachDofData(*pressure[gPhaseIdx], "pg", isBox);
@@ -590,7 +590,7 @@ protected:
wouldSwitch = true;
// gas phase disappears
std::cout << "Gas phase disappears at vertex " << globalIdx
- << ", coordinates: " << globalPos << ", Sg: "
+ << ", coordinates: " << globalPos << ", sg: "
<< volVars.saturation(gPhaseIdx) << std::endl;
newPhasePresence = wnPhaseOnly;
@@ -602,7 +602,7 @@ protected:
wouldSwitch = true;
// water phase disappears
std::cout << "Water phase disappears at vertex " << globalIdx
- << ", coordinates: " << globalPos << ", Sw: "
+ << ", coordinates: " << globalPos << ", sw: "
<< volVars.saturation(wPhaseIdx) << std::endl;
newPhasePresence = gnPhaseOnly;
@@ -614,7 +614,7 @@ protected:
wouldSwitch = true;
// NAPL phase disappears
std::cout << "NAPL phase disappears at vertex " << globalIdx
- << ", coordinates: " << globalPos << ", Sn: "
+ << ", coordinates: " << globalPos << ", sn: "
<< volVars.saturation(nPhaseIdx) << std::endl;
newPhasePresence = wgPhaseOnly;
@@ -714,7 +714,7 @@ protected:
wouldSwitch = true;
// NAPL phase disappears
std::cout << "NAPL phase disappears at vertex " << globalIdx
- << ", coordinates: " << globalPos << ", Sn: "
+ << ", coordinates: " << globalPos << ", sn: "
<< volVars.saturation(nPhaseIdx) << std::endl;
nonwettingFlag = 1;
}
@@ -779,7 +779,7 @@ protected:
wouldSwitch = true;
// NAPL phase disappears
std::cout << "NAPL phase disappears at vertex " << globalIdx
- << ", coordinates: " << globalPos << ", Sn: "
+ << ", coordinates: " << globalPos << ", sn: "
<< volVars.saturation(nPhaseIdx) << std::endl;
nonwettingFlag = 1;
}
@@ -942,7 +942,7 @@ protected:
wouldSwitch = true;
// gas phase disappears
std::cout << "Gas phase disappears at vertex " << globalIdx
- << ", coordinates: " << globalPos << ", Sg: "
+ << ", coordinates: " << globalPos << ", sg: "
<< volVars.saturation(gPhaseIdx) << std::endl;
gasFlag = 1;
}
@@ -956,7 +956,7 @@ protected:
wouldSwitch = true;
// gas phase disappears
std::cout << "Water phase disappears at vertex " << globalIdx
- << ", coordinates: " << globalPos << ", Sw: "
+ << ", coordinates: " << globalPos << ", sw: "
<< volVars.saturation(wPhaseIdx) << std::endl;
wettingFlag = 1;
}
diff --git a/dumux/implicit/3p3c/3p3cvolumevariables.hh b/dumux/implicit/3p3c/3p3cvolumevariables.hh
index baefaeecb874e9a7713edb1ae2bc4afe027bf386..d6361025008a05fdc6ea2166b39d5c2974de1e47 100644
--- a/dumux/implicit/3p3c/3p3cvolumevariables.hh
+++ b/dumux/implicit/3p3c/3p3cvolumevariables.hh
@@ -141,56 +141,56 @@ public:
/* first the saturations */
if (phasePresence == threePhases)
{
- Sw_ = priVars[switch1Idx];
- Sn_ = priVars[switch2Idx];
- Sg_ = 1. - Sw_ - Sn_;
+ sw_ = priVars[switch1Idx];
+ sn_ = priVars[switch2Idx];
+ sg_ = 1. - sw_ - sn_;
}
else if (phasePresence == wPhaseOnly)
{
- Sw_ = 1.;
- Sn_ = 0.;
- Sg_ = 0.;
+ sw_ = 1.;
+ sn_ = 0.;
+ sg_ = 0.;
}
else if (phasePresence == gnPhaseOnly)
{
- Sw_ = 0.;
- Sn_ = priVars[switch2Idx];
- Sg_ = 1. - Sn_;
+ sw_ = 0.;
+ sn_ = priVars[switch2Idx];
+ sg_ = 1. - sn_;
}
else if (phasePresence == wnPhaseOnly)
{
- Sn_ = priVars[switch2Idx];
- Sw_ = 1. - Sn_;
- Sg_ = 0.;
+ sn_ = priVars[switch2Idx];
+ sw_ = 1. - sn_;
+ sg_ = 0.;
}
else if (phasePresence == gPhaseOnly)
{
- Sw_ = 0.;
- Sn_ = 0.;
- Sg_ = 1.;
+ sw_ = 0.;
+ sn_ = 0.;
+ sg_ = 1.;
}
else if (phasePresence == wgPhaseOnly)
{
- Sw_ = priVars[switch1Idx];
- Sn_ = 0.;
- Sg_ = 1. - Sw_;
+ sw_ = priVars[switch1Idx];
+ sn_ = 0.;
+ sg_ = 1. - sw_;
}
else DUNE_THROW(Dune::InvalidStateException, "phasePresence: " << phasePresence << " is invalid.");
- Valgrind::CheckDefined(Sg_);
+ Valgrind::CheckDefined(sg_);
- fluidState_.setSaturation(wPhaseIdx, Sw_);
- fluidState_.setSaturation(gPhaseIdx, Sg_);
- fluidState_.setSaturation(nPhaseIdx, Sn_);
+ fluidState_.setSaturation(wPhaseIdx, sw_);
+ fluidState_.setSaturation(gPhaseIdx, sg_);
+ fluidState_.setSaturation(nPhaseIdx, sn_);
/* now the pressures */
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);
@@ -706,7 +706,7 @@ protected:
bool isOldSol)
{ }
- Scalar Sw_, Sg_, Sn_, pg_, pw_, pn_;
+ Scalar sw_, sg_, sn_, pg_, pw_, pn_;
Scalar moleFrac_[numPhases][numComponents];
Scalar massFrac_[numPhases][numComponents];
diff --git a/dumux/implicit/co2/co2model.hh b/dumux/implicit/co2/co2model.hh
index c7b16e47fdf6568b7cee56de77bd595666f3b5ed..9000673e36b034da1b2d4385dd440784bf6f428a 100644
--- a/dumux/implicit/co2/co2model.hh
+++ b/dumux/implicit/co2/co2model.hh
@@ -241,7 +241,7 @@ public:
wouldSwitch = true;
// nonwetting phase disappears
std::cout << "Nonwetting phase disappears at vertex " << globalIdx
- << ", coordinates: " << globalPos << ", Sn: "
+ << ", coordinates: " << globalPos << ", sn: "
<< volVars.saturation(nPhaseIdx) << std::endl;
newPhasePresence = wPhaseOnly;
@@ -253,7 +253,7 @@ public:
wouldSwitch = true;
// wetting phase disappears
std::cout << "Wetting phase disappears at vertex " << globalIdx
- << ", coordinates: " << globalPos << ", Sw: "
+ << ", coordinates: " << globalPos << ", sw: "
<< volVars.saturation(wPhaseIdx) << std::endl;
newPhasePresence = nPhaseOnly;
diff --git a/dumux/implicit/co2/co2volumevariables.hh b/dumux/implicit/co2/co2volumevariables.hh
index 21f2e1cb8b8a566915423570ce18f4d3182e426b..6fc918cd4446a0454f2f9571409b68afad801c2c 100644
--- a/dumux/implicit/co2/co2volumevariables.hh
+++ b/dumux/implicit/co2/co2volumevariables.hh
@@ -137,37 +137,37 @@ public:
/////////////
// set the saturations
/////////////
- Scalar Sn;
+ Scalar sn;
if (phasePresence == nPhaseOnly)
- Sn = 1.0;
+ sn = 1.0;
else if (phasePresence == wPhaseOnly) {
- Sn = 0.0;
+ sn = 0.0;
}
else if (phasePresence == bothPhases) {
if (formulation == pwsn)
- Sn = priVars[switchIdx];
+ sn = priVars[switchIdx];
else if (formulation == pnsw)
- Sn = 1.0 - priVars[switchIdx];
+ sn = 1.0 - priVars[switchIdx];
else DUNE_THROW(Dune::InvalidStateException, "Formulation: " << formulation << " is invalid.");
}
else DUNE_THROW(Dune::InvalidStateException, "phasePresence: " << phasePresence << " is invalid.");
- ParentType::fluidState_.setSaturation(wPhaseIdx, 1 - Sn);
- ParentType::fluidState_.setSaturation(nPhaseIdx, Sn);
+ ParentType::fluidState_.setSaturation(wPhaseIdx, 1 - sn);
+ ParentType::fluidState_.setSaturation(nPhaseIdx, sn);
// capillary pressure parameters
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) {
ParentType::fluidState_.setPressure(wPhaseIdx, priVars[pressureIdx]);
- ParentType::fluidState_.setPressure(nPhaseIdx, priVars[pressureIdx] + pC);
+ ParentType::fluidState_.setPressure(nPhaseIdx, priVars[pressureIdx] + pc);
}
else if (formulation == pnsw) {
ParentType::fluidState_.setPressure(nPhaseIdx, priVars[pressureIdx]);
- ParentType::fluidState_.setPressure(wPhaseIdx, priVars[pressureIdx] - pC);
+ ParentType::fluidState_.setPressure(wPhaseIdx, priVars[pressureIdx] - pc);
}
else DUNE_THROW(Dune::InvalidStateException, "Formulation: " << formulation << " is invalid.");
@@ -338,8 +338,8 @@ public:
// {
// std::cout<<"globalIdx = "<<globalIdx<<std::endl;
// std::cout<<"scvIdx = "<<globalIdx<<std::endl;
-// std::cout<<"Sn = "<<ParentType::fluidState_.saturation(nPhaseIdx)<<std::endl;
-// std::cout<<"Sw = "<<ParentType::fluidState_.saturation(wPhaseIdx)<<std::endl;
+// std::cout<<"sn = "<<ParentType::fluidState_.saturation(nPhaseIdx)<<std::endl;
+// std::cout<<"sw = "<<ParentType::fluidState_.saturation(wPhaseIdx)<<std::endl;
// std::cout<<"mobilityN = "<<ParentType::mobility(nPhaseIdx)<<std::endl;
// std::cout<<"xgH2O = "<<ParentType::fluidState_.moleFraction(nPhaseIdx, wCompIdx)<<std::endl;
// std::cout<<"xgCO2 = "<<ParentType::fluidState_.moleFraction(nPhaseIdx, nCompIdx)<<std::endl;
diff --git a/dumux/implicit/mpnc/energy/mpncfluxvariablesenergy.hh b/dumux/implicit/mpnc/energy/mpncfluxvariablesenergy.hh
index e567e3ccea23dcbbea3cb8e2ba99e9754a081703..ce50f9ebea3d3f792b1226ac0318d3327a6e784e 100644
--- a/dumux/implicit/mpnc/energy/mpncfluxvariablesenergy.hh
+++ b/dumux/implicit/mpnc/energy/mpncfluxvariablesenergy.hh
@@ -146,14 +146,14 @@ public:
const FluidState &fsI = elemVolVars[i].fluidState();
const FluidState &fsJ = elemVolVars[j].fluidState();
- const Scalar Swi = fsI.saturation(wPhaseIdx);
- const Scalar Swj = fsJ.saturation(wPhaseIdx);
+ const Scalar swi = fsI.saturation(wPhaseIdx);
+ const Scalar swj = fsJ.saturation(wPhaseIdx);
typename FluidSystem::ParameterCache paramCacheI, paramCacheJ;
paramCacheI.updateAll(fsI);
paramCacheJ.updateAll(fsJ);
- const Scalar Sw = std::max<Scalar>(0.0, 0.5*(Swi + Swj));
+ const Scalar sw = std::max<Scalar>(0.0, 0.5*(swi + swj));
// const Scalar lambdaDry = 0.583; // W / (K m) // works, orig
// const Scalar lambdaWet = 1.13; // W / (K m) // works, orig
@@ -172,15 +172,15 @@ public:
// Stuttgart, Institute of Hydraulic Engineering, p. 57
Scalar result;
- if (Sw < 0.1) {
+ if (sw < 0.1) {
// regularization
Dumux::Spline<Scalar> sp(0, 0.1, // x1, x2
0, sqrt(0.1), // y1, y2
5*0.5/sqrt(0.1), 0.5/sqrt(0.1)); // m1, m2
- result = lambdaDry + sp.eval(Sw)*(lambdaWet - lambdaDry);
+ result = lambdaDry + sp.eval(sw)*(lambdaWet - lambdaDry);
}
else
- result = lambdaDry + std::sqrt(Sw)*(lambdaWet - lambdaDry);
+ result = lambdaDry + std::sqrt(sw)*(lambdaWet - lambdaDry);
return result;
}
diff --git a/dumux/implicit/richards/richardsmodel.hh b/dumux/implicit/richards/richardsmodel.hh
index bc75f3279cb13965a2b5f8044348c22fefef1abe..5b53e5f0b7d76c6a61cb08990cc24f2d99993f54 100644
--- a/dumux/implicit/richards/richardsmodel.hh
+++ b/dumux/implicit/richards/richardsmodel.hh
@@ -143,11 +143,11 @@ public:
unsigned numDofs = this->numDofs();
// create the required scalar fields
- ScalarField *pW = writer.allocateManagedBuffer(numDofs);
- ScalarField *pN = writer.allocateManagedBuffer(numDofs);
- ScalarField *pC = writer.allocateManagedBuffer(numDofs);
- ScalarField *Sw = writer.allocateManagedBuffer(numDofs);
- ScalarField *Sn = writer.allocateManagedBuffer(numDofs);
+ ScalarField *pw = writer.allocateManagedBuffer(numDofs);
+ ScalarField *pn = writer.allocateManagedBuffer(numDofs);
+ ScalarField *pc = writer.allocateManagedBuffer(numDofs);
+ ScalarField *sw = writer.allocateManagedBuffer(numDofs);
+ ScalarField *sn = writer.allocateManagedBuffer(numDofs);
ScalarField *rhoW = writer.allocateManagedBuffer(numDofs);
ScalarField *rhoN = writer.allocateManagedBuffer(numDofs);
ScalarField *mobW = writer.allocateManagedBuffer(numDofs);
@@ -189,11 +189,11 @@ public:
{
int globalIdx = this->dofMapper().map(*elemIt, scvIdx, dofCodim);
- (*pW)[globalIdx] = elemVolVars[scvIdx].pressure(wPhaseIdx);
- (*pN)[globalIdx] = elemVolVars[scvIdx].pressure(nPhaseIdx);
- (*pC)[globalIdx] = elemVolVars[scvIdx].capillaryPressure();
- (*Sw)[globalIdx] = elemVolVars[scvIdx].saturation(wPhaseIdx);
- (*Sn)[globalIdx] = elemVolVars[scvIdx].saturation(nPhaseIdx);
+ (*pw)[globalIdx] = elemVolVars[scvIdx].pressure(wPhaseIdx);
+ (*pn)[globalIdx] = elemVolVars[scvIdx].pressure(nPhaseIdx);
+ (*pc)[globalIdx] = elemVolVars[scvIdx].capillaryPressure();
+ (*sw)[globalIdx] = elemVolVars[scvIdx].saturation(wPhaseIdx);
+ (*sn)[globalIdx] = elemVolVars[scvIdx].saturation(nPhaseIdx);
(*rhoW)[globalIdx] = elemVolVars[scvIdx].density(wPhaseIdx);
(*rhoN)[globalIdx] = elemVolVars[scvIdx].density(nPhaseIdx);
(*mobW)[globalIdx] = elemVolVars[scvIdx].mobility(wPhaseIdx);
@@ -206,11 +206,11 @@ public:
velocityOutput.calculateVelocity(*velocity, elemVolVars, fvGeometry, *elemIt, /*phaseIdx=*/0);
}
- writer.attachDofData(*Sn, "Sn", isBox);
- writer.attachDofData(*Sw, "Sw", isBox);
- writer.attachDofData(*pN, "pn", isBox);
- writer.attachDofData(*pW, "pw", isBox);
- writer.attachDofData(*pC, "pc", isBox);
+ writer.attachDofData(*sn, "sn", isBox);
+ writer.attachDofData(*sw, "sw", isBox);
+ writer.attachDofData(*pn, "pn", isBox);
+ writer.attachDofData(*pw, "pw", isBox);
+ writer.attachDofData(*pc, "pc", isBox);
writer.attachDofData(*rhoW, "rhoW", isBox);
writer.attachDofData(*rhoN, "rhoN", isBox);
writer.attachDofData(*mobW, "mobW", isBox);
diff --git a/dumux/implicit/richards/richardsnewtoncontroller.hh b/dumux/implicit/richards/richardsnewtoncontroller.hh
index a5e7ac9a4a89f6ecda2c4bc30d9c4c9c797a4e1f..cf36745b3f44e21328b05e15960ddc69a1096c9e 100644
--- a/dumux/implicit/richards/richardsnewtoncontroller.hh
+++ b/dumux/implicit/richards/richardsnewtoncontroller.hh
@@ -103,21 +103,21 @@ public:
const SpatialParams &spatialParams = this->problem_().spatialParams();
const MaterialLawParams &mp = spatialParams.materialLawParams(*elemIt, fvGeometry, scvIdx);
Scalar pcMin = MaterialLaw::pc(mp, 1.0);
- Scalar pW = uLastIter[globalIdx][pwIdx];
- Scalar pN = std::max(this->problem_().referencePressure(*elemIt, fvGeometry, scvIdx),
- pW + pcMin);
- Scalar pcOld = pN - pW;
+ Scalar pw = uLastIter[globalIdx][pwIdx];
+ 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));
// 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];
- pW = std::max(pwMin, std::min(pW, pwMax));
- uCurrentIter[globalIdx][pwIdx] = pW;
+ pw = uCurrentIter[globalIdx][pwIdx];
+ pw = std::max(pwMin, std::min(pw, pwMax));
+ uCurrentIter[globalIdx][pwIdx] = pw;
}
}
diff --git a/dumux/implicit/richards/richardsvolumevariables.hh b/dumux/implicit/richards/richardsvolumevariables.hh
index 2050d372451df77f6553f7ee8e4e896a502fac20..0e24a53f45cebcefebd4bff587b580594c3fb428 100644
--- a/dumux/implicit/richards/richardsvolumevariables.hh
+++ b/dumux/implicit/richards/richardsvolumevariables.hh
@@ -128,9 +128,9 @@ public:
fluidState.setPressure(nPhaseIdx, std::max(pnRef, priVars[pwIdx] + minPc));
// saturations
- Scalar Sw = MaterialLaw::sw(matParams, fluidState.pressure(nPhaseIdx) - fluidState.pressure(wPhaseIdx));
- fluidState.setSaturation(wPhaseIdx, Sw);
- fluidState.setSaturation(nPhaseIdx, 1 - Sw);
+ Scalar sw = MaterialLaw::sw(matParams, fluidState.pressure(nPhaseIdx) - fluidState.pressure(wPhaseIdx));
+ fluidState.setSaturation(wPhaseIdx, sw);
+ fluidState.setSaturation(nPhaseIdx, 1 - sw);
// density and viscosity
typename FluidSystem::ParameterCache paramCache;
diff --git a/test/implicit/2p/lensspatialparams.hh b/test/implicit/2p/lensspatialparams.hh
index a9a2fd9dce771d5cd5315d860e0b3c70a25bc375..f1032f3131e94da589fc965befaa9ca54cbb0a0e 100644
--- a/test/implicit/2p/lensspatialparams.hh
+++ b/test/implicit/2p/lensspatialparams.hh
@@ -166,7 +166,7 @@ public:
{ return 0.4; }
/*!
- * \brief Function for defining the parameters needed by constitutive relationships (kr-Sw, pc-Sw, etc.).
+ * \brief Function for defining the parameters needed by constitutive relationships (kr-sw, pc-sw, etc.).
*
* \param element The current element
* \param fvElemGeom The current finite volume geometry of the element
diff --git a/test/implicit/2pdfm/2pdfmspatialparams.hh b/test/implicit/2pdfm/2pdfmspatialparams.hh
index eb2bcaba7387507c9dc3bd15e62f44e5599ae559..c4456a63b83adb51fa9d97d106056260018d34fd 100644
--- a/test/implicit/2pdfm/2pdfmspatialparams.hh
+++ b/test/implicit/2pdfm/2pdfmspatialparams.hh
@@ -109,23 +109,23 @@ public:
Scalar mD = 1e-12 * 1e-3; //miliDarcy
- SwrF_ = 0.00;
- SwrM_ = 0.00;
+ swrf_ = 0.00;
+ swrm_ = 0.00;
SnrF_ = 0.00;
SnrM_ = 0.00;
- pdF_ = 1000; //2.5*1e4;
- pdM_ = 2000; //2.5*1e4;
+ pdf_ = 1000; //2.5*1e4;
+ pdm_ = 2000; //2.5*1e4;
lambdaF_ = 2.0;
lambdaM_ = 2.0;
- rockMatrixMaterialParams_.setSwr(SwrM_);
+ rockMatrixMaterialParams_.setSwr(swrm_);
rockMatrixMaterialParams_.setSnr(SnrM_);
- fractureMaterialParams_.setSwr(SwrF_);
+ fractureMaterialParams_.setSwr(swrf_);
fractureMaterialParams_.setSnr(SnrF_);
- rockMatrixMaterialParams_.setPe(pdM_);
+ rockMatrixMaterialParams_.setPe(pdm_);
rockMatrixMaterialParams_.setLambda(lambdaM_);
- fractureMaterialParams_.setPe(pdF_);
+ fractureMaterialParams_.setPe(pdf_);
fractureMaterialParams_.setLambda(lambdaF_);
KMatrix_ = 1 * mD; //m^2
@@ -194,7 +194,7 @@ public:
return porosityFracture_;
}
/*!
- * \brief Function for defining the parameters needed by constitutive relationships (kr-Sw, pc-Sw, etc.).
+ * \brief Function for defining the parameters needed by constitutive relationships (kr-sw, pc-sw, etc.).
*
* \param element The current element
* \param fvGeometry The current finite volume geometry of the element
@@ -209,7 +209,7 @@ public:
}
/*!
- * \brief Function for defining the parameters needed by constitutive relationships (kr-Sw, pc-Sw, etc.).
+ * \brief Function for defining the parameters needed by constitutive relationships (kr-sw, pc-sw, etc.).
*
* \param element The current element
* \param fvGeometry The current finite volume geometry of the element
@@ -291,14 +291,14 @@ public:
return fractureWidth_;
}
- Scalar SwrF_;
- Scalar SwrM_;
+ Scalar swrf_;
+ Scalar swrm_;
Scalar SnrF_;
Scalar SnrM_;
Scalar lambdaF_;
Scalar lambdaM_;
- Scalar pdF_;
- Scalar pdM_;
+ Scalar pdf_;
+ Scalar pdm_;
private:
Scalar KMatrix_;
diff --git a/test/implicit/3p3c/infiltrationproblem.hh b/test/implicit/3p3c/infiltrationproblem.hh
index a0c90be7236b1d87d91cf96400ef0b22f844c409..599b130cb085d44e8d3bd383752dd2d7d67d0156 100644
--- a/test/implicit/3p3c/infiltrationproblem.hh
+++ b/test/implicit/3p3c/infiltrationproblem.hh
@@ -240,24 +240,24 @@ public:
{
Scalar y = globalPos[1];
Scalar x = globalPos[0];
- Scalar Sw, Swr=0.12, Sgr=0.03;
+ Scalar sw, swr=0.12, sgr=0.03;
if(y >(-1.E-3*x+5) )
{
Scalar pc = 9.81 * 1000.0 * (y - (-5E-4*x+5));
if (pc < 0.0) pc = 0.0;
- Sw = invertPCGW_(pc,
+ sw = invertPcgw_(pc,
this->spatialParams().materialLawParams());
- if (Sw < Swr) Sw = Swr;
- if (Sw > 1.-Sgr) Sw = 1.-Sgr;
+ if (sw < swr) sw = swr;
+ if (sw > 1.-sgr) sw = 1.-sgr;
values[pressureIdx] = 1e5 ;
- values[switch1Idx] = Sw;
+ values[switch1Idx] = sw;
values[switch2Idx] = 1.e-6;
}else {
values[pressureIdx] = 1e5 + 9.81 * 1000.0 * ((-5E-4*x+5) - y);
- values[switch1Idx] = 1.-Sgr;
+ values[switch1Idx] = 1.-sgr;
values[switch2Idx] = 1.e-6;
}
@@ -348,53 +348,53 @@ private:
{
Scalar y = globalPos[1];
Scalar x = globalPos[0];
- Scalar Sw, Swr=0.12, Sgr=0.03;
+ Scalar sw, swr=0.12, sgr=0.03;
if(y >(-1.E-3*x+5) )
{
Scalar pc = 9.81 * 1000.0 * (y - (-5E-4*x+5));
if (pc < 0.0) pc = 0.0;
- Sw = invertPCGW_(pc,
+ sw = invertPcgw_(pc,
this->spatialParams().materialLawParams());
- if (Sw < Swr) Sw = Swr;
- if (Sw > 1.-Sgr) Sw = 1.-Sgr;
+ if (sw < swr) sw = swr;
+ if (sw > 1.-sgr) sw = 1.-sgr;
values[pressureIdx] = 1e5 ;
- values[switch1Idx] = Sw;
+ values[switch1Idx] = sw;
values[switch2Idx] = 1.e-6;
}else {
values[pressureIdx] = 1e5 + 9.81 * 1000.0 * ((-5E-4*x+5) - y);
- values[switch1Idx] = 1.-Sgr;
+ values[switch1Idx] = 1.-sgr;
values[switch2Idx] = 1.e-6;
}
}
- static Scalar invertPCGW_(Scalar pcIn, const MaterialLawParams &pcParams)
+ static Scalar invertPcgw_(Scalar pcIn, const MaterialLawParams &pcParams)
{
Scalar lower,upper;
int k;
int maxIt = 50;
Scalar bisLimit = 1.;
- Scalar Sw, pcGW;
+ Scalar sw, pcgw;
lower=0.0; upper=1.0;
for (k=1; k<=25; k++)
{
- Sw = 0.5*(upper+lower);
- pcGW = MaterialLaw::pcgw(pcParams, Sw);
- Scalar delta = pcGW-pcIn;
+ sw = 0.5*(upper+lower);
+ pcgw = MaterialLaw::pcgw(pcParams, sw);
+ Scalar delta = pcgw-pcIn;
if (delta<0.) delta*=-1.;
if (delta<bisLimit)
{
- return(Sw);
+ return(sw);
}
if (k==maxIt) {
- return(Sw);
+ return(sw);
}
- if (pcGW>pcIn) lower=Sw;
- else upper=Sw;
+ if (pcgw>pcIn) lower=sw;
+ else upper=sw;
}
- return(Sw);
+ return(sw);
}
Scalar temperature_;
diff --git a/test/implicit/3p3c/infiltrationspatialparameters.hh b/test/implicit/3p3c/infiltrationspatialparameters.hh
index b2755ef671e0f6984d847858d3b1850ef303c8e3..82e45992fded59fc2c3946bc23d44e4848606f1b 100644
--- a/test/implicit/3p3c/infiltrationspatialparameters.hh
+++ b/test/implicit/3p3c/infiltrationspatialparameters.hh
@@ -244,21 +244,21 @@ public:
const FVElementGeometry &fvGeometry,
int scvfIdx) const
{
- static const Scalar ldry = 0.35;
- static const Scalar lSw1 = 1.8;
- static const Scalar lSn1 = 0.65;
+ static const Scalar lDry = 0.35;
+ static const Scalar lsw1 = 1.8;
+ static const Scalar lsn1 = 0.65;
// arithmetic mean of the liquid saturation and the porosity
const int i = fluxDat.face().i;
const int j = fluxDat.face().j;
- Scalar Sw = std::max(0.0, (elemVolVars[i].saturation(wPhaseIdx) +
+ Scalar sw = std::max(0.0, (elemVolVars[i].saturation(wPhaseIdx) +
elemVolVars[j].saturation(wPhaseIdx)) / 2);
- Scalar Sn = std::max(0.0, (elemVolVars[i].saturation(nPhaseIdx) +
+ Scalar sn = std::max(0.0, (elemVolVars[i].saturation(nPhaseIdx) +
elemVolVars[j].saturation(nPhaseIdx)) / 2);
// the heat conductivity of the matrix. in general this is a
// tensorial value, but we assume isotropic heat conductivity.
- Scalar heatCond = ldry + sqrt(Sw) * (lSw1-ldry) + sqrt(Sn) * (lSn1-ldry);
+ Scalar heatCond = lDry + sqrt(sw) * (lsw1-lDry) + sqrt(sn) * (lsn1-lDry);
// the matrix heat flux is the negative temperature gradient
// times the heat conductivity.
diff --git a/test/implicit/3p3cni/columnxylolspatialparams.hh b/test/implicit/3p3cni/columnxylolspatialparams.hh
index 64426ae74f37fc61cb9a9440a280186375123d7f..6a10a0ace13bd58ee2b757a696bc4d27b2baad7d 100644
--- a/test/implicit/3p3cni/columnxylolspatialparams.hh
+++ b/test/implicit/3p3cni/columnxylolspatialparams.hh
@@ -258,21 +258,21 @@ public:
const FVElementGeometry &fvGeometry,
int faceIdx) const
{
- static const Scalar ldry = 0.35;
- static const Scalar lSw1 = 1.8;
- static const Scalar lSn1 = 0.65;
+ static const Scalar lDry = 0.35;
+ static const Scalar lsw1 = 1.8;
+ static const Scalar lsn1 = 0.65;
// arithmetic mean of the liquid saturation and the porosity
const int i = fluxDat.face().i;
const int j = fluxDat.face().j;
- Scalar Sw = std::max(0.0, (elemVolVars[i].saturation(wPhaseIdx) +
+ Scalar sw = std::max(0.0, (elemVolVars[i].saturation(wPhaseIdx) +
elemVolVars[j].saturation(wPhaseIdx)) / 2);
- Scalar Sn = std::max(0.0, (elemVolVars[i].saturation(nPhaseIdx) +
+ Scalar sn = std::max(0.0, (elemVolVars[i].saturation(nPhaseIdx) +
elemVolVars[j].saturation(nPhaseIdx)) / 2);
// the heat conductivity of the matrix. in general this is a
// tensorial value, but we assume isotropic heat conductivity.
- Scalar heatCond = ldry + sqrt(Sw) * (lSw1-ldry) + sqrt(Sn) * (lSn1-ldry);
+ Scalar heatCond = lDry + sqrt(sw) * (lsw1-lDry) + sqrt(sn) * (lsn1-lDry);
// the matrix heat flux is the negative temperature gradient
// times the heat conductivity.
diff --git a/test/implicit/3p3cni/kuevettespatialparams.hh b/test/implicit/3p3cni/kuevettespatialparams.hh
index a13932b4dbddc4efc296b25de8a3cf2a3c400255..824e979af7b335ee910acaa6fab182248cb79a20 100644
--- a/test/implicit/3p3cni/kuevettespatialparams.hh
+++ b/test/implicit/3p3cni/kuevettespatialparams.hh
@@ -253,21 +253,21 @@ public:
const FVElementGeometry &fvGeometry,
const int faceIdx) const
{
- static const Scalar ldry = 0.35;
- static const Scalar lSw1 = 1.8;
- static const Scalar lSn1 = 0.65;
+ static const Scalar lDry = 0.35;
+ static const Scalar lsw1 = 1.8;
+ static const Scalar lsn1 = 0.65;
// arithmetic mean of the liquid saturation and the porosity
const int i = fluxDat.face().i;
const int j = fluxDat.face().j;
- Scalar Sw = std::max(0.0, (elemVolVars[i].saturation(wPhaseIdx) +
+ Scalar sw = std::max(0.0, (elemVolVars[i].saturation(wPhaseIdx) +
elemVolVars[j].saturation(wPhaseIdx)) / 2);
- Scalar Sn = std::max(0.0, (elemVolVars[i].saturation(nPhaseIdx) +
+ Scalar sn = std::max(0.0, (elemVolVars[i].saturation(nPhaseIdx) +
elemVolVars[j].saturation(nPhaseIdx)) / 2);
// the heat conductivity of the matrix. in general this is a
// tensorial value, but we assume isotropic heat conductivity.
- Scalar heatCond = ldry + sqrt(Sw) * (lSw1-ldry) + sqrt(Sn) * (lSn1-ldry);
+ Scalar heatCond = lDry + sqrt(sw) * (lsw1-lDry) + sqrt(sn) * (lsn1-lDry);
// the matrix heat flux is the negative temperature gradient
// times the heat conductivity.
diff --git a/test/implicit/mpnc/forchheimer1pproblem.hh b/test/implicit/mpnc/forchheimer1pproblem.hh
index 95ede04a3077152624209f92f1b8cd5f03d98bbb..ff69997f6d474217fa58fcff358c5ab6de3f6a58 100644
--- a/test/implicit/mpnc/forchheimer1pproblem.hh
+++ b/test/implicit/mpnc/forchheimer1pproblem.hh
@@ -408,11 +408,11 @@ private:
// calulate the capillary pressure
const MaterialLawParams &matParams =
this->spatialParams().materialLawParamsAtPos(globalPos);
- PhaseVector pC;
- MaterialLaw::capillaryPressures(pC, matParams, fs);
+ PhaseVector pc;
+ MaterialLaw::capillaryPressures(pc, matParams, fs);
fs.setPressure(otherPhaseIdx,
fs.pressure(refPhaseIdx)
- + (pC[otherPhaseIdx] - pC[refPhaseIdx]));
+ + (pc[otherPhaseIdx] - pc[refPhaseIdx]));
// make the fluid state consistent with local thermodynamic
// equilibrium
diff --git a/test/implicit/mpnc/forchheimer2pproblem.hh b/test/implicit/mpnc/forchheimer2pproblem.hh
index a8ba6a0e24863c02e84b18019a70a3f5fc9a7b52..8533d656dc039b48f88cce37eec4807ae7ef36cb 100644
--- a/test/implicit/mpnc/forchheimer2pproblem.hh
+++ b/test/implicit/mpnc/forchheimer2pproblem.hh
@@ -407,11 +407,11 @@ private:
// calulate the capillary pressure
const MaterialLawParams &matParams =
this->spatialParams().materialLawParamsAtPos(globalPos);
- PhaseVector pC;
- MaterialLaw::capillaryPressures(pC, matParams, fs);
+ PhaseVector pc;
+ MaterialLaw::capillaryPressures(pc, matParams, fs);
fs.setPressure(otherPhaseIdx,
fs.pressure(refPhaseIdx)
- + (pC[otherPhaseIdx] - pC[refPhaseIdx]));
+ + (pc[otherPhaseIdx] - pc[refPhaseIdx]));
// make the fluid state consistent with local thermodynamic
// equilibrium
diff --git a/test/implicit/mpnc/forchheimerspatialparams.hh b/test/implicit/mpnc/forchheimerspatialparams.hh
index b0c25bdb41fe327172f67f82ea68b7716b469888..0be42cd92ece1ad8f2cb339a6f3dac656255e950 100644
--- a/test/implicit/mpnc/forchheimerspatialparams.hh
+++ b/test/implicit/mpnc/forchheimerspatialparams.hh
@@ -170,7 +170,7 @@ public:
}
/*!
- * \brief Function for defining the parameters needed by constitutive relationships (kr-Sw, pc-Sw, etc.).
+ * \brief Function for defining the parameters needed by constitutive relationships (kr-sw, pc-sw, etc.).
*
* \param pos The global position of the sub-control volume.
* \return the material parameters object
diff --git a/test/implicit/mpnc/obstacleproblem.hh b/test/implicit/mpnc/obstacleproblem.hh
index eaa243265cf7a49e4ee51938fc3d8e532b8ee91a..81669149f9a42b514cd7f4ecbe784f7871b8f44d 100644
--- a/test/implicit/mpnc/obstacleproblem.hh
+++ b/test/implicit/mpnc/obstacleproblem.hh
@@ -392,11 +392,11 @@ private:
// calulate the capillary pressure
const MaterialLawParams &matParams =
this->spatialParams().materialLawParamsAtPos(globalPos);
- PhaseVector pC;
- MaterialLaw::capillaryPressures(pC, matParams, fs);
+ PhaseVector pc;
+ MaterialLaw::capillaryPressures(pc, matParams, fs);
fs.setPressure(otherPhaseIdx,
fs.pressure(refPhaseIdx)
- + (pC[otherPhaseIdx] - pC[refPhaseIdx]));
+ + (pc[otherPhaseIdx] - pc[refPhaseIdx]));
// make the fluid state consistent with local thermodynamic
// equilibrium
diff --git a/test/implicit/mpnc/obstaclespatialparams.hh b/test/implicit/mpnc/obstaclespatialparams.hh
index 4eb0da179348f64ddf056655ecc36b61bcc8bc44..ba487450d7ab3a7ab6b6a6a875371f2b51afa490 100644
--- a/test/implicit/mpnc/obstaclespatialparams.hh
+++ b/test/implicit/mpnc/obstaclespatialparams.hh
@@ -224,11 +224,11 @@ public:
// porosity(element, fvElemGeom, j)) / 2;
//
// Scalar lsat = pow(lGranite, (1-poro)) * pow(lWater, poro);
-// Scalar ldry = pow(lGranite, (1-poro));
+// Scalar lDry = pow(lGranite, (1-poro));
//
// // the heat conductivity of the matrix. in general this is a
// // tensorial value, but we assume isotropic heat conductivity.
-// Scalar heatCond = ldry + sqrt(Sl) * (ldry - lsat);
+// Scalar heatCond = lDry + sqrt(Sl) * (lDry - lsat);
//
// // the matrix heat flux is the negative temperature gradient
// // times the heat conductivity.
@@ -237,7 +237,7 @@ public:
// }
/*!
- * \brief Function for defining the parameters needed by constitutive relationships (kr-Sw, pc-Sw, etc.).
+ * \brief Function for defining the parameters needed by constitutive relationships (kr-sw, pc-sw, etc.).
*
* \param pos The global position of the sub-control volume.
* \return the material parameters object
diff --git a/test/implicit/richards/richardslensproblem.hh b/test/implicit/richards/richardslensproblem.hh
index 5f0bdffa0f149570fe36fed81d1597109c1c267b..43e7d2a77acff7593d40f9e9feaa23b3a92f3ef3 100644
--- a/test/implicit/richards/richardslensproblem.hh
+++ b/test/implicit/richards/richardslensproblem.hh
@@ -294,10 +294,10 @@ public:
private:
void initial_(PrimaryVariables &values, const GlobalPosition &pos) const
{
- Scalar Sw = 0.0;
+ Scalar sw = 0.0;
Scalar pc =
MaterialLaw::pc(this->spatialParams().materialLawParams(pos),
- Sw);
+ sw);
values[pwIdx] = pnRef_ - pc;
}