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
......@@ -45,7 +45,7 @@ private:
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
dim = GridView::dimension
};
typedef Dune::FieldVector<Scalar, dim> DimVector;
......
......@@ -50,21 +50,12 @@ private:
typedef typename GridView::Traits::template Codim<0>::Entity Element;
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
};
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum
{
wPhaseIdx = Indices::wPhaseIdx, nPhaseIdx = Indices::nPhaseIdx
};
enum
{
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
public:
//! Collection of variables that have to be mapped if the grid is adapted
......
......@@ -65,11 +65,7 @@ template<class TypeTag> class FVPressure2PAdaptive: public FVPressure2P<TypeTag>
pn = Indices::pressureNw,
pGlobal = Indices::pressureGlobal,
sw = Indices::saturationW,
sn = Indices::saturationNw,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
eqIdxPress = Indices::pressureEqIdx,
eqIdxSat = Indices::satEqIdx
sn = Indices::saturationNw
};
enum
{
......
......@@ -69,13 +69,7 @@ class FVVelocity2PAdaptive: public FVVelocity2P<TypeTag>
pGlobal = Indices::pressureGlobal,
vw = Indices::velocityW,
vn = Indices::velocityNw,
vt = Indices::velocityTotal,
sw = Indices::saturationW,
sn = Indices::saturationNw,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
eqIdxPress = Indices::pressureEqIdx,
eqIdxSat = Indices::satEqIdx
vt = Indices::velocityTotal
};
enum
{
......
......@@ -91,12 +91,8 @@ class FVMPFAL2PFABoundPressure2P: public FVPressure<TypeTag>
{
pw = Indices::pressureW,
pn = Indices::pressureNw,
pGlobal = Indices::pressureGlobal,
sw = Indices::saturationW,
sn = Indices::saturationNw,
vw = Indices::velocityW,
vn = Indices::velocityNw,
vt = Indices::velocityTotal
sn = Indices::saturationNw
};
enum
{
......
......@@ -93,12 +93,8 @@ class FVMPFAL2PFABoundPressure2PAdaptive: public FVPressure<TypeTag>
{
pw = Indices::pressureW,
pn = Indices::pressureNw,
pGlobal = Indices::pressureGlobal,
sw = Indices::saturationW,
sn = Indices::saturationNw,
vw = Indices::velocityW,
vn = Indices::velocityNw,
vt = Indices::velocityTotal
sn = Indices::saturationNw
};
enum
{
......
......@@ -90,12 +90,8 @@ template<class TypeTag> class FVMPFAL2PFABoundVelocity2P: public FVMPFAL2PFABoun
{
pw = Indices::pressureW,
pn = Indices::pressureNw,
pGlobal = Indices::pressureGlobal,
sw = Indices::saturationW,
sn = Indices::saturationNw,
vw = Indices::velocityW,
vn = Indices::velocityNw,
vt = Indices::velocityTotal
sn = Indices::saturationNw
};
enum
{
......
......@@ -93,12 +93,8 @@ template<class TypeTag> class FVMPFAL2PFABoundVelocity2PAdaptive: public FVMPFAL
{
pw = Indices::pressureW,
pn = Indices::pressureNw,
pGlobal = Indices::pressureGlobal,
sw = Indices::saturationW,
sn = Indices::saturationNw,
vw = Indices::velocityW,
vn = Indices::velocityNw,
vt = Indices::velocityTotal
sn = Indices::saturationNw
};
enum
{
......
......@@ -89,12 +89,8 @@ class FVMPFAO2PFABoundPressure2P: public FVPressure<TypeTag>
{
pw = Indices::pressureW,
pn = Indices::pressureNw,
pGlobal = Indices::pressureGlobal,
sw = Indices::saturationW,
sn = Indices::saturationNw,
vw = Indices::velocityW,
vn = Indices::velocityNw,
vt = Indices::velocityTotal
sn = Indices::saturationNw
};
enum
{
......
......@@ -90,12 +90,8 @@ template<class TypeTag> class FVMPFAO2PFABoundVelocity2P: public FVMPFAO2PFABoun
{
pw = Indices::pressureW,
pn = Indices::pressureNw,
pGlobal = Indices::pressureGlobal,
sw = Indices::saturationW,
sn = Indices::saturationNw,
vw = Indices::velocityW,
vn = Indices::velocityNw,
vt = Indices::velocityTotal
sn = Indices::saturationNw
};
enum
{
......
......@@ -84,8 +84,6 @@ template<class TypeTag> class FVMPFAOVelocity2P:public FVMPFAOPressure2P<TypeTag
{
sw = Indices::saturationW,
sn = Indices::saturationNw,
vw = Indices::velocityW,
vn = Indices::velocityNw,
vt = Indices::velocityTotal,
pGlobal = Indices::pressureGlobal
};
......
......@@ -77,9 +77,7 @@ class MimeticGroundwaterEquationLocalStiffness: public LocalStiffness<TypeTag, 1
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx,
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
pressEqIdx = Indices::pressureEqIdx,
satEqIdx = Indices::satEqIdx,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
typedef typename GridView::Traits::template Codim<0>::Entity Element;
......
......@@ -83,11 +83,8 @@ template<class TypeTag> class MimeticPressure2P
};
enum
{
pw = Indices::pressureW,
pn = Indices::pressureNw,
pGlobal = Indices::pressureGlobal,
sw = Indices::saturationW,
sn = Indices::saturationNw
sw = Indices::saturationW
};
enum
{
......
......@@ -45,7 +45,7 @@ private:
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
dim = GridView::dimension
};
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
......
......@@ -50,11 +50,6 @@ private:
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
};
enum
{
sw = Indices::saturationW,
......@@ -63,8 +58,7 @@ private:
enum
{
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
nPhaseIdx = Indices::nPhaseIdx
};
public:
......
......@@ -53,11 +53,6 @@ private:
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
};
enum
{
sw = Indices::saturationW,
......@@ -66,8 +61,7 @@ private:
enum
{
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
nPhaseIdx = Indices::nPhaseIdx
};
public:
......
......@@ -42,7 +42,7 @@ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
enum{dim = GridView::dimension, dimWorld = GridView::dimensionworld};
enum{dimWorld = GridView::dimensionworld};
typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<Scalar, dimWorld> DimVector;
......
......@@ -56,11 +56,6 @@ private:
typedef typename GridView::Intersection Intersection;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
};
public:
//! For initialization
......
......@@ -70,9 +70,6 @@ private:
{
pw = Indices::pressureW,
pn = Indices::pressureNw,
pGlobal = Indices::pressureGlobal,
vw = Indices::velocityW,
vn = Indices::velocityNw,
vt = Indices::velocityTotal,
sw = Indices::saturationW,
sn = Indices::saturationNw
......
......@@ -46,10 +46,6 @@ private:
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
};
enum
{
wPhaseIdx = Indices::wPhaseIdx, nPhaseIdx = Indices::nPhaseIdx
......@@ -57,14 +53,7 @@ private:
enum
{
pw = Indices::pressureW,
pn = Indices::pressureNw,
pGlobal = Indices::pressureGlobal,
vw = Indices::velocityW,
vn = Indices::velocityNw,
vt = Indices::velocityTotal,
sw = Indices::saturationW,
sn = Indices::saturationNw
vt = Indices::velocityTotal
};
typedef typename GridView::Traits::template Codim<0>::Entity Element;
......
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