Commit 18b53f44 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

Perform changes resulting from our refined naming rules, see FS#180.

Only public member names have been treated so far. Local variables
will be done shortly, classes maybe not before the next release cycle.
Everything old could be marked deprecated.

Reviewed by Benjamin and Christoph. 


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10761 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent ab559931
......@@ -38,10 +38,22 @@ namespace Dumux
struct DecoupledTwoPCommonIndices
{
// Formulations
static const int pwSn = 0; //!< Pw and Sn as primary variables
static const int pnSw = 1; //!< Pn and Sw as primary variables
static const int pwSw = 2; //!< Pw and Sw as primary variables
static const int pnSn = 3; //!< Pn 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
DUNE_DEPRECATED_MSG("use pnsw (uncapitalized 's') instead")
static const int pnSw = pnsw; //!< \deprecated
static const int pwsw = 2; //!< Pw and Sw as primary variables
DUNE_DEPRECATED_MSG("use pwsw (uncapitalized 'S') instead")
static const int pwSw = pwsw; //!< \deprecated
static const int pnsn = 3; //!< Pn and Sn as primary variables
DUNE_DEPRECATED_MSG("use pnsn (uncapitalized 'S') instead")
static const int pnSn = pnsn; //!< \deprecated
static const int pGlobalSw = 4; //!< PGlobal and Sw as primary variables
static const int pGlobalSn = 5; //!< PGlobal and Sn as primary variables
......@@ -52,16 +64,26 @@ struct DecoupledTwoPCommonIndices
//saturation flags
static const int saturationW = 0; //!< Indicates wetting phase saturation
static const int saturationNW = 1; //!< Indicates non-wetting phase saturation
static const int saturationNw = 1; //!< Indicates non-wetting phase saturation
DUNE_DEPRECATED_MSG("use saturationNw (uncapitalized 'w') instead")
static const int saturationNW = saturationNw; //!< \deprecated
//pressure flags
static const int pressureW = 0; //!< Indicates wetting phase pressure
static const int pressureNW = 1; //!< Indicates non-wetting phase pressure
static const int pressureNw = 1; //!< Indicates non-wetting phase pressure
static const int pressureGlobal = 2; //!< Indicates global-pressure
DUNE_DEPRECATED_MSG("use pressureNw (uncapitalized 'w') instead")
static const int pressureNW = pressureNw; //!< \deprecated
//velocity flags
static const int velocityW = 0; //!< Indicates wetting phase velocity
static const int velocityNW = 1; //!< Indicates non-wetting phase velocity
static const int velocityNw = 1; //!< Indicates non-wetting phase velocity
static const int velocityTotal = 2; //!< Indicates total velocity
DUNE_DEPRECATED_MSG("use velocityNw (uncapitalized 'w') instead")
static const int velocityNW = velocityNw; //!< \deprecated
};
/*!
......@@ -71,7 +93,7 @@ struct DecoupledTwoPCommonIndices
* \tparam formulation Index of the formulation
* \tparam PVOffset The first index in a primary variable vector.
*/
template <int formulation = DecoupledTwoPCommonIndices::pwSn, int PVOffset = 0>
template <int formulation = DecoupledTwoPCommonIndices::pwsn, int PVOffset = 0>
struct DecoupledTwoPIndices : public DecoupledTwoPCommonIndices
{
// Primary variable indices
......@@ -88,9 +110,9 @@ struct DecoupledTwoPIndices : public DecoupledTwoPCommonIndices
//! \cond \private
//Set the types of the single models depending on the formulation
static const int pressureType = pressureW;
static const int saturationType = saturationNW;
static const int saturationType = saturationNw;
static const int velocityDefault = velocityNW;
static const int velocityDefault = velocityNw;
//! \endcond
// indices of the equations
......@@ -109,7 +131,7 @@ struct DecoupledTwoPIndices : public DecoupledTwoPCommonIndices
* \tparam PVOffset The first index in a primary variable vector.
*/
template <int PVOffset>
struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnSw, PVOffset>
struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnsw, PVOffset>
: public DecoupledTwoPCommonIndices
{
// Primary variable indices
......@@ -125,7 +147,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnSw, PVOffset>
//! \cond \private
//Set the types of the single models depending on the formulation
static const int pressureType = pressureNW;
static const int pressureType = pressureNw;
static const int saturationType = saturationW;
static const int velocityDefault = velocityW;
......@@ -149,7 +171,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnSw, PVOffset>
* \tparam PVOffset The first index in a primary variable vector.
*/
template <int PVOffset>
struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pwSw, PVOffset>
struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pwsw, PVOffset>
: public DecoupledTwoPCommonIndices
{
// Primary variable indices
......@@ -187,7 +209,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pwSw, PVOffset>
* \tparam PVOffset The first index in a primary variable vector.
*/
template <int PVOffset>
struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnSn, PVOffset>
struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnsn, PVOffset>
: public DecoupledTwoPCommonIndices
{
// Primary variable indices
......@@ -203,10 +225,10 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnSn, PVOffset>
//! \cond \private
//Set the types of the single models depending on the formulation
static const int pressureType = pressureNW;
static const int saturationType = saturationNW;
static const int pressureType = pressureNw;
static const int saturationType = saturationNw;
static const int velocityDefault = velocityNW;
static const int velocityDefault = velocityNw;
//! \endcond
// indices of the equations
......@@ -279,7 +301,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pGlobalSn, PVOffset>
//! \cond \private
//Set the types of the single models depending on the formulation
static const int pressureType = pressureGlobal;
static const int saturationType = saturationNW;
static const int saturationType = saturationNw;
static const int velocityDefault = velocityTotal;
//! \endcond
......
......@@ -104,7 +104,7 @@ SET_INT_PROP(DecoupledTwoP, NumComponents, 1); //!< Each phase consists of 1 pur
//! Set \f$p_w\f$-\f$S_n\f$ formulation as default two-phase formulation
SET_INT_PROP(DecoupledTwoP,
Formulation,
DecoupledTwoPCommonIndices::pwSw);
DecoupledTwoPCommonIndices::pwsw);
//! Chose the set of indices depending on the chosen formulation
SET_PROP(DecoupledTwoP, Indices)
......
......@@ -79,17 +79,17 @@ public:
struct AdaptedValues
{
Scalar saturationW;
Scalar saturationNW;
Scalar saturationNw;
Scalar pressW;
Scalar pressNW;
Scalar pressNw;
Scalar volCorr;
int count;
AdaptedValues()
{
saturationW = 0.;
saturationNW = 0.;
saturationNw = 0.;
pressW = 0.;
pressNW = 0.;
pressNw = 0.;
count = 0;
volCorr = 0;
}
......@@ -110,9 +110,9 @@ public:
void storeAdaptionValues(AdaptedValues& adaptedValues, const Element& element)
{
adaptedValues.saturationW = this->saturation(wPhaseIdx);
adaptedValues.saturationNW = this->saturation(nPhaseIdx);
adaptedValues.saturationNw = this->saturation(nPhaseIdx);
adaptedValues.pressW = this->pressure(wPhaseIdx);
adaptedValues.pressNW = this->pressure(nPhaseIdx);
adaptedValues.pressNw = this->pressure(nPhaseIdx);
adaptedValues.volCorr = this->volumeCorrection();
}
//! Stores sons entries into father element for averageing
......@@ -130,9 +130,9 @@ public:
const Element& fatherElement)
{
adaptedValuesFather.saturationW += adaptedValues.saturationW / adaptedValues.count;
adaptedValuesFather.saturationNW += adaptedValues.saturationNW / adaptedValues.count;
adaptedValuesFather.saturationNw += adaptedValues.saturationNw / adaptedValues.count;
adaptedValuesFather.pressW += adaptedValues.pressW / adaptedValues.count;
adaptedValuesFather.pressNW += adaptedValues.pressNW / adaptedValues.count;
adaptedValuesFather.pressNw += adaptedValues.pressNw / adaptedValues.count;
adaptedValuesFather.volCorr += adaptedValues.volCorr / adaptedValues.count;
}
//! Set adapted values in CellData
......@@ -147,9 +147,9 @@ public:
void setAdaptionValues(AdaptedValues& adaptedValues, const Element& element)
{
this->setSaturation(wPhaseIdx, adaptedValues.saturationW / adaptedValues.count);
this->setSaturation(nPhaseIdx, adaptedValues.saturationNW / adaptedValues.count);
this->setSaturation(nPhaseIdx, adaptedValues.saturationNw / adaptedValues.count);
this->setPressure(wPhaseIdx, adaptedValues.pressW / adaptedValues.count);
this->setPressure(nPhaseIdx, adaptedValues.pressNW / adaptedValues.count);
this->setPressure(nPhaseIdx, adaptedValues.pressNw / adaptedValues.count);
this->setUpdate(adaptedValues.volCorr / adaptedValues.count);
}
......@@ -170,9 +170,9 @@ public:
AdaptedValues& adaptedValues = adaptionMap[son];
AdaptedValues& adaptedValuesFather = adaptionMap[father];
adaptedValues.saturationW = adaptedValuesFather.saturationW / adaptedValuesFather.count;
adaptedValues.saturationNW = adaptedValuesFather.saturationNW / adaptedValuesFather.count;
adaptedValues.saturationNw = adaptedValuesFather.saturationNw / adaptedValuesFather.count;
adaptedValues.pressW = adaptedValuesFather.pressW / adaptedValuesFather.count;
adaptedValues.pressNW = adaptedValuesFather.pressNW / adaptedValuesFather.count;
adaptedValues.pressNw = adaptedValuesFather.pressNw / adaptedValuesFather.count;
adaptedValues.volCorr = adaptedValuesFather.volCorr / adaptedValuesFather.count;
}
......
......@@ -76,7 +76,7 @@ namespace Dumux
*
* In the IMPES models the default setting is:
*
* - formulation: \f$ p_w-S_w \f$ (Property: \a Formulation defined as \a DecoupledTwoPCommonIndices::pwSw)
* - formulation: \f$ p_w-S_w \f$ (Property: \a Formulation defined as \a DecoupledTwoPCommonIndices::pwsw)
*
* - compressibility: disabled (Property: \a EnableCompressibility set to \a false)
*
......@@ -113,10 +113,10 @@ template<class TypeTag> class FVPressure2P: public FVPressure<TypeTag>
enum
{
pw = Indices::pressureW,
pn = Indices::pressureNW,
pn = Indices::pressureNw,
pglobal = Indices::pressureGlobal,
Sw = Indices::saturationW,
Sn = Indices::saturationNW,
Sn = Indices::saturationNw,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
eqIdxPress = Indices::pressureEqIdx,
......
......@@ -66,10 +66,10 @@ template<class TypeTag> class FVPressure2PAdaptive: public FVPressure2P<TypeTag>
enum
{
pw = Indices::pressureW,
pn = Indices::pressureNW,
pn = Indices::pressureNw,
pglobal = Indices::pressureGlobal,
Sw = Indices::saturationW,
Sn = Indices::saturationNW,
Sn = Indices::saturationNw,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
eqIdxPress = Indices::pressureEqIdx,
......
......@@ -86,13 +86,13 @@ class FVVelocity2P
enum
{
pw = Indices::pressureW,
pn = Indices::pressureNW,
pn = Indices::pressureNw,
pglobal = Indices::pressureGlobal,
vw = Indices::velocityW,
vn = Indices::velocityNW,
vn = Indices::velocityNw,
vt = Indices::velocityTotal,
Sw = Indices::saturationW,
Sn = Indices::saturationNW,
Sn = Indices::saturationNw,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
eqIdxPress = Indices::pressureEqIdx,
......
......@@ -72,13 +72,13 @@ typedef typename GridView::Traits::template Codim<0>::Entity Element;
enum
{
pw = Indices::pressureW,
pn = Indices::pressureNW,
pn = Indices::pressureNw,
pglobal = Indices::pressureGlobal,
vw = Indices::velocityW,
vn = Indices::velocityNW,
vn = Indices::velocityNw,
vt = Indices::velocityTotal,
Sw = Indices::saturationW,
Sn = Indices::saturationNW,
Sn = Indices::saturationNw,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
eqIdxPress = Indices::pressureEqIdx,
......
......@@ -90,12 +90,12 @@ class FVMPFAL2PFABoundPressure2P: public FVPressure<TypeTag>
enum
{
pw = Indices::pressureW,
pn = Indices::pressureNW,
pn = Indices::pressureNw,
pglobal = Indices::pressureGlobal,
Sw = Indices::saturationW,
Sn = Indices::saturationNW,
Sn = Indices::saturationNw,
vw = Indices::velocityW,
vn = Indices::velocityNW,
vn = Indices::velocityNw,
vt = Indices::velocityTotal
};
enum
......@@ -238,7 +238,7 @@ public:
{
Scalar potW = this->pressure()[globalIdx];
Scalar potPc = cellData.capillaryPressure()
+ (problem_.bboxMax() - globalPos) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
+ (problem_.bBoxMax() - globalPos) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
cellData.setPressure(wPhaseIdx, potW);
cellData.setPressure(nPhaseIdx, potW + potPc);
......@@ -249,7 +249,7 @@ public:
{
Scalar potNW = this->pressure()[globalIdx];
Scalar potPc = cellData.capillaryPressure()
+ (problem_.bboxMax() - globalPos) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
+ (problem_.bBoxMax() - globalPos) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
cellData.setPressure(nPhaseIdx, potNW);
cellData.setPressure(wPhaseIdx, potNW - potPc);
......@@ -349,7 +349,7 @@ public:
if (pressureType_ == pw)
{
(*pressure)[idx] = this->pressure()[idx][0]
- density_[wPhaseIdx] * (gravity_ * (problem_.bboxMax() - eIt->geometry().center()));
- density_[wPhaseIdx] * (gravity_ * (problem_.bBoxMax() - eIt->geometry().center()));
(*potentialSecond)[idx] = cellData.pressure(nPhaseIdx);
(*pressureSecond)[idx] = (*pressure)[idx] + cellData.capillaryPressure();
}
......@@ -357,7 +357,7 @@ public:
if (pressureType_ == pn)
{
(*pressure)[idx] = this->pressure()[idx][0]
- density_[nPhaseIdx] * (gravity_ * (problem_.bboxMax() - eIt->geometry().center()));
- density_[nPhaseIdx] * (gravity_ * (problem_.bBoxMax() - eIt->geometry().center()));
(*potentialSecond)[idx] = cellData.pressure(wPhaseIdx);
(*pressureSecond)[idx] = (*pressure)[idx] - cellData.capillaryPressure();
}
......@@ -1444,12 +1444,12 @@ void FVMPFAL2PFABoundPressure2P<TypeTag>::assemble()
Dune::FieldVector<Scalar, 2 * dim> gravityDiff(0);
// std::cout<<"maxPos = "<<problem_.bboxMax()<<"\n";
// std::cout<<"maxPos = "<<problem_.bBoxMax()<<"\n";
gravityDiff[0] = (problem_.bboxMax() - globalPos1) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
gravityDiff[1] = (problem_.bboxMax() - globalPos2) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
gravityDiff[2] = (problem_.bboxMax() - globalPos3) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
gravityDiff[3] = (problem_.bboxMax() - globalPos4) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
gravityDiff[0] = (problem_.bBoxMax() - globalPos1) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
gravityDiff[1] = (problem_.bBoxMax() - globalPos2) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
gravityDiff[2] = (problem_.bBoxMax() - globalPos3) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
gravityDiff[3] = (problem_.bBoxMax() - globalPos4) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
pc += gravityDiff;
......@@ -1787,7 +1787,7 @@ void FVMPFAL2PFABoundPressure2P<TypeTag>::assemble()
Scalar pc = cellData.capillaryPressure();
Scalar gravityDiff = (problem_.bboxMax() - globalPos) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
Scalar gravityDiff = (problem_.bBoxMax() - globalPos) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
pc += gravityDiff; //minus because of gravity definition!
......@@ -1841,7 +1841,7 @@ void FVMPFAL2PFABoundPressure2P<TypeTag>::assemble()
Scalar pcBound = MaterialLaw::pc(
problem_.spatialParams().materialLawParams(*elementPointer), satWBound);
Scalar gravityDiffBound = (problem_.bboxMax() - globalPosFace) * gravity_
Scalar gravityDiffBound = (problem_.bBoxMax() - globalPosFace) * gravity_
* (density_[nPhaseIdx] - density_[wPhaseIdx]);
pcBound += gravityDiffBound;
......@@ -1855,7 +1855,7 @@ void FVMPFAL2PFABoundPressure2P<TypeTag>::assemble()
lambdaBound[nPhaseIdx] /= viscosity_[nPhaseIdx];
Scalar potentialBound = interactionVolume.getDirichletValues(intVolFaceIdx)[pressureIdx];
Scalar gdeltaZ = (problem_.bboxMax()-globalPosFace) * gravity_;
Scalar gdeltaZ = (problem_.bBoxMax()-globalPosFace) * gravity_;
//calculate potential gradients
Scalar potentialW = 0;
......
......@@ -92,12 +92,12 @@ class FVMPFAL2PFABoundPressure2PAdaptive: public FVPressure<TypeTag>
enum
{
pw = Indices::pressureW,
pn = Indices::pressureNW,
pn = Indices::pressureNw,
pglobal = Indices::pressureGlobal,
Sw = Indices::saturationW,
Sn = Indices::saturationNW,
Sn = Indices::saturationNw,
vw = Indices::velocityW,
vn = Indices::velocityNW,
vn = Indices::velocityNw,
vt = Indices::velocityTotal
};
enum
......@@ -248,7 +248,7 @@ public:
{
Scalar potW = this->pressure()[globalIdx];
Scalar potPc = cellData.capillaryPressure()
+ (problem_.bboxMax() - globalPos) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
+ (problem_.bBoxMax() - globalPos) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
cellData.setPressure(wPhaseIdx, potW);
cellData.setPressure(nPhaseIdx, potW + potPc);
......@@ -259,7 +259,7 @@ public:
{
Scalar potNW = this->pressure()[globalIdx];
Scalar potPc = cellData.capillaryPressure()
+ (problem_.bboxMax() - globalPos) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
+ (problem_.bBoxMax() - globalPos) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
cellData.setPressure(nPhaseIdx, potNW);
cellData.setPressure(wPhaseIdx, potNW - potPc);
......@@ -385,7 +385,7 @@ public:
if (pressureType_ == pw)
{
(*pressure)[idx] = this->pressure()[idx][0]
- density_[wPhaseIdx] * (gravity_ * (problem_.bboxMax() - eIt->geometry().center()));
- density_[wPhaseIdx] * (gravity_ * (problem_.bBoxMax() - eIt->geometry().center()));
(*potentialSecond)[idx] = cellData.pressure(nPhaseIdx);
(*pressureSecond)[idx] = (*pressure)[idx] + cellData.capillaryPressure();
}
......@@ -393,7 +393,7 @@ public:
if (pressureType_ == pn)
{
(*pressure)[idx] = this->pressure()[idx][0]
- density_[nPhaseIdx] * (gravity_ * (problem_.bboxMax() - eIt->geometry().center()));
- density_[nPhaseIdx] * (gravity_ * (problem_.bBoxMax() - eIt->geometry().center()));
(*potentialSecond)[idx] = cellData.pressure(wPhaseIdx);
(*pressureSecond)[idx] = (*pressure)[idx] - cellData.capillaryPressure();
}
......@@ -1990,10 +1990,10 @@ void FVMPFAL2PFABoundPressure2PAdaptive<TypeTag>::assemble()
Dune::FieldVector<Scalar, 2 * dim> gravityDiff(0);
gravityDiff[0] = (problem_.bboxMax() - globalPos1) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
gravityDiff[1] = (problem_.bboxMax() - globalPos2) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
gravityDiff[2] = (problem_.bboxMax() - globalPos3) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
gravityDiff[3] = (problem_.bboxMax() - globalPos4) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
gravityDiff[0] = (problem_.bBoxMax() - globalPos1) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
gravityDiff[1] = (problem_.bBoxMax() - globalPos2) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
gravityDiff[2] = (problem_.bBoxMax() - globalPos3) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
gravityDiff[3] = (problem_.bBoxMax() - globalPos4) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
pc += gravityDiff;
......@@ -2352,9 +2352,9 @@ void FVMPFAL2PFABoundPressure2PAdaptive<TypeTag>::assemble()
Dune::FieldVector<Scalar, 3> gravityDiff(0);
gravityDiff[0] = (problem_.bboxMax() - globalPos1) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
gravityDiff[1] = (problem_.bboxMax() - globalPos2) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
gravityDiff[2] = (problem_.bboxMax() - globalPos4) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
gravityDiff[0] = (problem_.bBoxMax() - globalPos1) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
gravityDiff[1] = (problem_.bBoxMax() - globalPos2) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
gravityDiff[2] = (problem_.bBoxMax() - globalPos4) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
pc += gravityDiff;
......@@ -2601,7 +2601,7 @@ void FVMPFAL2PFABoundPressure2PAdaptive<TypeTag>::assemble()
Scalar pc = cellData.capillaryPressure();
Scalar gravityDiff = (problem_.bboxMax() - globalPos) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
Scalar gravityDiff = (problem_.bBoxMax() - globalPos) * gravity_ * (density_[nPhaseIdx] - density_[wPhaseIdx]);
pc += gravityDiff; //minus because of gravity definition!
......@@ -2655,7 +2655,7 @@ void FVMPFAL2PFABoundPressure2PAdaptive<TypeTag>::assemble()
Scalar pcBound = MaterialLaw::pc(
problem_.spatialParams().materialLawParams(*elementPointer), satWBound);
Scalar gravityDiffBound = (problem_.bboxMax() - globalPosFace) * gravity_
Scalar gravityDiffBound = (problem_.bBoxMax() - globalPosFace) * gravity_
* (density_[nPhaseIdx] - density_[wPhaseIdx]);
pcBound += gravityDiffBound;
......@@ -2669,7 +2669,7 @@ void FVMPFAL2PFABoundPressure2PAdaptive<TypeTag>::assemble()
lambdaBound[nPhaseIdx] /= viscosity_[nPhaseIdx];
Scalar potentialBound = interactionVolume.getDirichletValues(intVolFaceIdx)[pressureIdx];
Scalar gdeltaZ = (problem_.bboxMax()-globalPosFace) * gravity_;
Scalar gdeltaZ = (problem_.bBoxMax()-globalPosFace) * gravity_;
//calculate potential gradients
Scalar potentialW = 0;
......
......@@ -93,12 +93,12 @@ template<class TypeTag> class FVMPFAL2PFABoundVelocity2P: public FVMPFAL2PFABoun
enum
{
pw = Indices::pressureW,
pn = Indices::pressureNW,
pn = Indices::pressureNw,
pglobal = Indices::pressureGlobal,
Sw = Indices::saturationW,
Sn = Indices::saturationNW,
Sn = Indices::saturationNw,
vw = Indices::velocityW,
vn = Indices::velocityNW,
vn = Indices::velocityNw,
vt = Indices::velocityTotal
};
enum
......@@ -796,7 +796,7 @@ void FVMPFAL2PFABoundVelocity2P<TypeTag>::calculateVelocity()
Scalar pcBound = MaterialLaw::pc(
problem_.spatialParams().materialLawParams(*elementPointer), satWBound);
Scalar gravityDiffBound = (problem_.bboxMax() - globalPosFace) * problem_.gravity()
Scalar gravityDiffBound = (problem_.bBoxMax() - globalPosFace) * problem_.gravity()
* (density_[nPhaseIdx] - density_[wPhaseIdx]);
pcBound += gravityDiffBound;
......@@ -809,7 +809,7 @@ void FVMPFAL2PFABoundVelocity2P<TypeTag>::calculateVelocity()
lambdaBound[wPhaseIdx] /= viscosity_[wPhaseIdx];
lambdaBound[nPhaseIdx] /= viscosity_[nPhaseIdx];
Scalar gdeltaZ = (problem_.bboxMax()-globalPosFace) * gravity_;
Scalar gdeltaZ = (problem_.bBoxMax()-globalPosFace) * gravity_;
Scalar potentialBoundW = interactionVolume.getDirichletValues(intVolFaceIdx)[pressureIdx] + density_[wPhaseIdx]*gdeltaZ;
Scalar potentialBoundNW = potentialBoundW;
......
......@@ -95,12 +95,12 @@ template<class TypeTag> class FVMPFAL2PFABoundVelocity2PAdaptive: public FVMPFAL
enum
{
pw = Indices::pressureW,
pn = Indices::pressureNW,
pn = Indices::pressureNw,
pglobal = Indices::pressureGlobal,
Sw = Indices::saturationW,
Sn = Indices::saturationNW,
Sn = Indices::saturationNw,
vw = Indices::velocityW,
vn = Indices::velocityNW,
vn = Indices::velocityNw,
vt = Indices::velocityTotal
};
enum
......@@ -1139,7 +1139,7 @@ void FVMPFAL2PFABoundVelocity2PAdaptive<TypeTag>::calculateVelocity()
Scalar pcBound = MaterialLaw::pc(
problem_.spatialParams().materialLawParams(*elementPointer), satWBound);
Scalar gravityDiffBound = (problem_.bboxMax() - globalPosFace) * problem_.gravity()
Scalar gravityDiffBound = (problem_.bBoxMax() - globalPosFace) * problem_.gravity()
* (density_[nPhaseIdx] - density_[wPhaseIdx]);
pcBound += gravityDiffBound;
......@@ -1152,7 +1152,7 @@ void FVMPFAL2PFABoundVelocity2PAdaptive<TypeTag>::calculateVelocity()
lambdaBound[wPhaseIdx] /= viscosity_[wPhaseIdx];
lambdaBound[nPhaseIdx] /= viscosity_[nPhaseIdx];
Scalar gdeltaZ = (problem_.bboxMax()-globalPosFace) * gravity_;
Scalar gdeltaZ = (problem_.bBoxMax()-globalPosFace) * gravity_;
Scalar potentialBoundW = interactionVolume.getDirichletValues(intVolFaceIdx)[pressureIdx] + density_[wPhaseIdx]*gdeltaZ;
Scalar potentialBoundNW = potentialBoundW;
......
......@@ -88,12 +88,12 @@ class FVMPFAO2PFABoundPressure2P: public FVPressure<TypeTag>
enum
{
pw = Indices::pressureW,
pn = Indices::pressureNW,
pn = Indices::pressureNw,
pglobal = Indices::pressureGlobal,
Sw = Indices::saturationW,
Sn = Indices::saturationNW,
Sn = Indices::saturationNw,
vw = Indices::velocityW,
vn = Indices::velocityNW,
vn = Indices::velocityNw,
vt = Indices::velocityTotal
};
enum
......@@ -269,7 +269,7 @@ public:
{
Scalar potW = this->pressure()[globalIdx];
Scalar potPc = cellData.capillaryPressure()