From 90195d45bd34bd5bf56c2a6eb63e5f380629eda7 Mon Sep 17 00:00:00 2001
From: Markus Wolff <markus.wolff@twt-gmbh.de>
Date: Fri, 17 May 2013 14:28:11 +0000
Subject: [PATCH] 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
---
dumux/decoupled/1p/1pindices.hh | 2 +-
dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh | 2 +-
dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh | 2 +-
dumux/decoupled/2p/2pindices.hh | 12 ++++++------
dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh | 2 +-
.../2p/diffusion/fv/fvpressure2padaptive.hh | 2 +-
dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh | 2 +-
.../2p/diffusion/fv/fvvelocity2padaptive.hh | 2 +-
.../fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh | 2 +-
.../lmethod/fvmpfal2pfaboundpressure2padaptive.hh | 2 +-
.../fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh | 2 +-
.../lmethod/fvmpfal2pfaboundvelocity2padaptive.hh | 2 +-
.../fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh | 2 +-
.../fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh | 2 +-
.../2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh | 2 +-
.../2p/diffusion/fvmpfa/omethod/fvmpfaovelocity2p.hh | 2 +-
.../2p/diffusion/mimetic/mimeticgroundwater.hh | 2 +-
.../decoupled/2p/transport/fv/capillarydiffusion.hh | 2 +-
dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh | 2 +-
.../decoupled/2p/transport/fv/evalcflfluxdefault.hh | 2 ++
dumux/decoupled/2p/transport/fv/fvsaturation2p.hh | 2 +-
dumux/decoupled/2p2c/2p2cadaptiveproperties.hh | 2 +-
dumux/decoupled/common/fv/fvpressure.hh | 2 +-
23 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/dumux/decoupled/1p/1pindices.hh b/dumux/decoupled/1p/1pindices.hh
index 70ece1d30c..c2bca67130 100644
--- a/dumux/decoupled/1p/1pindices.hh
+++ b/dumux/decoupled/1p/1pindices.hh
@@ -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
};
// \}
diff --git a/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh b/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh
index 387ab73931..01e6f25381 100644
--- a/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh
+++ b/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh
@@ -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
diff --git a/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh b/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
index 8fe94ba7b3..94ee1dd09a 100644
--- a/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
+++ b/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
@@ -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;
diff --git a/dumux/decoupled/2p/2pindices.hh b/dumux/decoupled/2p/2pindices.hh
index e259c9cc1b..699f1d5f4f 100644
--- a/dumux/decoupled/2p/2pindices.hh
+++ b/dumux/decoupled/2p/2pindices.hh
@@ -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
};
diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
index 80a1cadea7..1b6deab794 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
@@ -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
diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
index f50ff294ac..a8d1fbfbec 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
@@ -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
diff --git a/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh b/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
index cfbd8224ae..bfd1fb4020 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
@@ -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
diff --git a/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
index c4a138d843..0b0589d000 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
@@ -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
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh
index 8a208a4fb2..7d69164c47 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh
@@ -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)
};
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2padaptive.hh
index 68bd72bbd5..1e87f12b7f 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2padaptive.hh
@@ -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)
};
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh
index 4fde768b13..621f1869cd 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh
@@ -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)
};
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh
index 7311eb4e8a..35737cdf94 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh
@@ -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)
};
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh
index 9d3c5e3e58..b9bd61d17c 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh
@@ -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)
};
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh
index 10162ec9e8..8377c781a1 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh
@@ -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)
};
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh
index ae1a034f00..7fa0459b6b 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh
@@ -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)
};
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaovelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaovelocity2p.hh
index 10cf72303f..7d9f1ec603 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaovelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaovelocity2p.hh
@@ -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)
};
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
index aa347cfbe5..4555f69e0a 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
@@ -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)
};
diff --git a/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh b/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh
index 9fc6bcedf5..3ac486d0f5 100644
--- a/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh
+++ b/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh
@@ -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;
diff --git a/dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh b/dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh
index 62e6e81f64..aa959e4b24 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflfluxcoats.hh
@@ -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)
};
diff --git a/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh b/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh
index 78acf75475..195c3ee423 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh
@@ -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);
};
diff --git a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
index a6d501677f..1105a31b03 100644
--- a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
+++ b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
@@ -111,7 +111,7 @@ class FVSaturation2P: public FVTransport<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)
};
diff --git a/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh b/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh
index c9ef8a0c33..1b440752d5 100644
--- a/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh
+++ b/dumux/decoupled/2p2c/2p2cadaptiveproperties.hh
@@ -96,7 +96,7 @@ struct DecoupledTwoPTwoCIndicesAdaptive : public DecoupledTwoPTwoCIndices<TypeTa
{
static const int pressureIdx = 0;
static const int saturationIdx = 0;
- static const int pressEqIdx = 0;
+ static const int pressureEqIdx = 0;
static const int satEqIdx = 0;
};
diff --git a/dumux/decoupled/common/fv/fvpressure.hh b/dumux/decoupled/common/fv/fvpressure.hh
index cfa465d8e5..d3948660b1 100644
--- a/dumux/decoupled/common/fv/fvpressure.hh
+++ b/dumux/decoupled/common/fv/fvpressure.hh
@@ -92,7 +92,7 @@ protected:
enum
{
- pressEqIdx = Indices::pressEqIdx,
+ pressEqIdx = Indices::pressureEqIdx,
};
//!Initialize the global matrix of the system of equations to solve
--
GitLab