From 1cd48757c3e0ef45d59c8cffadde753822cf05e6 Mon Sep 17 00:00:00 2001
From: Klaus Mosthaf <klmos@env.dtu.dk>
Date: Thu, 10 May 2012 09:19:55 +0000
Subject: [PATCH] further adaptation of the indices
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8286 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/boxmodels/2p2c/2p2cindices.hh | 6 ++++--
dumux/boxmodels/2p2c/2p2clocalresidual.hh | 12 ++++++------
dumux/boxmodels/2p2c/2p2cmodel.hh | 12 ++++++------
3 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/dumux/boxmodels/2p2c/2p2cindices.hh b/dumux/boxmodels/2p2c/2p2cindices.hh
index 87a6588684..027d758ccb 100644
--- a/dumux/boxmodels/2p2c/2p2cindices.hh
+++ b/dumux/boxmodels/2p2c/2p2cindices.hh
@@ -151,8 +151,10 @@ public:
// Equation indices
static const int conti0EqIdx = PVOffset; //!< Index of the mass conservation equation for the first component
- static const int DUMUX_DEPRECATED_MSG("use conti0EqIdx + componentIdx instead") contiLEqIdx = conti0EqIdx + wCompIdx; //!< Index of the mass conservation equation for the liquid's primary component
- static const int DUMUX_DEPRECATED_MSG("use conti0EqIdx + componentIdx instead") contiGEqIdx = conti0EqIdx + nCompIdx; //!< Index of the mass conservation equation for the gas' primary component
+ static const int contiWEqIdx = conti0EqIdx + wCompIdx; //!< Index of the mass conservation equation for the liquid's primary component
+ static const int contiNEqIdx = conti0EqIdx + nCompIdx; //!< Index of the mass conservation equation for the gas' primary component
+ static const int DUMUX_DEPRECATED_MSG("use contiWEqIdx instead") contiLEqIdx = contiWEqIdx; //!< Index of the mass conservation equation for the liquid's primary component
+ static const int DUMUX_DEPRECATED_MSG("use contiNEqIdx instead") contiGEqIdx = contiNEqIdx; //!< Index of the mass conservation equation for the gas' primary component
};
// \}
diff --git a/dumux/boxmodels/2p2c/2p2clocalresidual.hh b/dumux/boxmodels/2p2c/2p2clocalresidual.hh
index 959b25d509..2596a573b7 100644
--- a/dumux/boxmodels/2p2c/2p2clocalresidual.hh
+++ b/dumux/boxmodels/2p2c/2p2clocalresidual.hh
@@ -78,12 +78,12 @@ class TwoPTwoCLocalResidual: public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum
{
- contiWEqIdx = Indices::contiLEqIdx,
- contiNEqIdx = Indices::contiGEqIdx,
- wPhaseIdx = Indices::lPhaseIdx,
- nPhaseIdx = Indices::gPhaseIdx,
- wCompIdx = Indices::lCompIdx,
- nCompIdx = Indices::gCompIdx
+ contiWEqIdx = Indices::contiWEqIdx,
+ contiNEqIdx = Indices::contiNEqIdx,
+ wPhaseIdx = Indices::wPhaseIdx,
+ nPhaseIdx = Indices::nPhaseIdx,
+ wCompIdx = Indices::wCompIdx,
+ nCompIdx = Indices::nCompIdx
};
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
diff --git a/dumux/boxmodels/2p2c/2p2cmodel.hh b/dumux/boxmodels/2p2c/2p2cmodel.hh
index 8f57fedb1a..d26d879ad4 100644
--- a/dumux/boxmodels/2p2c/2p2cmodel.hh
+++ b/dumux/boxmodels/2p2c/2p2cmodel.hh
@@ -109,13 +109,13 @@ class TwoPTwoCModel: public GET_PROP_TYPE(TypeTag, BaseModel)
pressureIdx = Indices::pressureIdx,
switchIdx = Indices::switchIdx,
- wPhaseIdx = Indices::lPhaseIdx,
- nPhaseIdx = Indices::gPhaseIdx,
- wCompIdx = Indices::lCompIdx,
- nCompIdx = Indices::gCompIdx,
+ wPhaseIdx = Indices::wPhaseIdx,
+ nPhaseIdx = Indices::nPhaseIdx,
+ wCompIdx = Indices::wCompIdx,
+ nCompIdx = Indices::nCompIdx,
- wPhaseOnly = Indices::lPhaseOnly,
- nPhaseOnly = Indices::gPhaseOnly,
+ wPhaseOnly = Indices::wPhaseOnly,
+ nPhaseOnly = Indices::nPhaseOnly,
bothPhases = Indices::bothPhases,
pwSn = TwoPTwoCFormulation::pwSn,
--
GitLab