Skip to content
Snippets Groups Projects
Commit a47bf862 authored by Markus Wolff's avatar Markus Wolff
Browse files

Included pressEqIdx again for 2p-IMPES models for backward 

compatibility. Will be removed after the next release.



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10702 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent b8ccfdda
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
dumux/decoupled/2p/2pindices.hh
+ 6
− 0
View file @ a47bf862
...@@ -93,6 +93,7 @@ struct DecoupledTwoPIndices : public DecoupledTwoPCommonIndices ...@@ -93,6 +93,7 @@ struct DecoupledTwoPIndices : public DecoupledTwoPCommonIndices
// indices of the equations // indices of the equations
static const int contiWEqIdx = PVOffset + 0; //!< Index of the continuity equation of the wetting phase static const int contiWEqIdx = PVOffset + 0; //!< Index of the continuity equation of the wetting phase
static const int pressureEqIdx = 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 pressEqIdx = pressureEqIdx; //!< !!!! DEPRECATED: Use pressureEqIdx instead!!!!
static const int contiNEqIdx = PVOffset + 1; //!< Index of the continuity equation of the non-wetting phase 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 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 static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
...@@ -127,6 +128,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnSw, PVOffset> ...@@ -127,6 +128,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnSw, PVOffset>
// indices of the equations // indices of the equations
static const int contiNEqIdx = PVOffset + 0; //!< Index of the continuity equation of the non-wetting phase static const int contiNEqIdx = PVOffset + 0; //!< Index of the continuity equation of the non-wetting phase
static const int pressureEqIdx = 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 pressEqIdx = pressureEqIdx; //!< !!!! DEPRECATED: Use pressureEqIdx instead!!!!
static const int contiWEqIdx = PVOffset + 1; //!< Index of the continuity equation of the wetting phase 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 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 static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
...@@ -163,6 +165,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pwSw, PVOffset> ...@@ -163,6 +165,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pwSw, PVOffset>
// indices of the equations // indices of the equations
static const int contiWEqIdx = PVOffset + 0; //!< Index of the continuity equation of the wetting phase static const int contiWEqIdx = PVOffset + 0; //!< Index of the continuity equation of the wetting phase
static const int pressureEqIdx = 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 pressEqIdx = pressureEqIdx; //!< !!!! DEPRECATED: Use pressureEqIdx instead!!!!
static const int contiNEqIdx = PVOffset + 1; //!< Index of the continuity equation of the non-wetting phase 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 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 static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
...@@ -197,6 +200,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnSn, PVOffset> ...@@ -197,6 +200,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pnSn, PVOffset>
// indices of the equations // indices of the equations
static const int contiNEqIdx = PVOffset + 0; //!< Index of the continuity equation of the non-wetting phase static const int contiNEqIdx = PVOffset + 0; //!< Index of the continuity equation of the non-wetting phase
static const int pressureEqIdx = 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 pressEqIdx = pressureEqIdx; //!< !!!! DEPRECATED: Use pressureEqIdx instead!!!!
static const int contiWEqIdx = PVOffset + 1; //!< Index of the continuity equation of the wetting phase 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 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 static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
...@@ -231,6 +235,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pGlobalSw, PVOffset> : p ...@@ -231,6 +235,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pGlobalSw, PVOffset> : p
// indices of the equations // indices of the equations
static const int pressureEqIdx = 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 pressEqIdx = pressureEqIdx; //!< !!!! DEPRECATED: Use pressureEqIdx instead!!!!
static const int satEqIdx = PVOffset + 1; //!< Index of the continuity equation of the non-wetting phase (saturation equation) 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 static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
}; };
...@@ -263,6 +268,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pGlobalSn, PVOffset> ...@@ -263,6 +268,7 @@ struct DecoupledTwoPIndices<DecoupledTwoPCommonIndices::pGlobalSn, PVOffset>
// indices of the equations // indices of the equations
static const int pressureEqIdx = 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 pressEqIdx = pressureEqIdx; //!< !!!! DEPRECATED: Use pressureEqIdx instead!!!!
static const int satEqIdx = PVOffset + 1; //!< Index of the continuity equation of the non-wetting phase (saturation equation) 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 static const int transportEqIdx = satEqIdx; //!< Index of the saturation transport equation
}; };
......
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