Commit 90195d45 authored by Markus Wolff's avatar Markus Wolff
Browse files

Changed pressEqIdx in the 2pIndices to pressureEqIdx to be consistent

with the 2p2c models



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10698 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 39d07bae
......@@ -38,7 +38,7 @@ namespace Dumux
struct DecoupledOnePCommonIndices
{
// Formulations
static const int pressEqIdx = 0;//!< Index of the pressure equation
static const int pressureEqIdx = 0;//!< Index of the pressure equation
};
// \}
......
......@@ -77,7 +77,7 @@ template<class TypeTag> class FVPressure1P: public FVPressure<TypeTag>
enum
{
pressEqIdx = Indices::pressEqIdx // only one equation!
pressEqIdx = Indices::pressureEqIdx // only one equation!
};
enum
......
......@@ -72,7 +72,7 @@ typedef typename GridView::IntersectionIterator IntersectionIterator;
enum
{
pressEqIdx = Indices::pressEqIdx // only one equation!
pressEqIdx = Indices::pressureEqIdx // only one equation!
};
typedef Dune::FieldVector<Scalar,dimWorld> GlobalPosition;
......
......@@ -92,7 +92,7 @@ struct DecoupledTwoPIndices : public DecoupledTwoPCommonIndices
// indices of the equations
static const int contiWEqIdx = PVOffset + 0; //!< Index of the continuity equation of the wetting phase
static const int pressEqIdx = contiWEqIdx; //!< Index of the pressure equation (total mass balance)
static const int pressureEqIdx = contiWEqIdx; //!< Index of the pressure equation (total mass balance)
static const int contiNEqIdx = PVOffset + 1; //!< Index of the continuity equation of the non-wetting phase
static const int satEqIdx = contiNEqIdx; //!< Index of the continuity equation of the non-wetting phase (saturation equation)
static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
......@@ -126,7 +126,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnSw, PVOffset>
// indices of the equations
static const int contiNEqIdx = PVOffset + 0; //!< Index of the continuity equation of the non-wetting phase
static const int pressEqIdx = contiNEqIdx; //!< Index of the pressure equation (total mass balance)
static const int pressureEqIdx = contiNEqIdx; //!< Index of the pressure equation (total mass balance)
static const int contiWEqIdx = PVOffset + 1; //!< Index of the continuity equation of the wetting phase
static const int satEqIdx = contiWEqIdx; //!< Index of the continuity equation of the non-wetting phase (saturation equation)
static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
......@@ -162,7 +162,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pwSw, PVOffset>
// indices of the equations
static const int contiWEqIdx = PVOffset + 0; //!< Index of the continuity equation of the wetting phase
static const int pressEqIdx = contiWEqIdx; //!< Index of the pressure equation (total mass balance)
static const int pressureEqIdx = contiWEqIdx; //!< Index of the pressure equation (total mass balance)
static const int contiNEqIdx = PVOffset + 1; //!< Index of the continuity equation of the non-wetting phase
static const int satEqIdx = contiNEqIdx; //!< Index of the continuity equation of the non-wetting phase (saturation equation)
static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
......@@ -196,7 +196,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnSn, PVOffset>
// indices of the equations
static const int contiNEqIdx = PVOffset + 0; //!< Index of the continuity equation of the non-wetting phase
static const int pressEqIdx = contiNEqIdx; //!< Index of the pressure equation (total mass balance)
static const int pressureEqIdx = contiNEqIdx; //!< Index of the pressure equation (total mass balance)
static const int contiWEqIdx = PVOffset + 1; //!< Index of the continuity equation of the wetting phase
static const int satEqIdx = contiWEqIdx; //!< Index of the continuity equation of the non-wetting phase (saturation equation)
static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
......@@ -230,7 +230,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pGlobalSw, PVOffset> : p
//! \endcond
// indices of the equations
static const int pressEqIdx = PVOffset + 0; //!< Index of the pressure equation (total mass balance)
static const int pressureEqIdx = PVOffset + 0; //!< Index of the pressure equation (total mass balance)
static const int satEqIdx = PVOffset + 1; //!< Index of the continuity equation of the non-wetting phase (saturation equation)
static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
};
......@@ -262,7 +262,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pGlobalSn, PVOffset>
//! \endcond
// indices of the equations
static const int pressEqIdx = PVOffset + 0; //!< Index of the pressure equation (total mass balance)
static const int pressureEqIdx = PVOffset + 0; //!< Index of the pressure equation (total mass balance)
static const int satEqIdx = PVOffset + 1; //!< Index of the continuity equation of the non-wetting phase (saturation equation)
static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
};
......
......@@ -119,7 +119,7 @@ template<class TypeTag> class FVPressure2P: public FVPressure<TypeTag>
Sn = Indices::saturationNW,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
eqIdxPress = Indices::pressEqIdx,
eqIdxPress = Indices::pressureEqIdx,
eqIdxSat = Indices::satEqIdx
};
enum
......
......@@ -72,7 +72,7 @@ template<class TypeTag> class FVPressure2PAdaptive: public FVPressure2P<TypeTag>
Sn = Indices::saturationNW,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
eqIdxPress = Indices::pressEqIdx,
eqIdxPress = Indices::pressureEqIdx,
eqIdxSat = Indices::satEqIdx
};
enum
......
......@@ -95,7 +95,7 @@ class FVVelocity2P
Sn = Indices::saturationNW,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
eqIdxPress = Indices::pressEqIdx,
eqIdxPress = Indices::pressureEqIdx,
eqIdxSat = Indices::satEqIdx
};
enum
......
......@@ -81,7 +81,7 @@ typedef typename GridView::Traits::template Codim<0>::Entity Element;
Sn = Indices::saturationNW,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
eqIdxPress = Indices::pressEqIdx,
eqIdxPress = Indices::pressureEqIdx,
eqIdxSat = Indices::satEqIdx
};
enum
......
......@@ -104,7 +104,7 @@ class FVMPFAL2PFABoundPressure2P: public FVPressure<TypeTag>
nPhaseIdx = Indices::nPhaseIdx,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
pressEqIdx = Indices::pressEqIdx,
pressEqIdx = Indices::pressureEqIdx,
satEqIdx = Indices::satEqIdx,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
......
......@@ -106,7 +106,7 @@ class FVMPFAL2PFABoundPressure2PAdaptive: public FVPressure<TypeTag>
nPhaseIdx = Indices::nPhaseIdx,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
pressEqIdx = Indices::pressEqIdx,
pressEqIdx = Indices::pressureEqIdx,
satEqIdx = Indices::satEqIdx,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
......
......@@ -107,7 +107,7 @@ template<class TypeTag> class FVMPFAL2PFABoundVelocity2P: public FVMPFAL2PFABoun
nPhaseIdx = Indices::nPhaseIdx,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
pressEqIdx = Indices::pressEqIdx,
pressEqIdx = Indices::pressureEqIdx,
satEqIdx = Indices::satEqIdx,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
......
......@@ -109,7 +109,7 @@ template<class TypeTag> class FVMPFAL2PFABoundVelocity2PAdaptive: public FVMPFAL
nPhaseIdx = Indices::nPhaseIdx,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
pressEqIdx = Indices::pressEqIdx,
pressEqIdx = Indices::pressureEqIdx,
satEqIdx = Indices::satEqIdx,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
......
......@@ -102,7 +102,7 @@ class FVMPFAO2PFABoundPressure2P: public FVPressure<TypeTag>
nPhaseIdx = Indices::nPhaseIdx,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
pressEqIdx = Indices::pressEqIdx,
pressEqIdx = Indices::pressureEqIdx,
satEqIdx = Indices::satEqIdx,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
......
......@@ -107,7 +107,7 @@ template<class TypeTag> class FVMPFAO2PFABoundVelocity2P: public FVMPFAO2PFABoun
nPhaseIdx = Indices::nPhaseIdx,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
pressEqIdx = Indices::pressEqIdx,
pressEqIdx = Indices::pressureEqIdx,
satEqIdx = Indices::satEqIdx,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
......
......@@ -97,7 +97,7 @@ class FVMPFAOPressure2P: public FVPressure<TypeTag>
nPhaseIdx = Indices::nPhaseIdx,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
pressEqIdx = Indices::pressEqIdx,
pressEqIdx = Indices::pressureEqIdx,
satEqIdx = Indices::satEqIdx,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
......
......@@ -95,7 +95,7 @@ template<class TypeTag> class FVMPFAOVelocity2P:public FVMPFAOPressure2P<TypeTag
nPhaseIdx = Indices::nPhaseIdx,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
pressEqIdx = Indices::pressEqIdx,
pressEqIdx = Indices::pressureEqIdx,
satEqIdx = Indices::satEqIdx,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
......
......@@ -78,7 +78,7 @@ class MimeticGroundwaterEquationLocalStiffness: public LocalStiffness<TypeTag, 1
nPhaseIdx = Indices::nPhaseIdx,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
pressEqIdx = Indices::pressEqIdx,
pressEqIdx = Indices::pressureEqIdx,
satEqIdx = Indices::satEqIdx,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
......
......@@ -69,7 +69,7 @@ private:
enum
{
wPhaseIdx = Indices::wPhaseIdx, nPhaseIdx = Indices::nPhaseIdx,
pressEqIdx = Indices::pressEqIdx
pressEqIdx = Indices::pressureEqIdx
};
typedef typename GridView::Traits::template Codim<0>::Entity Element;
......
......@@ -60,7 +60,7 @@ private:
enum
{
wPhaseIdx = Indices::wPhaseIdx, nPhaseIdx = Indices::nPhaseIdx,
eqIdxPress = Indices::pressEqIdx,
eqIdxPress = Indices::pressureEqIdx,
eqIdxSat = Indices::satEqIdx,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
......
......@@ -126,6 +126,7 @@ public:
EvalCflFluxDefault (Problem& problem)
: problem_(problem)
{
porosityThreshold_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Impet, PorosityThreshold);
reset();
}
......@@ -222,6 +223,7 @@ private:
Scalar fluxNonwettingOut_;
Scalar fluxOut_;
Scalar fluxIn_;
Scalar porosityThreshold_;
static const int velocityType_ = GET_PROP_VALUE(TypeTag, VelocityFormulation);
static const int saturationType_ = GET_PROP_VALUE(TypeTag, SaturationFormulation);
};
......
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