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