Commit 9a15ba61 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

remove unused private enums from dumux/decoupled and test/decoupled

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11295 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 60d30745
......@@ -109,9 +109,7 @@ class FVSaturation2P: public FVTransport<TypeTag>
{
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
pressEqIdx = Indices::pressureEqIdx,
satEqIdx = Indices::satEqIdx,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
......
......@@ -61,7 +61,6 @@ class IMPETProblem2P2C : public IMPESProblem2P<TypeTag>
adaptiveGrid = GET_PROP_VALUE(TypeTag, AdaptiveGrid)
};
enum {
dim = Grid::dimension,
dimWorld = Grid::dimensionworld
};
......
......@@ -49,18 +49,13 @@ private:
typedef FluxData2P2C<TypeTag> FluxData;
typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
};
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum
{
wPhaseIdx = Indices::wPhaseIdx, nPhaseIdx = Indices::nPhaseIdx,
wCompIdx = Indices::wPhaseIdx, nCompIdx = Indices::nPhaseIdx,
contiWEqIdx = Indices::contiWEqIdx, contiNEqIdx = Indices::contiNEqIdx
contiWEqIdx = Indices::contiWEqIdx
};
enum
{
......
......@@ -49,7 +49,7 @@ private:
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
dim = GridView::dimension
};
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
......
......@@ -47,27 +47,14 @@ class CellData2P2CMultiPhysics : public CellData2P2C<TypeTag>
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
// typedef FluxData2P2C<TypeTag> FluxData;
typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
typedef PseudoOnePTwoCFluidState<TypeTag> SimpleFluidState;
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
};
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum
{
wPhaseIdx = Indices::wPhaseIdx, nPhaseIdx = Indices::nPhaseIdx,
wCompIdx = Indices::wPhaseIdx, nCompIdx = Indices::nPhaseIdx,
contiWEqIdx = Indices::contiWEqIdx, contiNEqIdx = Indices::contiNEqIdx
};
enum
{
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
numComponents = GET_PROP_VALUE(TypeTag, NumComponents)
wPhaseIdx = Indices::wPhaseIdx, nPhaseIdx = Indices::nPhaseIdx
};
enum
{
......
......@@ -46,16 +46,11 @@ private:
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
dim = GridView::dimension
};
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
enum
{
wPhaseIdx = Indices::wPhaseIdx, nPhaseIdx = Indices::nPhaseIdx
};
enum
{
numEquations = GET_PROP_VALUE(TypeTag, PTAG(NumEq))
......
......@@ -95,16 +95,12 @@ template<class TypeTag> class FVPressure2P2CAdaptive
enum
{
pw = Indices::pressureW,
pn = Indices::pressureN,
pGlobal = Indices::pressureGlobal,
sw = Indices::saturationW,
sn = Indices::saturationNw
pn = Indices::pressureN
};
enum
{
wPhaseIdx = Indices::wPhaseIdx, nPhaseIdx = Indices::nPhaseIdx,
wCompIdx = Indices::wPhaseIdx, nCompIdx = Indices::nPhaseIdx,
contiWEqIdx = Indices::contiWEqIdx, contiNEqIdx = Indices::contiNEqIdx
wCompIdx = Indices::wPhaseIdx, nCompIdx = Indices::nPhaseIdx
};
enum
{
......
......@@ -83,9 +83,7 @@ class FVPressure2P2CMultiPhysics : public FVPressure2P2C<TypeTag>
};
enum
{
pw = Indices::pressureW,
pn = Indices::pressureN,
pGlobal = Indices::pressureGlobal
pw = Indices::pressureW
};
enum
{
......@@ -93,11 +91,6 @@ class FVPressure2P2CMultiPhysics : public FVPressure2P2C<TypeTag>
wCompIdx = Indices::wPhaseIdx, nCompIdx = Indices::nPhaseIdx,
contiWEqIdx = Indices::contiWEqIdx, contiNEqIdx = Indices::contiNEqIdx
};
enum
{
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
numComponents = GET_PROP_VALUE(TypeTag, NumComponents)
};
// typedefs to abbreviate several dune classes...
typedef typename GridView::Traits::template Codim<0>::Entity Element;
......
......@@ -85,9 +85,7 @@ class FVTransport2P2C
enum
{
pw = Indices::pressureW,
pn = Indices::pressureN,
sw = Indices::saturationW,
sn = Indices::saturationNw
pn = Indices::pressureN
};
enum
{
......
......@@ -71,9 +71,7 @@ class FVTransport2P2CAdaptive : public FVTransport2P2C<TypeTag>
enum
{
pw = Indices::pressureW,
pn = Indices::pressureN,
sw = Indices::saturationW,
sn = Indices::saturationNw
pn = Indices::pressureN
};
enum
{
......
......@@ -63,14 +63,7 @@ class FVTransport2P2CMultiPhysics : public FVTransport2P2C<TypeTag>
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
};
enum
{
pw = Indices::pressureW,
pn = Indices::pressureNw,
sw = Indices::saturationW,
sn = Indices::saturationNw
dim = GridView::dimension
};
enum
{
......
......@@ -63,7 +63,7 @@ private:
typedef typename GridView::Intersection Intersection;
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
dim = GridView::dimension
};
enum //!< for first and second half edge (2D) or subvolume face (3D)
{
......
......@@ -49,10 +49,6 @@ template<class TypeTag> class FVPressure
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
};
// typedefs to abbreviate several dune classes...
typedef typename GridView::Traits::template Codim<0>::Entity Element;
......
......@@ -50,11 +50,6 @@ template<class TypeTag, class Velocity> class FVVelocity
typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
};
// typedefs to abbreviate several dune classes...
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::IntersectionIterator IntersectionIterator;
......
......@@ -42,7 +42,7 @@ private:
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
dim = GridView::dimension
};
typedef typename GridView::template Codim<0>::EntityPointer ElementPointer;
......
......@@ -42,7 +42,7 @@ private:
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
dim = GridView::dimension
};
typedef typename GridView::template Codim<0>::EntityPointer ElementPointer;
......
......@@ -54,11 +54,6 @@ template<class TypeTag> class IMPET
typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename GET_PROP_TYPE(TypeTag, TransportSolutionType) TransportSolutionType;
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
};
enum IterationType
{
noIter,
......
......@@ -54,8 +54,6 @@ private:
enum
{
dim = GridView::dimension,
dimWorld = GridView::dimensionworld,
numEq = GET_PROP_VALUE(TypeTag, NumEq)
};
typedef typename GridView::Traits::template Codim<0>::Entity Element;
......
......@@ -43,7 +43,7 @@ class TestOnePSpatialParams: public FVSpatialParamsOneP<TypeTag>
typedef typename Grid::ctype CoordScalar;
enum
{dim=Grid::dimension, dimWorld=Grid::dimensionworld, numEq=1};
{dim=Grid::dimension, dimWorld=Grid::dimensionworld};
typedef typename Grid::Traits::template Codim<0>::Entity Element;
typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
......
......@@ -189,10 +189,8 @@ class TestDiffusionProblem: public DiffusionProblem2P<TypeTag>
enum
{
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx,
pGlobalIdx = Indices::pGlobalIdx,
swIdx = Indices::swIdx,
pressEqIdx = Indices::pressureEqIdx
swIdx = Indices::swIdx
};
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
......
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