Commit f2ce87c3 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

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
parent 9a15ba61
......@@ -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:
......
......@@ -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,
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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)
};
......
......@@ -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,
......
......@@ -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)
};
......
......@@ -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,
......
......@@ -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;
......
......@@ -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;
......
......@@ -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,
......
......@@ -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)
};
......
......@@ -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,
......
......@@ -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;
......
......@@ -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:
......
......@@ -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;
......
......@@ -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.
......
......@@ -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;
......
......@@ -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,
......
Supports Markdown
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