From 3547a30c0c15ae96e383d99b27f90c32e88a1bf7 Mon Sep 17 00:00:00 2001
From: Katherina Baber <katherina.baber@gmail.com>
Date: Thu, 10 May 2012 15:35:25 +0000
Subject: [PATCH] corrected, restructured enums
motivated by Christoph, but not reviewed as only minor change
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8299 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/boxmodels/1p/1plocalresidual.hh | 4 +++
dumux/boxmodels/1p2c/1p2clocalresidual.hh | 35 ++++++++++-----------
dumux/boxmodels/1p2c/1p2cvolumevariables.hh | 4 ++-
test/boxmodels/1p/1ptestproblem.hh | 4 +--
test/boxmodels/1p2c/1p2coutflowproblem.hh | 6 ++--
5 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/dumux/boxmodels/1p/1plocalresidual.hh b/dumux/boxmodels/1p/1plocalresidual.hh
index a29a479c28..57d1f1f9d8 100644
--- a/dumux/boxmodels/1p/1plocalresidual.hh
+++ b/dumux/boxmodels/1p/1plocalresidual.hh
@@ -59,8 +59,12 @@ class OnePLocalResidual : public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
typedef Dune::FieldVector<Scalar, dim> DimVector;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+ //index of the mass balance equation
enum {
conti0EqIdx = Indices::conti0EqIdx, //index for the mass balance
+ };
+ //index of the primary variable
+ enum{
pressureIdx = Indices::pressureIdx //index for the primary variable
};
diff --git a/dumux/boxmodels/1p2c/1p2clocalresidual.hh b/dumux/boxmodels/1p2c/1p2clocalresidual.hh
index 41fb6e0df2..a4f7a7b5b4 100644
--- a/dumux/boxmodels/1p2c/1p2clocalresidual.hh
+++ b/dumux/boxmodels/1p2c/1p2clocalresidual.hh
@@ -72,24 +72,23 @@ protected:
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- enum
- {
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
-
- //phase index
- phaseIdx = Indices::phaseIdx,
- comp1Idx = Indices::comp1Idx,
-
- // indices of the primary variables
- pressuerIdx = Indices::pressureIdx,
- transportCompIdx = Indices::transportCompIdx,
-
- // indices of the equations
- conti0EqIdx = Indices::conti0EqIdx,
- contiEqIdx = conti0EqIdx, // \deprecated use conti0EqIdx
- transportEqIdx = Indices::transportEqIdx,
- transEqIdx = transportEqIdx // \deprecated use transportEqIdx
- };
+ enum {
+ numEq = GET_PROP_VALUE(TypeTag, NumEq),
+
+ //phase index
+ phaseIdx = Indices::phaseIdx,
+ comp1Idx = Indices::comp1Idx,
+ };
+ // indices of the primary variables
+ enum {
+ pressuerIdx = Indices::pressureIdx,
+ transportCompIdx = Indices::transportCompIdx,
+ };
+ // indices of the equations
+ enum {
+ conti0EqIdx = Indices::conti0EqIdx,
+ transportEqIdx = Indices::transportEqIdx
+ };
//! property that defines whether mole or mass fractions are used
static const bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
diff --git a/dumux/boxmodels/1p2c/1p2cvolumevariables.hh b/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
index 8373cd093d..fb67a8ff46 100644
--- a/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
+++ b/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
@@ -60,7 +60,9 @@ class OnePTwoCVolumeVariables : public BoxVolumeVariables<TypeTag>
phaseIdx = Indices::phaseIdx,
comp0Idx = Indices::comp0Idx,
comp1Idx = Indices::comp1Idx,
-
+ };
+ //indices of primary variables
+ enum{
pressureIdx = Indices::pressureIdx,
transportCompIdx = Indices::transportCompIdx
};
diff --git a/test/boxmodels/1p/1ptestproblem.hh b/test/boxmodels/1p/1ptestproblem.hh
index 82781ed376..c624b318ab 100644
--- a/test/boxmodels/1p/1ptestproblem.hh
+++ b/test/boxmodels/1p/1ptestproblem.hh
@@ -125,13 +125,13 @@ class OnePTestProblem : public PorousMediaBoxProblem<TypeTag>
// Grid and world dimension
dim = GridView::dimension,
dimWorld = GridView::dimensionworld,
-
+ };
+ enum {
// indices of the primary variables
conti0EqIdx = Indices::conti0EqIdx,
pressureIdx = Indices::pressureIdx
};
-
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
diff --git a/test/boxmodels/1p2c/1p2coutflowproblem.hh b/test/boxmodels/1p2c/1p2coutflowproblem.hh
index 121a7a6bef..f7f5346406 100644
--- a/test/boxmodels/1p2c/1p2coutflowproblem.hh
+++ b/test/boxmodels/1p2c/1p2coutflowproblem.hh
@@ -132,11 +132,13 @@ class OnePTwoCOutflowProblem : public PorousMediaBoxProblem<TypeTag>
// Grid and world dimension
dim = GridView::dimension,
dimWorld = GridView::dimensionworld,
-
+ };
+ enum {
// indices of the primary variables
pressureIdx = Indices::pressureIdx,
transportCompIdx = Indices::transportCompIdx,
-
+ };
+ enum {
// indices of the equations
conti0EqIdx = Indices::conti0EqIdx,
transportEqIdx = Indices::transportEqIdx
--
GitLab