From f2ce87c36e535d701e26b00d5480c58e514c3376 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Thu, 29 Aug 2013 11:57:45 +0000
Subject: [PATCH] remove unused private enums from dumux/implicit and
test/implicit
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11296 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/implicit/1p/1plocalresidual.hh | 5 -----
dumux/implicit/1p2c/1p2clocalresidual.hh | 7 -------
dumux/implicit/1p2c/1p2cmodel.hh | 3 +--
dumux/implicit/2p/2plocalresidual.hh | 1 -
dumux/implicit/2p/2pmodel.hh | 4 +---
dumux/implicit/2p2c/2p2clocalresidual.hh | 1 -
dumux/implicit/2p2c/2p2cmodel.hh | 1 -
dumux/implicit/2pdfm/2pdfmfluxvariables.hh | 1 -
dumux/implicit/2pdfm/2pdfmvolumevariables.hh | 2 --
dumux/implicit/2pni/2pnilocalresidual.hh | 1 -
dumux/implicit/3p/3plocalresidual.hh | 8 +-------
dumux/implicit/3p/3pmodel.hh | 5 -----
dumux/implicit/3p3c/3p3cfluxvariables.hh | 1 -
dumux/implicit/3p3c/3p3cmodel.hh | 1 -
dumux/implicit/3p3cni/3p3cnifluxvariables.hh | 3 +--
dumux/implicit/cellcentered/ccassembler.hh | 1 -
dumux/implicit/cellcentered/ccelementboundarytypes.hh | 1 -
dumux/implicit/cellcentered/ccelementvolumevariables.hh | 3 ---
dumux/implicit/cellcentered/cclocalresidual.hh | 3 +--
dumux/implicit/co2/co2model.hh | 4 +---
dumux/implicit/common/implicitdarcyfluxvariables.hh | 1 -
dumux/implicit/mpnc/diffusion/diffusion.hh | 1 -
dumux/implicit/mpnc/energy/mpncfluxvariablesenergy.hh | 2 --
.../mpnc/energy/mpncfluxvariablesenergykinetic.hh | 2 --
dumux/implicit/mpnc/energy/mpnclocalresidualenergy.hh | 2 --
.../mpnc/energy/mpnclocalresidualenergykinetic.hh | 3 ---
dumux/implicit/mpnc/energy/mpncvolumevariablesenergy.hh | 1 -
.../mpnc/energy/mpncvolumevariablesenergykinetic.hh | 3 ---
dumux/implicit/mpnc/energy/mpncvtkwriterenergykinetic.hh | 1 -
dumux/implicit/mpnc/mass/mpnclocalresidualmass.hh | 1 -
dumux/implicit/mpnc/mass/mpnclocalresidualmasskinetic.hh | 2 --
.../implicit/mpnc/mass/mpncvolumevariablesmasskinetic.hh | 7 -------
dumux/implicit/mpnc/mpncfluxvariables.hh | 1 -
dumux/implicit/mpnc/mpncvolumevariables.hh | 4 ----
dumux/implicit/mpnc/mpncvolumevariablesiakinetic.hh | 1 -
dumux/implicit/richards/richardslocalresidual.hh | 1 -
test/implicit/1p2c/1p2coutflowproblem.hh | 6 ++----
test/implicit/1p2c/1p2coutflowspatialparams.hh | 4 ----
test/implicit/2p/lensproblem.hh | 3 +--
test/implicit/2p2c/injectionspatialparams.hh | 4 +---
test/implicit/2pdfm/2pdfmspatialparams.hh | 3 +--
test/implicit/2pdfm/2pdfmtestproblem.hh | 6 +-----
test/implicit/2pni/injectionproblem2pni.hh | 3 +--
test/implicit/3p/naplinfiltrationspatialparams.hh | 5 -----
test/implicit/3p3c/infiltrationspatialparameters.hh | 1 -
test/implicit/3p3cni/columnxylolspatialparams.hh | 1 -
test/implicit/co2/heterogeneousspatialparameters.hh | 5 +----
test/implicit/mpnc/evaporationatmosphereproblem.hh | 2 --
test/implicit/mpnc/evaporationatmospherespatialparams.hh | 2 --
test/implicit/mpnc/forchheimerspatialparams.hh | 1 -
test/implicit/mpnc/obstacleproblem.hh | 3 +--
test/implicit/mpnc/obstaclespatialparams.hh | 1 -
52 files changed, 15 insertions(+), 124 deletions(-)
diff --git a/dumux/implicit/1p/1plocalresidual.hh b/dumux/implicit/1p/1plocalresidual.hh
index 2c69d461aa..dc8a1feecd 100644
--- a/dumux/implicit/1p/1plocalresidual.hh
+++ b/dumux/implicit/1p/1plocalresidual.hh
@@ -47,17 +47,12 @@ class OnePLocalResidual : public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- enum { dim = GridView::dimension };
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
- };
public:
diff --git a/dumux/implicit/1p2c/1p2clocalresidual.hh b/dumux/implicit/1p2c/1p2clocalresidual.hh
index 0c94149510..4cf0c15b88 100644
--- a/dumux/implicit/1p2c/1p2clocalresidual.hh
+++ b/dumux/implicit/1p2c/1p2clocalresidual.hh
@@ -59,17 +59,10 @@ protected:
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum {
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
-
//phase index
phaseIdx = Indices::phaseIdx,
transportCompIdx = Indices::transportCompIdx
};
- // indices of the primary variables
- enum {
- pressuerIdx = Indices::pressureIdx,
- massOrMoleFracIdx = Indices::massOrMoleFracIdx
- };
// indices of the equations
enum {
conti0EqIdx = Indices::conti0EqIdx,
diff --git a/dumux/implicit/1p2c/1p2cmodel.hh b/dumux/implicit/1p2c/1p2cmodel.hh
index 550f81a98e..a2ef602e9b 100644
--- a/dumux/implicit/1p2c/1p2cmodel.hh
+++ b/dumux/implicit/1p2c/1p2cmodel.hh
@@ -78,8 +78,7 @@ class OnePTwoCModel : public GET_PROP_TYPE(TypeTag, BaseModel)
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
enum {
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
+ dim = GridView::dimension
};
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
diff --git a/dumux/implicit/2p/2plocalresidual.hh b/dumux/implicit/2p/2plocalresidual.hh
index 9a68cff55b..f6ab1237b2 100644
--- a/dumux/implicit/2p/2plocalresidual.hh
+++ b/dumux/implicit/2p/2plocalresidual.hh
@@ -58,7 +58,6 @@ protected:
};
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- enum { dimWorld = GridView::dimensionworld };
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
diff --git a/dumux/implicit/2p/2pmodel.hh b/dumux/implicit/2p/2pmodel.hh
index 54ff869ac8..d288835f99 100644
--- a/dumux/implicit/2p/2pmodel.hh
+++ b/dumux/implicit/2p/2pmodel.hh
@@ -79,15 +79,13 @@ class TwoPModel : public GET_PROP_TYPE(TypeTag, BaseModel)
enum {
nPhaseIdx = Indices::nPhaseIdx,
wPhaseIdx = Indices::wPhaseIdx,
- pressureIdx = Indices::pressureIdx,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
enum {
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
+ dim = GridView::dimension
};
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
diff --git a/dumux/implicit/2p2c/2p2clocalresidual.hh b/dumux/implicit/2p2c/2p2clocalresidual.hh
index 7e26c8a197..08f1101126 100644
--- a/dumux/implicit/2p2c/2p2clocalresidual.hh
+++ b/dumux/implicit/2p2c/2p2clocalresidual.hh
@@ -53,7 +53,6 @@ class TwoPTwoCLocalResidual: public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
enum
{
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
numComponents = GET_PROP_VALUE(TypeTag, NumComponents)
};
diff --git a/dumux/implicit/2p2c/2p2cmodel.hh b/dumux/implicit/2p2c/2p2cmodel.hh
index 8c558fff1c..ee551eaa7a 100644
--- a/dumux/implicit/2p2c/2p2cmodel.hh
+++ b/dumux/implicit/2p2c/2p2cmodel.hh
@@ -103,7 +103,6 @@ class TwoPTwoCModel: public GET_PROP_TYPE(TypeTag, BaseModel)
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum {
- pressureIdx = Indices::pressureIdx,
switchIdx = Indices::switchIdx,
wPhaseIdx = Indices::wPhaseIdx,
diff --git a/dumux/implicit/2pdfm/2pdfmfluxvariables.hh b/dumux/implicit/2pdfm/2pdfmfluxvariables.hh
index 49255bfca9..714a88056e 100644
--- a/dumux/implicit/2pdfm/2pdfmfluxvariables.hh
+++ b/dumux/implicit/2pdfm/2pdfmfluxvariables.hh
@@ -52,7 +52,6 @@ class TwoPDFMFluxVariables : public ImplicitDarcyFluxVariables<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
enum {
- dim = GridView::dimension,
dimWorld = GridView::dimensionworld,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
diff --git a/dumux/implicit/2pdfm/2pdfmvolumevariables.hh b/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
index ae1a0423e6..43c15d7322 100644
--- a/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
+++ b/dumux/implicit/2pdfm/2pdfmvolumevariables.hh
@@ -54,8 +54,6 @@ class TwoPDFMVolumeVariables : public TwoPVolumeVariables<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum {
- pwsn = Indices::pwsn,
- pnsw = Indices::pnsw,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
wPhaseIdx = Indices::wPhaseIdx,
diff --git a/dumux/implicit/2pni/2pnilocalresidual.hh b/dumux/implicit/2pni/2pnilocalresidual.hh
index dffc861362..e8698ff266 100644
--- a/dumux/implicit/2pni/2pnilocalresidual.hh
+++ b/dumux/implicit/2pni/2pnilocalresidual.hh
@@ -58,7 +58,6 @@ class TwoPNILocalResidual : public TwoPLocalResidual<TypeTag>
};
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- enum { dimWorld = GridView::dimensionworld };
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
diff --git a/dumux/implicit/3p/3plocalresidual.hh b/dumux/implicit/3p/3plocalresidual.hh
index bb6d42324d..b96a374b0b 100644
--- a/dumux/implicit/3p/3plocalresidual.hh
+++ b/dumux/implicit/3p/3plocalresidual.hh
@@ -50,13 +50,7 @@ protected:
enum {
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
- conti0EqIdx = Indices::conti0EqIdx,//!< Index of the mass conservation equation for the water component
- conti1EqIdx = Indices::conti1EqIdx,//!< Index of the mass conservation equation for the contaminant component
- conti2EqIdx = Indices::conti2EqIdx,//!< Index of the mass conservation equation for the gas component
-
- wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx,
- gPhaseIdx = Indices::gPhaseIdx,
+ conti0EqIdx = Indices::conti0EqIdx //!< Index of the mass conservation equation for the water component
};
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
diff --git a/dumux/implicit/3p/3pmodel.hh b/dumux/implicit/3p/3pmodel.hh
index 825f0d3828..2f72e0e394 100644
--- a/dumux/implicit/3p/3pmodel.hh
+++ b/dumux/implicit/3p/3pmodel.hh
@@ -70,14 +70,9 @@ class ThreePModel: public GET_PROP_TYPE(TypeTag, BaseModel)
enum {
dim = GridView::dimension,
- dimWorld = GridView::dimensionworld,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
- pressureIdx = Indices::pressureIdx,
- swIdx = Indices::swIdx,
- snIdx = Indices::snIdx,
-
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx,
gPhaseIdx = Indices::gPhaseIdx,
diff --git a/dumux/implicit/3p3c/3p3cfluxvariables.hh b/dumux/implicit/3p3c/3p3cfluxvariables.hh
index 73f30c9a0a..5ef15527dc 100644
--- a/dumux/implicit/3p3c/3p3cfluxvariables.hh
+++ b/dumux/implicit/3p3c/3p3cfluxvariables.hh
@@ -58,7 +58,6 @@ class ThreePThreeCFluxVariables : public GET_PROP_TYPE(TypeTag, BaseFluxVariable
enum {
dim = GridView::dimension,
- dimWorld = GridView::dimensionworld,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
numComponents = GET_PROP_VALUE(TypeTag, NumComponents)
};
diff --git a/dumux/implicit/3p3c/3p3cmodel.hh b/dumux/implicit/3p3c/3p3cmodel.hh
index 80c3107fec..3d77a11379 100644
--- a/dumux/implicit/3p3c/3p3cmodel.hh
+++ b/dumux/implicit/3p3c/3p3cmodel.hh
@@ -109,7 +109,6 @@ class ThreePThreeCModel: public GET_PROP_TYPE(TypeTag, BaseModel)
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
- pressureIdx = Indices::pressureIdx,
switch1Idx = Indices::switch1Idx,
switch2Idx = Indices::switch2Idx,
diff --git a/dumux/implicit/3p3cni/3p3cnifluxvariables.hh b/dumux/implicit/3p3cni/3p3cnifluxvariables.hh
index 3c3bbfc779..ccabdf6652 100644
--- a/dumux/implicit/3p3cni/3p3cnifluxvariables.hh
+++ b/dumux/implicit/3p3cni/3p3cnifluxvariables.hh
@@ -57,8 +57,7 @@ class ThreePThreeCNIFluxVariables : public ThreePThreeCFluxVariables<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
enum {
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
+ dim = GridView::dimension
};
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
diff --git a/dumux/implicit/cellcentered/ccassembler.hh b/dumux/implicit/cellcentered/ccassembler.hh
index b9b0eceaff..8e4551be2d 100644
--- a/dumux/implicit/cellcentered/ccassembler.hh
+++ b/dumux/implicit/cellcentered/ccassembler.hh
@@ -41,7 +41,6 @@ class CCAssembler : public ImplicitAssembler<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) JacobianMatrix;
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
- enum{ dim = GridView::dimension };
typedef typename GridView::IntersectionIterator IntersectionIterator;
public:
diff --git a/dumux/implicit/cellcentered/ccelementboundarytypes.hh b/dumux/implicit/cellcentered/ccelementboundarytypes.hh
index c39b2bd254..b1c72b8ef8 100644
--- a/dumux/implicit/cellcentered/ccelementboundarytypes.hh
+++ b/dumux/implicit/cellcentered/ccelementboundarytypes.hh
@@ -45,7 +45,6 @@ class CCElementBoundaryTypes : public std::vector<typename GET_PROP_TYPE(TypeTag
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- enum { dim = GridView::dimension };
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::IntersectionIterator IntersectionIterator;
diff --git a/dumux/implicit/cellcentered/ccelementvolumevariables.hh b/dumux/implicit/cellcentered/ccelementvolumevariables.hh
index fe8ce4739d..86998de44e 100644
--- a/dumux/implicit/cellcentered/ccelementvolumevariables.hh
+++ b/dumux/implicit/cellcentered/ccelementvolumevariables.hh
@@ -48,9 +48,6 @@ class CCElementVolumeVariables : public std::vector<typename GET_PROP_TYPE(TypeT
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::IntersectionIterator IntersectionIterator;
- enum { dim = GridView::dimension };
- enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
-
public:
/*!
* \brief The constructor.
diff --git a/dumux/implicit/cellcentered/cclocalresidual.hh b/dumux/implicit/cellcentered/cclocalresidual.hh
index fe3e3d31f7..9baa26c530 100644
--- a/dumux/implicit/cellcentered/cclocalresidual.hh
+++ b/dumux/implicit/cellcentered/cclocalresidual.hh
@@ -48,8 +48,7 @@ class CCLocalResidual : public ImplicitLocalResidual<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
enum {
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
- dim = GridView::dimension
+ numEq = GET_PROP_VALUE(TypeTag, NumEq)
};
typedef typename GridView::template Codim<0>::Entity Element;
diff --git a/dumux/implicit/co2/co2model.hh b/dumux/implicit/co2/co2model.hh
index 03237b344f..da9cdfd570 100644
--- a/dumux/implicit/co2/co2model.hh
+++ b/dumux/implicit/co2/co2model.hh
@@ -54,13 +54,11 @@ class CO2Model: public TwoPTwoCModel<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
enum {
- numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
- numComponents = GET_PROP_VALUE(TypeTag, NumComponents)
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum {
- pressureIdx = Indices::pressureIdx,
switchIdx = Indices::switchIdx,
wPhaseIdx = Indices::wPhaseIdx,
diff --git a/dumux/implicit/common/implicitdarcyfluxvariables.hh b/dumux/implicit/common/implicitdarcyfluxvariables.hh
index 8f490f8840..c748595c53 100644
--- a/dumux/implicit/common/implicitdarcyfluxvariables.hh
+++ b/dumux/implicit/common/implicitdarcyfluxvariables.hh
@@ -60,7 +60,6 @@ class ImplicitDarcyFluxVariables
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
- enum { dim = GridView::dimension} ;
enum { dimWorld = GridView::dimensionworld} ;
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases)} ;
diff --git a/dumux/implicit/mpnc/diffusion/diffusion.hh b/dumux/implicit/mpnc/diffusion/diffusion.hh
index 5d470a10be..f37c3d2606 100644
--- a/dumux/implicit/mpnc/diffusion/diffusion.hh
+++ b/dumux/implicit/mpnc/diffusion/diffusion.hh
@@ -43,7 +43,6 @@ class MPNCDiffusion
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents)};
enum { nPhaseIdx = FluidSystem::nPhaseIdx };
enum { wPhaseIdx = FluidSystem::wPhaseIdx };
- enum { wCompIdx = FluidSystem::wCompIdx };
enum { nCompIdx = FluidSystem::nCompIdx };
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
diff --git a/dumux/implicit/mpnc/energy/mpncfluxvariablesenergy.hh b/dumux/implicit/mpnc/energy/mpncfluxvariablesenergy.hh
index 8f6f51e606..18028507e1 100644
--- a/dumux/implicit/mpnc/energy/mpncfluxvariablesenergy.hh
+++ b/dumux/implicit/mpnc/energy/mpncfluxvariablesenergy.hh
@@ -97,11 +97,9 @@ class MPNCFluxVariablesEnergy<TypeTag, /*enableEnergy=*/true, /*kineticEnergyTr
typedef typename GridView::ctype CoordScalar;
typedef typename GridView::template Codim<0>::Entity Element;
- enum{dim = GridView::dimension};
enum{dimWorld = GridView::dimensionworld};
enum{nPhaseIdx = FluidSystem::nPhaseIdx};
enum{wPhaseIdx = FluidSystem::wPhaseIdx};
- enum{numPhases = GET_PROP_VALUE(TypeTag, NumPhases)};
typedef Dune::FieldVector<CoordScalar, dimWorld> DimVector;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
diff --git a/dumux/implicit/mpnc/energy/mpncfluxvariablesenergykinetic.hh b/dumux/implicit/mpnc/energy/mpncfluxvariablesenergykinetic.hh
index 043e415a63..068340a19a 100644
--- a/dumux/implicit/mpnc/energy/mpncfluxvariablesenergykinetic.hh
+++ b/dumux/implicit/mpnc/energy/mpncfluxvariablesenergykinetic.hh
@@ -45,8 +45,6 @@ class MPNCFluxVariablesEnergy<TypeTag, /*enableEnergy=*/true, /*kineticEnergyTra
typedef typename GridView::template Codim<0>::Entity Element;
enum {dim = GridView::dimension};
- enum {dimWorld = GridView::dimensionworld};
- enum {numPhases = GET_PROP_VALUE(TypeTag, NumPhases)};
enum {numEnergyEqs = Indices::NumPrimaryEnergyVars};
typedef Dune::FieldVector<CoordScalar, dim> DimVector;
diff --git a/dumux/implicit/mpnc/energy/mpnclocalresidualenergy.hh b/dumux/implicit/mpnc/energy/mpnclocalresidualenergy.hh
index de8173e287..f045241bd4 100644
--- a/dumux/implicit/mpnc/energy/mpnclocalresidualenergy.hh
+++ b/dumux/implicit/mpnc/energy/mpnclocalresidualenergy.hh
@@ -160,10 +160,8 @@ class MPNCLocalResidualEnergy<TypeTag, /*enableEnergy=*/true, /*kineticenergyTra
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- enum { dim = GridView::dimension };
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
- enum { conti0EqIdx = Indices::conti0EqIdx };
enum { energyEqIdx = Indices::energyEqIdx };
typedef typename Dune::FieldVector<Scalar, numComponents> ComponentVector;
diff --git a/dumux/implicit/mpnc/energy/mpnclocalresidualenergykinetic.hh b/dumux/implicit/mpnc/energy/mpnclocalresidualenergykinetic.hh
index 425f74fc1f..4f94bdf457 100644
--- a/dumux/implicit/mpnc/energy/mpnclocalresidualenergykinetic.hh
+++ b/dumux/implicit/mpnc/energy/mpnclocalresidualenergykinetic.hh
@@ -41,11 +41,8 @@ class MPNCLocalResidualEnergy<TypeTag, /*enableEnergy=*/true, /*kineticEnergyTra
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- enum { dim = GridView::dimension };
- enum { dimWorld = GridView::dimensionworld };
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
- enum { conti0EqIdx = Indices::conti0EqIdx };
enum { energyEq0Idx = Indices::energyEq0Idx };
enum { numEnergyEqs = Indices::NumPrimaryEnergyVars};
enum { wPhaseIdx = FluidSystem::wPhaseIdx};
diff --git a/dumux/implicit/mpnc/energy/mpncvolumevariablesenergy.hh b/dumux/implicit/mpnc/energy/mpncvolumevariablesenergy.hh
index c69cbbf873..f37cb439e5 100644
--- a/dumux/implicit/mpnc/energy/mpncvolumevariablesenergy.hh
+++ b/dumux/implicit/mpnc/energy/mpncvolumevariablesenergy.hh
@@ -162,7 +162,6 @@ class MPNCVolumeVariablesEnergy<TypeTag, /*enableEnergy=*/true, /*kineticEnergyT
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
- enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { temperatureIdx = Indices::temperatureIdx };
enum { numEnergyEqs = Indices::numPrimaryEnergyVars};
enum { temperature0Idx = Indices::temperatureIdx };
diff --git a/dumux/implicit/mpnc/energy/mpncvolumevariablesenergykinetic.hh b/dumux/implicit/mpnc/energy/mpncvolumevariablesenergykinetic.hh
index c922ed7f86..30890074a3 100644
--- a/dumux/implicit/mpnc/energy/mpncvolumevariablesenergykinetic.hh
+++ b/dumux/implicit/mpnc/energy/mpncvolumevariablesenergykinetic.hh
@@ -45,15 +45,12 @@ class MPNCVolumeVariablesEnergy<TypeTag, /*enableEnergy=*/true, /*kineticEnergyT
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
- enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { temperature0Idx = Indices::temperature0Idx };
enum { nPhaseIdx = FluidSystem::nPhaseIdx };
enum { wPhaseIdx = FluidSystem::wPhaseIdx };
enum { sPhaseIdx = FluidSystem::sPhaseIdx };
enum { numEnergyEqs = Indices::NumPrimaryEnergyVars};
- enum { dim = GridView::dimension};
/*!
* \brief The fluid state which is used by the volume variables to
diff --git a/dumux/implicit/mpnc/energy/mpncvtkwriterenergykinetic.hh b/dumux/implicit/mpnc/energy/mpncvtkwriterenergykinetic.hh
index a6be791bee..6d32c639d4 100644
--- a/dumux/implicit/mpnc/energy/mpncvtkwriterenergykinetic.hh
+++ b/dumux/implicit/mpnc/energy/mpncvtkwriterenergykinetic.hh
@@ -58,7 +58,6 @@ class MPNCVtkWriterEnergy<TypeTag, /*enableEnergy = */ true, /* enableKineticEne
enum { dim = GridView::dimension };
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
- enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { numEnergyEqs = Indices::NumPrimaryEnergyVars};
enum { velocityAveragingInModel = GET_PROP_VALUE(TypeTag, VelocityAveragingInModel) };
diff --git a/dumux/implicit/mpnc/mass/mpnclocalresidualmass.hh b/dumux/implicit/mpnc/mass/mpnclocalresidualmass.hh
index 9456dc61d6..78dcda127a 100644
--- a/dumux/implicit/mpnc/mass/mpnclocalresidualmass.hh
+++ b/dumux/implicit/mpnc/mass/mpnclocalresidualmass.hh
@@ -48,7 +48,6 @@ protected:
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- enum { dim = GridView::dimension };
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { enableDiffusion = GET_PROP_VALUE(TypeTag, EnableDiffusion) };
diff --git a/dumux/implicit/mpnc/mass/mpnclocalresidualmasskinetic.hh b/dumux/implicit/mpnc/mass/mpnclocalresidualmasskinetic.hh
index f28af487b9..4fd4c95197 100644
--- a/dumux/implicit/mpnc/mass/mpnclocalresidualmasskinetic.hh
+++ b/dumux/implicit/mpnc/mass/mpnclocalresidualmasskinetic.hh
@@ -71,8 +71,6 @@ class MPNCLocalResidualMass<TypeTag, /*enableKinetic=*/true>
enum { sPhaseIdx = FluidSystem::sPhaseIdx} ;
enum { enableKineticEnergy = GET_PROP_VALUE(TypeTag, EnableKineticEnergy) };
enum { enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy) };
- enum { energyEqIdx = Indices::energyEqIdx };
- enum { numEnergyEqs = Indices::NumPrimaryEnergyVars};
typedef MPNCLocalResidualEnergy<TypeTag, enableEnergy, enableKineticEnergy> EnergyResid;
typedef typename Dune::FieldVector<Scalar, numComponents> ComponentVector;
diff --git a/dumux/implicit/mpnc/mass/mpncvolumevariablesmasskinetic.hh b/dumux/implicit/mpnc/mass/mpncvolumevariablesmasskinetic.hh
index 838d4c26f0..4eaea14646 100644
--- a/dumux/implicit/mpnc/mass/mpncvolumevariablesmasskinetic.hh
+++ b/dumux/implicit/mpnc/mass/mpncvolumevariablesmasskinetic.hh
@@ -58,13 +58,6 @@ class MPNCVolumeVariablesMass<TypeTag, /*bool enableKinetic=*/true>
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { moleFrac00Idx = Indices::moleFrac00Idx };
- enum { wPhaseIdx = FluidSystem::wPhaseIdx };
- enum { nPhaseIdx = FluidSystem::nPhaseIdx };
- enum { wCompIdx = FluidSystem::wCompIdx};
- enum { nCompIdx = FluidSystem::nCompIdx};
- enum { dim = GridView::dimension};
- enum { numEnergyEqs = Indices::NumPrimaryEnergyVars};
-
typedef typename Dune::FieldVector<Scalar, numComponents> ComponentVector;
diff --git a/dumux/implicit/mpnc/mpncfluxvariables.hh b/dumux/implicit/mpnc/mpncfluxvariables.hh
index 098a16b6a4..a26ffd099d 100644
--- a/dumux/implicit/mpnc/mpncfluxvariables.hh
+++ b/dumux/implicit/mpnc/mpncfluxvariables.hh
@@ -61,7 +61,6 @@ class MPNCFluxVariables
typedef typename GET_PROP_TYPE(TypeTag, BaseFluxVariables) BaseFluxVariables;
enum {dim= GridView::dimension};
- enum {numPhases = GET_PROP_VALUE(TypeTag, NumPhases)};
enum {enableDiffusion = GET_PROP_VALUE(TypeTag, EnableDiffusion)};
enum {enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy)};
enum {enableKinetic = GET_PROP_VALUE(TypeTag, EnableKinetic)};
diff --git a/dumux/implicit/mpnc/mpncvolumevariables.hh b/dumux/implicit/mpnc/mpncvolumevariables.hh
index 2744946435..3cc26809b4 100644
--- a/dumux/implicit/mpnc/mpncvolumevariables.hh
+++ b/dumux/implicit/mpnc/mpncvolumevariables.hh
@@ -65,10 +65,6 @@ class MPNCVolumeVariables
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- enum {dimWorld=GridView::dimensionworld};
- enum {wPhaseIdx = FluidSystem::wPhaseIdx};
- enum {nPhaseIdx = FluidSystem::nPhaseIdx};
-
// formulations
enum {
pressureFormulation = GET_PROP_VALUE(TypeTag, PressureFormulation),
diff --git a/dumux/implicit/mpnc/mpncvolumevariablesiakinetic.hh b/dumux/implicit/mpnc/mpncvolumevariablesiakinetic.hh
index a2afd6831a..c8e06c770f 100644
--- a/dumux/implicit/mpnc/mpncvolumevariablesiakinetic.hh
+++ b/dumux/implicit/mpnc/mpncvolumevariablesiakinetic.hh
@@ -65,7 +65,6 @@ class MPNCVolumeVariablesIA<TypeTag, enableKinetic, /*bool enableKineticEnergy=*
enum { nCompIdx = FluidSystem::nCompIdx } ;
enum { wCompIdx = FluidSystem::wCompIdx } ;
enum { dim = GridView::dimension};
- enum { numEnergyEqs = Indices::NumPrimaryEnergyVars};
typedef DimensionlessNumbers<Scalar> DimLessNum;
typedef Dune::FieldVector<Scalar,dim> GlobalPosition;
diff --git a/dumux/implicit/richards/richardslocalresidual.hh b/dumux/implicit/richards/richardslocalresidual.hh
index 3115b71531..1a5641b115 100644
--- a/dumux/implicit/richards/richardslocalresidual.hh
+++ b/dumux/implicit/richards/richardslocalresidual.hh
@@ -47,7 +47,6 @@ class RichardsLocalResidual : public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
};
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- enum { dim = GridView::dimension};
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
diff --git a/test/implicit/1p2c/1p2coutflowproblem.hh b/test/implicit/1p2c/1p2coutflowproblem.hh
index dadded1ba0..c17cf08762 100644
--- a/test/implicit/1p2c/1p2coutflowproblem.hh
+++ b/test/implicit/1p2c/1p2coutflowproblem.hh
@@ -130,8 +130,7 @@ class OnePTwoCOutflowProblem : public ImplicitPorousMediaProblem<TypeTag>
// copy some indices for convenience
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum {
- // Grid and world dimension
- dim = GridView::dimension,
+ // world dimension
dimWorld = GridView::dimensionworld
};
enum {
@@ -140,8 +139,7 @@ class OnePTwoCOutflowProblem : public ImplicitPorousMediaProblem<TypeTag>
massOrMoleFracIdx = Indices::massOrMoleFracIdx
};
enum {
- // indices of the equations
- conti0EqIdx = Indices::conti0EqIdx,
+ // index of the transport equation
transportEqIdx = Indices::transportEqIdx
};
diff --git a/test/implicit/1p2c/1p2coutflowspatialparams.hh b/test/implicit/1p2c/1p2coutflowspatialparams.hh
index 7858923ff7..e9cb3f43cf 100644
--- a/test/implicit/1p2c/1p2coutflowspatialparams.hh
+++ b/test/implicit/1p2c/1p2coutflowspatialparams.hh
@@ -47,10 +47,6 @@ class OnePTwoCOutflowSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- enum {
- dim=GridView::dimension,
- dimWorld=GridView::dimensionworld
- };
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
diff --git a/test/implicit/2p/lensproblem.hh b/test/implicit/2p/lensproblem.hh
index bd87447ab4..e6bf55ca56 100644
--- a/test/implicit/2p/lensproblem.hh
+++ b/test/implicit/2p/lensproblem.hh
@@ -182,8 +182,7 @@ class LensProblem : public GET_PROP_TYPE(TypeTag, BaseProblem)
nPhaseIdx = Indices::nPhaseIdx,
- // Grid and world dimension
- dim = GridView::dimension,
+ // world dimension
dimWorld = GridView::dimensionworld
};
diff --git a/test/implicit/2p2c/injectionspatialparams.hh b/test/implicit/2p2c/injectionspatialparams.hh
index 80d9113f28..22f91b85d6 100644
--- a/test/implicit/2p2c/injectionspatialparams.hh
+++ b/test/implicit/2p2c/injectionspatialparams.hh
@@ -80,9 +80,7 @@ class InjectionSpatialParams : public ImplicitSpatialParams<TypeTag>
enum {
dim=GridView::dimension,
- dimWorld=GridView::dimensionworld,
-
- wPhaseIdx = FluidSystem::wPhaseIdx
+ dimWorld=GridView::dimensionworld
};
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
diff --git a/test/implicit/2pdfm/2pdfmspatialparams.hh b/test/implicit/2pdfm/2pdfmspatialparams.hh
index fb26ce5b13..37743b808f 100644
--- a/test/implicit/2pdfm/2pdfmspatialparams.hh
+++ b/test/implicit/2pdfm/2pdfmspatialparams.hh
@@ -85,8 +85,7 @@ class TwoPDFMSpatialParams : public ImplicitSpatialParams<TypeTag>
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView, FaceLayout> FaceMapper;
enum {
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
+ dim = GridView::dimension
};
typedef typename GridView::template Codim<0>::Entity Element;
diff --git a/test/implicit/2pdfm/2pdfmtestproblem.hh b/test/implicit/2pdfm/2pdfmtestproblem.hh
index edbdff7007..05c6b451bb 100644
--- a/test/implicit/2pdfm/2pdfmtestproblem.hh
+++ b/test/implicit/2pdfm/2pdfmtestproblem.hh
@@ -136,15 +136,11 @@ class TwoPDFMTestProblem : public ImplicitPorousMediaProblem<TypeTag>
pwIdx = Indices::pwIdx,
snIdx = Indices::snIdx,
- // equation indices
- contiNEqIdx = Indices::contiNEqIdx,
-
// phase indices
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx,
- // Grid and world dimension
- dim = GridView::dimension,
+ // world dimension
dimWorld = GridView::dimensionworld
};
diff --git a/test/implicit/2pni/injectionproblem2pni.hh b/test/implicit/2pni/injectionproblem2pni.hh
index f3d4b8ff50..f0579087c7 100644
--- a/test/implicit/2pni/injectionproblem2pni.hh
+++ b/test/implicit/2pni/injectionproblem2pni.hh
@@ -170,8 +170,7 @@ class InjectionProblem2PNI : public ImplicitPorousMediaProblem<TypeTag>
energyEqIdx = Indices::energyEqIdx,
#endif
- // Grid and world dimension
- dim = GridView::dimension,
+ // world dimension
dimWorld = GridView::dimensionworld
};
diff --git a/test/implicit/3p/naplinfiltrationspatialparams.hh b/test/implicit/3p/naplinfiltrationspatialparams.hh
index d2d7bc6cfe..c1f8417b1e 100644
--- a/test/implicit/3p/naplinfiltrationspatialparams.hh
+++ b/test/implicit/3p/naplinfiltrationspatialparams.hh
@@ -75,15 +75,10 @@ class InfiltrationSpatialParams : public ImplicitSpatialParams<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename Grid::ctype CoordScalar;
enum {
- dim=GridView::dimension,
dimWorld=GridView::dimensionworld
};
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- enum {
- wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx
- };
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
diff --git a/test/implicit/3p3c/infiltrationspatialparameters.hh b/test/implicit/3p3c/infiltrationspatialparameters.hh
index 9c7280229a..00c966ea98 100644
--- a/test/implicit/3p3c/infiltrationspatialparameters.hh
+++ b/test/implicit/3p3c/infiltrationspatialparameters.hh
@@ -70,7 +70,6 @@ class InfiltrationSpatialParams : public ImplicitSpatialParams<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename Grid::ctype CoordScalar;
enum {
- dim=GridView::dimension,
dimWorld=GridView::dimensionworld
};
diff --git a/test/implicit/3p3cni/columnxylolspatialparams.hh b/test/implicit/3p3cni/columnxylolspatialparams.hh
index e9c6b93a55..1cd9676df1 100644
--- a/test/implicit/3p3cni/columnxylolspatialparams.hh
+++ b/test/implicit/3p3cni/columnxylolspatialparams.hh
@@ -69,7 +69,6 @@ class ColumnSpatialParams : public ImplicitSpatialParams<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename Grid::ctype CoordScalar;
enum {
- dim=GridView::dimension,
dimWorld=GridView::dimensionworld
};
diff --git a/test/implicit/co2/heterogeneousspatialparameters.hh b/test/implicit/co2/heterogeneousspatialparameters.hh
index 5247c74a15..a998b996e3 100644
--- a/test/implicit/co2/heterogeneousspatialparameters.hh
+++ b/test/implicit/co2/heterogeneousspatialparameters.hh
@@ -78,10 +78,7 @@ class HeterogeneousSpatialParams : public ImplicitSpatialParams<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
enum {
- dim=GridView::dimension,
- dimWorld=GridView::dimensionworld,
-
- lPhaseIdx = FluidSystem::lPhaseIdx
+ dim=GridView::dimension
};
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
diff --git a/test/implicit/mpnc/evaporationatmosphereproblem.hh b/test/implicit/mpnc/evaporationatmosphereproblem.hh
index 3e34a678d1..026bb744b6 100644
--- a/test/implicit/mpnc/evaporationatmosphereproblem.hh
+++ b/test/implicit/mpnc/evaporationatmosphereproblem.hh
@@ -226,12 +226,10 @@ class EvaporationAtmosphereProblem
enum { S0Idx = Indices::S0Idx};
enum { p0Idx = Indices::p0Idx};
enum { conti00EqIdx = Indices::conti0EqIdx };
- enum { temperature0Idx = Indices::temperatureIdx};
enum { energyEq0Idx = Indices::energyEqIdx};
enum { numEnergyEqs = Indices::NumPrimaryEnergyVars};
enum { wPhaseIdx = FluidSystem::wPhaseIdx};
enum { nPhaseIdx = FluidSystem::nPhaseIdx};
- enum { sPhaseIdx = FluidSystem::sPhaseIdx};
enum { wCompIdx = FluidSystem::H2OIdx};
enum { nCompIdx = FluidSystem::N2Idx};
enum { enableKinetic = GET_PROP_VALUE(TypeTag, EnableKinetic)};
diff --git a/test/implicit/mpnc/evaporationatmospherespatialparams.hh b/test/implicit/mpnc/evaporationatmospherespatialparams.hh
index c3277f3108..17d9a8e80c 100644
--- a/test/implicit/mpnc/evaporationatmospherespatialparams.hh
+++ b/test/implicit/mpnc/evaporationatmospherespatialparams.hh
@@ -114,8 +114,6 @@ class EvaporationAtmosphereSpatialParams : public ImplicitSpatialParams<TypeTag>
enum {dim=GridView::dimension };
enum {dimWorld=GridView::dimensionworld};
enum {wPhaseIdx = FluidSystem::wPhaseIdx};
- enum {nPhaseIdx = FluidSystem::nPhaseIdx};
- enum {sPhaseIdx = FluidSystem::sPhaseIdx};
enum { enableKineticEnergy = GET_PROP_VALUE(TypeTag, EnableKineticEnergy)};
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases)};
enum { enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy)};
diff --git a/test/implicit/mpnc/forchheimerspatialparams.hh b/test/implicit/mpnc/forchheimerspatialparams.hh
index 60444abb8f..623b31c57f 100644
--- a/test/implicit/mpnc/forchheimerspatialparams.hh
+++ b/test/implicit/mpnc/forchheimerspatialparams.hh
@@ -85,7 +85,6 @@ class ForchheimerSpatialParams : public ImplicitSpatialParams<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename Grid::ctype CoordScalar;
- enum {dim=GridView::dimension};
enum {dimWorld=GridView::dimensionworld};
enum {wPhaseIdx = FluidSystem::wPhaseIdx};
diff --git a/test/implicit/mpnc/obstacleproblem.hh b/test/implicit/mpnc/obstacleproblem.hh
index 784dfd3302..0aeb878b67 100644
--- a/test/implicit/mpnc/obstacleproblem.hh
+++ b/test/implicit/mpnc/obstacleproblem.hh
@@ -143,8 +143,7 @@ class ObstacleProblem
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- // Grid and world dimension
- enum {dim = GridView::dimension};
+ // world dimension
enum {dimWorld = GridView::dimensionworld};
enum {numPhases = GET_PROP_VALUE(TypeTag, NumPhases)};
enum {numComponents = GET_PROP_VALUE(TypeTag, NumComponents)};
diff --git a/test/implicit/mpnc/obstaclespatialparams.hh b/test/implicit/mpnc/obstaclespatialparams.hh
index 1548e3ccca..2182d159e4 100644
--- a/test/implicit/mpnc/obstaclespatialparams.hh
+++ b/test/implicit/mpnc/obstaclespatialparams.hh
@@ -84,7 +84,6 @@ class ObstacleSpatialParams : public ImplicitSpatialParams<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename Grid::ctype CoordScalar;
- enum {dim=GridView::dimension};
enum {dimWorld=GridView::dimensionworld};
enum {wPhaseIdx = FluidSystem::wPhaseIdx};
--
GitLab