Commit 6c61aa2c authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

Partially implements FS#180 - Inconsistent naming - special status of

saturation. In particular, it deals with the capitalized "S"-indices: 
S0Idx -> s0Idx
SnIdx -> snIdx
SwIdx -> swIdx
SOrX1Idx -> sOrX1Idx
SOrX2Idx -> sOrX2Idx
SnOrXidx -> snOrXIdx
SwOrXIdx -> swOrXIdx 

Reviewed by Christoph. 



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10756 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent e1484974
......@@ -80,7 +80,10 @@ struct DecoupledTwoPIndices : public DecoupledTwoPCommonIndices
// indices of the primary variables
static const int pwIdx = PVOffset + 0; //!< Pressure index of the wetting phase
static const int SnIdx = PVOffset + 1; //!< Saturation index of the non-wetting phase
static const int snIdx = PVOffset + 1; //!< \deprecated Saturation index of the nonwetting phase
DUNE_DEPRECATED_MSG("use snIdx (uncapitalized 's') instead")
static const int SnIdx = snIdx; //!< \deprecated Saturation index of the nonwetting phase
//! \cond \private
//Set the types of the single models depending on the formulation
......@@ -115,7 +118,10 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnSw, PVOffset>
// indices of the primary variables
static const int pnIdx = PVOffset + 0; //!< Pressure index of the non-wetting phase
static const int SwIdx = PVOffset + 1; //!< Saturation index of the wetting phase
static const int swIdx = PVOffset + 1; //!< Saturation index of the wetting phase
DUNE_DEPRECATED_MSG("use swIdx (uncapitalized 's') instead")
static const int SwIdx = swIdx; //!< \deprecated Saturation index of the wetting phase
//! \cond \private
//Set the types of the single models depending on the formulation
......@@ -152,7 +158,10 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pwSw, PVOffset>
// indices of the primary variables
static const int pwIdx = PVOffset + 0; //!< Pressure index of the wetting phase
static const int SwIdx = PVOffset + 1; //!< Saturation index of the wetting phase
static const int swIdx = PVOffset + 1; //!< Saturation index of the wetting phase
DUNE_DEPRECATED_MSG("use swIdx (uncapitalized 's') instead")
static const int SwIdx = swIdx; //!< \deprecated Saturation index of the wetting phase
//! \cond \private
//Set the types of the single models depending on the formulation
......@@ -187,7 +196,10 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnSn, PVOffset>
// indices of the primary variables
static const int pnIdx = PVOffset + 0; //!< Pressure index of the non-wetting phase
static const int SnIdx = PVOffset + 1; //!< Saturation index of the non-wetting phase
static const int snIdx = PVOffset + 1; //!< \deprecated Saturation index of the nonwetting phase
DUNE_DEPRECATED_MSG("use snIdx (uncapitalized 's') instead")
static const int SnIdx = snIdx; //!< \deprecated Saturation index of the nonwetting phase
//! \cond \private
//Set the types of the single models depending on the formulation
......@@ -223,7 +235,10 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pGlobalSw, PVOffset> : p
// indices of the primary variables
static const int pGlobalIdx = PVOffset + 0; //!< Global pressure index
static const int SwIdx = PVOffset + 1; //!< Saturation index of the wetting phase
static const int swIdx = PVOffset + 1; //!< Saturation index of the wetting phase
DUNE_DEPRECATED_MSG("use swIdx (uncapitalized 's') instead")
static const int SwIdx = swIdx; //!< \deprecated Saturation index of the wetting phase
//! \cond \private
//Set the types of the single models depending on the formulation
......@@ -256,7 +271,10 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pGlobalSn, PVOffset>
// indices of the primary variables
static const int pGlobalIdx = PVOffset + 0; //!< Global pressure index
static const int SnIdx = PVOffset + 1; //!< Saturation index of the non-wetting phase
static const int snIdx = PVOffset + 1; //!< \deprecated Saturation index of the nonwetting phase
DUNE_DEPRECATED_MSG("use snIdx (uncapitalized 's') instead")
static const int SnIdx = snIdx; //!< \deprecated Saturation index of the nonwetting phase
//! \cond \private
//Set the types of the single models depending on the formulation
......
......@@ -79,7 +79,10 @@ struct TwoPIndices
// indices of the primary variables
static const int pwIdx = PVOffset + 0; //!< Pressure index of the wetting phase
static const int SnIdx = PVOffset + 1; //!< Saturation index of the wetting phase
static const int snIdx = PVOffset + 1; //!< \deprecated Saturation index of the nonwetting phase
DUNE_DEPRECATED_MSG("use snIdx (uncapitalized 's') instead")
static const int SnIdx = snIdx; //!< \deprecated Saturation index of the nonwetting phase
// indices of the equations
static const int contiWEqIdx = PVOffset + 0; //!< Index of the continuity equation of the wetting phase
......@@ -103,8 +106,11 @@ struct TwoPIndices<TypeTag, TwoPFormulation::pnSw, PVOffset>
static const int saturationIdx = PVOffset + 1; //!< Index of the saturation of the non-wetting/wetting phase
// indices of the primary variables
static const int pnIdx = PVOffset + 0; //!< Pressure index of the wetting phase
static const int SwIdx = PVOffset + 1; //!< Saturation index of the wetting phase
static const int pnIdx = PVOffset + 0; //!< Pressure index of the nonwetting phase
static const int swIdx = PVOffset + 1; //!< Saturation index of the wetting phase
DUNE_DEPRECATED_MSG("use swIdx (uncapitalized 's') instead")
static const int SwIdx = swIdx; //!< \deprecated Saturation index of the wetting phase
// indices of the equations
static const int contiNEqIdx = PVOffset + 0; //!< Index of the continuity equation of the non-wetting phase
......
......@@ -77,7 +77,10 @@ public:
static const int switchIdx = PVOffset + 1; //!< Index of the either the saturation or the mass fraction of the non-wetting/wetting phase
static const int pwIdx = pressureIdx; //!< Index for wetting phase pressure in a solution vector
static const int SnOrXIdx = switchIdx; //!< Index of the either the saturation of the non-wetting phase or the mass fraction secondary component in the only phase
static const int snOrXIdx = switchIdx; //!< Index of the either the saturation of the non-wetting phase or the mass fraction secondary component in the only phase
DUNE_DEPRECATED_MSG("use snOrXIdx (uncapitalized 's') instead")
static const int SnOrXIdx = snOrXIdx; //!< \deprecated
// equation indices
static const int conti0EqIdx = PVOffset; //!< Index of the mass conservation equation for the first component
......@@ -117,7 +120,10 @@ public:
static const int switchIdx = PVOffset + 1; //!< Index of the either the saturation or the mass fraction of the non-wetting/wetting phase
static const int pnIdx = pressureIdx; //!< Index for non-wetting phase pressure in a solution vector
static const int SwOrXIdx = switchIdx; //!< Index of the either the saturation of the liquid phase or the mass fraction of the secondary component in the only phase
static const int swOrXIdx = switchIdx; //!< Index of the either the saturation of the liquid phase or the mass fraction of the secondary component in the only phase
DUNE_DEPRECATED_MSG("use swOrXIdx (uncapitalized 's') instead")
static const int SwOrXIdx = swOrXIdx; //!< \deprecated
// Equation indices
static const int conti0EqIdx = PVOffset; //!< Index of the mass conservation equation for the first component
......
......@@ -50,7 +50,10 @@ struct TwoPDFMIndices : public TwoPIndices <TypeTag, formulation, PVOffset>
// indices of the primary variables
static const int pwIdx = PVOffset + 0; //!< Pressure index of the wetting phase
static const int SnIdx = PVOffset + 1; //!< Saturation index of the wetting phase
static const int snIdx = PVOffset + 1; //!< \deprecated Saturation index of the nonwetting phase
DUNE_DEPRECATED_MSG("use snIdx (uncapitalized 's') instead")
static const int SnIdx = snIdx; //!< \deprecated Saturation index of the nonwetting phase
// indices of the equations
static const int contiWEqIdx = PVOffset + 0; //!< Index of the continuity equation of the wetting phase
......
......@@ -68,8 +68,13 @@ public:
static const int switch2Idx = PVOffset + 2; //!< Index 2 of saturation or mole fraction
static const int pgIdx = pressureIdx; //!< Index for gas phase pressure in a solution vector
static const int SOrX1Idx = switch1Idx; //!< Index of the either the saturation of the gas phase or the mass fraction secondary component if a phase is not present
static const int SOrX2Idx = switch2Idx; //!< Index of the either the saturation of the gas phase or the mass fraction secondary component if a phase is not present
static const int sOrX1Idx = switch1Idx; //!< Index of the either the saturation of the gas phase or the mass fraction secondary component if a phase is not present
static const int sOrX2Idx = switch2Idx; //!< Index of the either the saturation of the gas phase or the mass fraction secondary component if a phase is not present
DUNE_DEPRECATED_MSG("use sOrX1Idx (uncapitalized 's') instead")
static const int SOrX1Idx = sOrX1Idx; //!< \deprecated
DUNE_DEPRECATED_MSG("use sOrX2Idx (uncapitalized 's') instead")
static const int SOrX2Idx = sOrX2Idx; //!< \deprecated
// equation indices
static const int conti0EqIdx = PVOffset + wCompIdx; //!< Index of the mass conservation equation for the water component
......
......@@ -92,10 +92,13 @@ public:
* The following (numPhases - 1) primary variables represent the
* saturations for the phases [1, ..., numPhases - 1]
*/
static const unsigned int S0Idx =
static const unsigned int s0Idx =
MassIndices::NumPrimaryVars +
EnergyIndices::NumPrimaryVars;
DUNE_DEPRECATED_MSG("use s0Idx (uncapitalized 's') instead")
static const int S0Idx = s0Idx; //!< \deprecated index of the saturation of the first phase
/*!
* \brief Index of the first phase' pressure in a vector of
* primary variables.
......
......@@ -49,7 +49,7 @@ class MpNcNewtonChop
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { fug0Idx = Indices::fug0Idx };
enum { S0Idx = Indices::S0Idx };
enum { s0Idx = Indices::s0Idx };
enum { p0Idx = Indices::p0Idx };
public:
......@@ -58,8 +58,8 @@ public:
{
for (unsigned int i = 0; i < uLastIter.size(); ++i) {
for (unsigned int phaseIdx = 0; phaseIdx < numPhases - 1; ++phaseIdx)
saturationChop_(uCurrentIter[i][S0Idx + phaseIdx],
uLastIter[i][S0Idx + phaseIdx]);
saturationChop_(uCurrentIter[i][s0Idx + phaseIdx],
uLastIter[i][s0Idx + phaseIdx]);
pressureChop_(uCurrentIter[i][p0Idx], uLastIter[i][p0Idx]);
for (unsigned int comp = 0; comp < numComponents; ++comp) {
pressureChop_(uCurrentIter[i][fug0Idx + comp], uLastIter[i][fug0Idx + comp]);
......@@ -104,7 +104,7 @@ class MpNcNewtonChop<TypeTag, /*enableKinetic=*/true>
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { moleFrac00Idx = Indices::moleFrac00Idx };
enum { S0Idx = Indices::S0Idx };
enum { s0Idx = Indices::s0Idx };
enum { p0Idx = Indices::p0Idx };
public:
......@@ -113,8 +113,8 @@ public:
{
for (int i = 0; i < uLastIter.size(); ++i) {
for (int phaseIdx = 0; phaseIdx < numPhases - 1; ++phaseIdx)
saturationChop_(uCurrentIter[i][S0Idx + phaseIdx],
uLastIter[i][S0Idx + phaseIdx]);
saturationChop_(uCurrentIter[i][s0Idx + phaseIdx],
uLastIter[i][s0Idx + phaseIdx]);
pressureChop_(uCurrentIter[i][p0Idx], uLastIter[i][p0Idx]);
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx) {
for (int compIdx = 0; compIdx < numComponents; ++compIdx) {
......@@ -182,7 +182,7 @@ class MPNCNewtonController : public NewtonController<TypeTag>
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents)};
enum {enableKinetic = GET_PROP_VALUE(TypeTag, EnableKinetic)};
enum {p0Idx = Indices::p0Idx};
enum {S0Idx = Indices::S0Idx};
enum {s0Idx = Indices::s0Idx};
typedef MpNcNewtonChop<TypeTag, enableKinetic> NewtonChop;
......
......@@ -83,7 +83,7 @@ class MPNCVolumeVariables
enum {enableKinetic = GET_PROP_VALUE(TypeTag, EnableKinetic)};
enum {enableKineticEnergy = GET_PROP_VALUE(TypeTag, EnableKineticEnergy)};
enum {enableDiffusion = GET_PROP_VALUE(TypeTag, EnableDiffusion) || enableKinetic};
enum {S0Idx = Indices::S0Idx};
enum {s0Idx = Indices::s0Idx};
enum {p0Idx = Indices::p0Idx};
typedef typename GridView::template Codim<0>::Entity Element;
......@@ -131,8 +131,8 @@ public:
/////////////
Scalar sumSat = 0;
for (int phaseIdx = 0; phaseIdx < numPhases - 1; ++phaseIdx) {
sumSat += priVars[S0Idx + phaseIdx];
fluidState_.setSaturation(phaseIdx, priVars[S0Idx + phaseIdx]);
sumSat += priVars[s0Idx + phaseIdx];
fluidState_.setSaturation(phaseIdx, priVars[s0Idx + phaseIdx]);
}
Valgrind::CheckDefined(sumSat);
fluidState_.setSaturation(numPhases - 1, 1.0 - sumSat);
......
......@@ -201,7 +201,7 @@ class GeneralLensProblem : public GET_PROP_TYPE(TypeTag, ProblemBaseClass)
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
pwIdx = Indices::pwIdx,
SnIdx = Indices::SnIdx,
snIdx = Indices::snIdx,
// equation indices
contiWEqIdx = Indices::contiWEqIdx,
......@@ -372,7 +372,7 @@ public:
// hydrostatic pressure scaled by alpha
values[pwIdx] = 1e5 - alpha*densityW*this->gravity()[1]*depth;
values[SnIdx] = 0.0;
values[snIdx] = 0.0;
}
else if (onRightBoundary_(globalPos))
{
......@@ -380,7 +380,7 @@ public:
// hydrostatic pressure
values[pwIdx] = 1e5 - densityW*this->gravity()[1]*depth;
values[SnIdx] = 0.0;
values[snIdx] = 0.0;
}
else
values = 0.0;
......@@ -429,7 +429,7 @@ public:
// hydrostatic pressure
values[pwIdx] = 1e5 - densityW*this->gravity()[1]*depth;
values[SnIdx] = 0.0;
values[snIdx] = 0.0;
}
// \}
......
......@@ -193,7 +193,7 @@ class TestDiffusionProblem: public DiffusionProblem2P<TypeTag>
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx,
pGlobalIdx = Indices::pGlobalIdx,
SwIdx = Indices::SwIdx,
swIdx = Indices::swIdx,
pressEqIdx = Indices::pressureEqIdx
};
......@@ -303,7 +303,7 @@ public:
void dirichletAtPos(PrimaryVariables &values, const GlobalPosition& globalPos) const
{
values[pGlobalIdx] = exact(globalPos);
values[SwIdx] = 1.0;
values[swIdx] = 1.0;
}
//! set neumann condition for phases (flux, [kg/(m^2 s)])
......
......@@ -132,7 +132,7 @@ class TestIMPESAdaptiveProblem: public IMPESProblem2P<TypeTag>
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx,
pWIdx = Indices::pwIdx,
SwIdx = Indices::SwIdx,
swIdx = Indices::swIdx,
eqIdxPress = Indices::pressureEqIdx,
eqIdxSat = Indices::satEqIdx
};
......@@ -242,12 +242,12 @@ public:
{
values[pWIdx] = 2e5;
}
values[SwIdx] = 0.8;
values[swIdx] = 0.8;
}
else
{
values[pWIdx] = 2e5;
values[SwIdx] = 0.2;
values[swIdx] = 0.2;
}
}
......@@ -264,7 +264,7 @@ public:
void initial(PrimaryVariables &values, const Element& element) const
{
values[pWIdx] = 0;
values[SwIdx] = 0.2;
values[swIdx] = 0.2;
}
private:
......
......@@ -182,7 +182,7 @@ enum
{
wPhaseIdx = Indices::wPhaseIdx, nPhaseIdx = Indices::nPhaseIdx,
pWIdx = Indices::pwIdx,
SwIdx = Indices::SwIdx,
swIdx = Indices::swIdx,
eqIdxPress = Indices::pressureEqIdx,
eqIdxSat = Indices::satEqIdx
};
......@@ -289,12 +289,12 @@ void dirichletAtPos(PrimaryVariables &values, const GlobalPosition& globalPos) c
{
values[pWIdx] = 2e5;
}
values[SwIdx] = 0.8;
values[swIdx] = 0.8;
}
else
{
values[pWIdx] = 2e5;
values[SwIdx] = 0.2;
values[swIdx] = 0.2;
}
}
......@@ -312,7 +312,7 @@ void initial(PrimaryVariables &values,
const Element& element) const
{
values[pWIdx] = 0;
values[SwIdx] = 0.2;
values[swIdx] = 0.2;
}
private:
......
......@@ -197,7 +197,7 @@ enum
#else
pWIdx = Indices::pwIdx,
#endif
SwIdx = Indices::SwIdx,
swIdx = Indices::swIdx,
eqIdxPress = Indices::pressureEqIdx,
eqIdxSat = Indices::satEqIdx
};
......@@ -395,22 +395,22 @@ void dirichletAtPos(PrimaryVariables &values, const GlobalPosition& globalPos) c
Scalar temp = temperatureAtPos(globalPos);
values[pWIdx] = (1e5 - (this->bboxMax()- globalPos) * this->gravity() * WettingPhase::density(temp, pRef));
values[SwIdx] = 1.0;
values[swIdx] = 1.0;
if (isInlet(globalPos))
{
values[SwIdx] = 0.0;
values[swIdx] = 0.0;
}
#elif PROBLEM == 0
if (globalPos[0] < eps_)
{
values[SwIdx] = 0.8;
values[swIdx] = 0.8;
values[pWIdx] = 1;
}
#else
if (globalPos[0] < eps_)
{
values[SwIdx] = 1.0;
values[swIdx] = 1.0;
values[pNIdx] = 1e5;
}
#endif
......@@ -439,13 +439,13 @@ void initialAtPos(PrimaryVariables &values,
{
#if PROBLEM == 2
values[pWIdx] = 0;
values[SwIdx] = 1.0;
values[swIdx] = 1.0;
#elif PROBLEM == 0
values[pWIdx] = 0;
values[SwIdx] = 0.2;
values[swIdx] = 0.2;
#else
values[pNIdx] = 0;
values[SwIdx] = 0.0;
values[swIdx] = 0.0;
#endif
}
......
......@@ -172,7 +172,7 @@ class LensProblem : public GET_PROP_TYPE(TypeTag, BaseProblem)
// primary variable indices
pwIdx = Indices::pwIdx,
SnIdx = Indices::SnIdx,
snIdx = Indices::snIdx,
// equation indices
contiNEqIdx = Indices::contiNEqIdx,
......@@ -311,7 +311,7 @@ public:
// hydrostatic pressure scaled by alpha
values[pwIdx] = 1e5 - factor*densityW*this->gravity()[1]*depth;
values[SnIdx] = 0.0;
values[snIdx] = 0.0;
}
/*!
......@@ -363,7 +363,7 @@ public:
// hydrostatic pressure
values[pwIdx] = 1e5 - densityW*this->gravity()[1]*depth;
values[SnIdx] = 0.0;
values[snIdx] = 0.0;
}
// \}
......
......@@ -134,7 +134,7 @@ class TwoPDFMTestProblem : public ImplicitPorousMediaProblem<TypeTag>
enum {
// primary variable indices
pwIdx = Indices::pwIdx,
SnIdx = Indices::SnIdx,
snIdx = Indices::snIdx,
// equation indices
contiNEqIdx = Indices::contiNEqIdx,
......@@ -277,7 +277,7 @@ public:
// hydrostatic pressure scaled by alpha
values[pwIdx] = 2 - alpha*densityW*this->gravity()[1]*depth;
values[SnIdx] = 1.0;
values[snIdx] = 1.0;
}
else if (onRightBoundary_(globalPos))
{
......@@ -285,7 +285,7 @@ public:
// hydrostatic pressure
values[pwIdx] = 1 - densityW*this->gravity()[1]*depth;
values[SnIdx] = 0.0;
values[snIdx] = 0.0;
}
else
{
......@@ -338,7 +338,7 @@ public:
// hydrostatic pressure
values[pwIdx] = 1 - densityW*this->gravity()[1]*depth;
values[SnIdx] = 0.0;
values[snIdx] = 0.0;
}
// \}
......
......@@ -157,7 +157,7 @@ class Forchheimer1pProblem
enum {wCompIdx = FluidSystem::wCompIdx};
enum {nCompIdx = FluidSystem::nCompIdx};
enum {fug0Idx = Indices::fug0Idx};
enum {S0Idx = Indices::S0Idx};
enum {s0Idx = Indices::s0Idx};
enum {p0Idx = Indices::p0Idx};
typedef typename GridView::template Codim<0>::Entity Element;
......@@ -435,7 +435,7 @@ private:
// first M - 1 saturations
for (int phaseIdx = 0; phaseIdx < numPhases - 1; ++phaseIdx)
values[S0Idx + phaseIdx] = fs.saturation(phaseIdx);
values[s0Idx + phaseIdx] = fs.saturation(phaseIdx);
// first pressure
values[p0Idx] = fs.pressure(/*phaseIdx=*/0);
......
......@@ -151,7 +151,7 @@ class Forchheimer2pProblem
enum {wCompIdx = FluidSystem::wCompIdx};
enum {nCompIdx = FluidSystem::nCompIdx};
enum {fug0Idx = Indices::fug0Idx};
enum {S0Idx = Indices::S0Idx};
enum {s0Idx = Indices::s0Idx};
enum {p0Idx = Indices::p0Idx};
typedef typename GridView::template Codim<0>::Entity Element;
......@@ -434,7 +434,7 @@ private:
// first M - 1 saturations
for (int phaseIdx = 0; phaseIdx < numPhases - 1; ++phaseIdx)
values[S0Idx + phaseIdx] = fs.saturation(phaseIdx);
values[s0Idx + phaseIdx] = fs.saturation(phaseIdx);
// first pressure
values[p0Idx] = fs.pressure(/*phaseIdx=*/0);
......
......@@ -153,7 +153,7 @@ class ObstacleProblem
enum {wCompIdx = FluidSystem::wCompIdx};
enum {nCompIdx = FluidSystem::nCompIdx};
enum {fug0Idx = Indices::fug0Idx};
enum {S0Idx = Indices::S0Idx};
enum {s0Idx = Indices::s0Idx};
enum {p0Idx = Indices::p0Idx};
typedef typename GridView::template Codim<0>::Entity Element;
......@@ -419,7 +419,7 @@ private:
// first M - 1 saturations
for (int phaseIdx = 0; phaseIdx < numPhases - 1; ++phaseIdx)
values[S0Idx + phaseIdx] = fs.saturation(phaseIdx);
values[s0Idx + phaseIdx] = fs.saturation(phaseIdx);
// first pressure
values[p0Idx] = fs.pressure(/*phaseIdx=*/0);
......
......@@ -154,7 +154,7 @@ public:
void dirichlet(PrimaryVariables &values, const Vertex &vertex) const
{
values[Indices::pwIdx] = 5e5; // 500000 Pa = 5 bar
values[Indices::SnIdx] = 1.0; // 100 % oil saturation on left boundary
values[Indices::snIdx] = 1.0; // 100 % oil saturation on left boundary
}
//! Evaluates the boundary conditions for a Neumann boundary
......@@ -191,7 +191,7 @@ public:
int scvIdx) const
{
values[Indices::pwIdx] = 5e5; // 500 kPa = 5 bar
values[Indices::SnIdx] = 0.0;
values[Indices::snIdx] = 0.0;
}
//! Evaluates the source term for all phases within a given
......
......@@ -123,7 +123,7 @@ class Ex2TutorialProblemDecoupled: public IMPESProblem2P<TypeTag> /*@\label{tuto
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx,
pWIdx = Indices::pwIdx,
SwIdx = Indices::SwIdx,
swIdx = Indices::swIdx,
pressEqIdx = Indices::pressEqIdx,
satEqIdx = Indices::satEqIdx
};
......@@ -245,7 +245,7 @@ public:
void dirichlet(PrimaryVariables &values, const Intersection& intersection) const /*@\label{tutorial-decoupled:dirichlet}@*/
{
values[pWIdx] = 2e5;
values[SwIdx] = 0.0;
values[swIdx] = 0.0;
}
//! Value for neumann boundary condition \f$ [\frac{kg}{m^3 \cdot s}] \f$ at position globalPos.
/*! In case of a neumann boundary condition, the flux of matter
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment