Commit bbcccff3 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

implicit: renaming according to refined naming rules, this time for local

variables. 
Reviewed by Christoph.


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10773 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 3f9a942b
......@@ -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");
......
......@@ -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);
......
......@@ -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;
......
......@@ -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
};
......
......@@ -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);
......
......@@ -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;
......
......@@ -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.
......
......@@ -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;
......
......@@ -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);
......
......@@ -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.");
......
......@@ -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);
}
}
......
......@@ -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_;
......
......@@ -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;
}
......