From c655fcd46f48c5267020f84ec6b3717656d4e0b2 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Thu, 29 Aug 2013 12:17:48 +0000
Subject: [PATCH] The removal of the unused private enums rendered more private
typedefs unused.
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11303 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/decoupled/2p2c/cellData2p2c.hh | 1 -
dumux/decoupled/2p2c/cellData2p2cmultiphysics.hh | 1 -
dumux/decoupled/2p2c/fluxData2p2c.hh | 2 --
dumux/decoupled/common/impet.hh | 1 -
dumux/geomechanics/el2p/el2pfluxvariables.hh | 1 -
dumux/implicit/1p/1plocalresidual.hh | 2 --
dumux/implicit/2p/2plocalresidual.hh | 2 --
dumux/implicit/2pni/2pnilocalresidual.hh | 2 --
dumux/implicit/mpnc/energy/mpnclocalresidualenergy.hh | 1 -
dumux/implicit/mpnc/energy/mpnclocalresidualenergykinetic.hh | 1 -
dumux/implicit/mpnc/mass/mpnclocalresidualmass.hh | 1 -
dumux/implicit/mpnc/mpncvolumevariablesiakinetic.hh | 1 -
dumux/implicit/richards/richardslocalresidual.hh | 2 --
test/common/generalproblem/generallensspatialparams.hh | 2 --
test/implicit/3p/naplinfiltrationspatialparams.hh | 2 --
15 files changed, 22 deletions(-)
diff --git a/dumux/decoupled/2p2c/cellData2p2c.hh b/dumux/decoupled/2p2c/cellData2p2c.hh
index bb355c8b34..8ae1be24c2 100644
--- a/dumux/decoupled/2p2c/cellData2p2c.hh
+++ b/dumux/decoupled/2p2c/cellData2p2c.hh
@@ -45,7 +45,6 @@ class CellData2P2C
{
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;
diff --git a/dumux/decoupled/2p2c/cellData2p2cmultiphysics.hh b/dumux/decoupled/2p2c/cellData2p2cmultiphysics.hh
index bed65129b0..b8d30f1480 100644
--- a/dumux/decoupled/2p2c/cellData2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/cellData2p2cmultiphysics.hh
@@ -46,7 +46,6 @@ class CellData2P2CMultiPhysics : public CellData2P2C<TypeTag>
{
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
typedef PseudoOnePTwoCFluidState<TypeTag> SimpleFluidState;
diff --git a/dumux/decoupled/2p2c/fluxData2p2c.hh b/dumux/decoupled/2p2c/fluxData2p2c.hh
index 95af7b73ce..e5130c9e7e 100644
--- a/dumux/decoupled/2p2c/fluxData2p2c.hh
+++ b/dumux/decoupled/2p2c/fluxData2p2c.hh
@@ -49,8 +49,6 @@ private:
dim = GridView::dimension
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
-
enum
{
numEquations = GET_PROP_VALUE(TypeTag, PTAG(NumEq))
diff --git a/dumux/decoupled/common/impet.hh b/dumux/decoupled/common/impet.hh
index d096bf54de..33cebda351 100644
--- a/dumux/decoupled/common/impet.hh
+++ b/dumux/decoupled/common/impet.hh
@@ -47,7 +47,6 @@ namespace Dumux
*/
template<class TypeTag> class IMPET
{
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
diff --git a/dumux/geomechanics/el2p/el2pfluxvariables.hh b/dumux/geomechanics/el2p/el2pfluxvariables.hh
index 94f026e591..63d9b78b79 100644
--- a/dumux/geomechanics/el2p/el2pfluxvariables.hh
+++ b/dumux/geomechanics/el2p/el2pfluxvariables.hh
@@ -81,7 +81,6 @@ NEW_PROP_TAG(SpatialParams);
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
enum
{
numFluidPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
diff --git a/dumux/implicit/1p/1plocalresidual.hh b/dumux/implicit/1p/1plocalresidual.hh
index dc8a1feecd..7b4fd0500b 100644
--- a/dumux/implicit/1p/1plocalresidual.hh
+++ b/dumux/implicit/1p/1plocalresidual.hh
@@ -46,8 +46,6 @@ class OnePLocalResidual : public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
//index of the mass balance equation
enum {
diff --git a/dumux/implicit/2p/2plocalresidual.hh b/dumux/implicit/2p/2plocalresidual.hh
index f6ab1237b2..8dd38d78cc 100644
--- a/dumux/implicit/2p/2plocalresidual.hh
+++ b/dumux/implicit/2p/2plocalresidual.hh
@@ -57,8 +57,6 @@ protected:
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
diff --git a/dumux/implicit/2pni/2pnilocalresidual.hh b/dumux/implicit/2pni/2pnilocalresidual.hh
index e8698ff266..5a5b974d7a 100644
--- a/dumux/implicit/2pni/2pnilocalresidual.hh
+++ b/dumux/implicit/2pni/2pnilocalresidual.hh
@@ -57,8 +57,6 @@ class TwoPNILocalResidual : public TwoPLocalResidual<TypeTag>
nPhaseIdx = Indices::nPhaseIdx
};
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
diff --git a/dumux/implicit/mpnc/energy/mpnclocalresidualenergy.hh b/dumux/implicit/mpnc/energy/mpnclocalresidualenergy.hh
index f045241bd4..0572e6da35 100644
--- a/dumux/implicit/mpnc/energy/mpnclocalresidualenergy.hh
+++ b/dumux/implicit/mpnc/energy/mpnclocalresidualenergy.hh
@@ -153,7 +153,6 @@ class MPNCLocalResidualEnergy<TypeTag, /*enableEnergy=*/true, /*kineticenergyTra
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
diff --git a/dumux/implicit/mpnc/energy/mpnclocalresidualenergykinetic.hh b/dumux/implicit/mpnc/energy/mpnclocalresidualenergykinetic.hh
index 4f94bdf457..ae19ca638b 100644
--- a/dumux/implicit/mpnc/energy/mpnclocalresidualenergykinetic.hh
+++ b/dumux/implicit/mpnc/energy/mpnclocalresidualenergykinetic.hh
@@ -34,7 +34,6 @@ class MPNCLocalResidualEnergy<TypeTag, /*enableEnergy=*/true, /*kineticEnergyTra
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
diff --git a/dumux/implicit/mpnc/mass/mpnclocalresidualmass.hh b/dumux/implicit/mpnc/mass/mpnclocalresidualmass.hh
index 78dcda127a..11de517c5a 100644
--- a/dumux/implicit/mpnc/mass/mpnclocalresidualmass.hh
+++ b/dumux/implicit/mpnc/mass/mpnclocalresidualmass.hh
@@ -43,7 +43,6 @@ template<class TypeTag>
class MPNCLocalResidualMassCommon
{
protected:
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
diff --git a/dumux/implicit/mpnc/mpncvolumevariablesiakinetic.hh b/dumux/implicit/mpnc/mpncvolumevariablesiakinetic.hh
index c8e06c770f..a032bac829 100644
--- a/dumux/implicit/mpnc/mpncvolumevariablesiakinetic.hh
+++ b/dumux/implicit/mpnc/mpncvolumevariablesiakinetic.hh
@@ -54,7 +54,6 @@ class MPNCVolumeVariablesIA<TypeTag, enableKinetic, /*bool enableKineticEnergy=*
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GridView::template Codim<0>::Entity Element;
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
diff --git a/dumux/implicit/richards/richardslocalresidual.hh b/dumux/implicit/richards/richardslocalresidual.hh
index 1a5641b115..06c060b090 100644
--- a/dumux/implicit/richards/richardslocalresidual.hh
+++ b/dumux/implicit/richards/richardslocalresidual.hh
@@ -46,8 +46,6 @@ class RichardsLocalResidual : public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
wPhaseIdx = Indices::wPhaseIdx
};
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
diff --git a/test/common/generalproblem/generallensspatialparams.hh b/test/common/generalproblem/generallensspatialparams.hh
index 708a40aa26..41a16545e4 100644
--- a/test/common/generalproblem/generallensspatialparams.hh
+++ b/test/common/generalproblem/generallensspatialparams.hh
@@ -76,8 +76,6 @@ class GeneralLensSpatialParams : public GET_PROP_TYPE(TypeTag, SpatialParamsBase
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename Grid::ctype CoordScalar;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
enum {
dim=GridView::dimension,
dimWorld=GridView::dimensionworld
diff --git a/test/implicit/3p/naplinfiltrationspatialparams.hh b/test/implicit/3p/naplinfiltrationspatialparams.hh
index c1f8417b1e..625408a9d9 100644
--- a/test/implicit/3p/naplinfiltrationspatialparams.hh
+++ b/test/implicit/3p/naplinfiltrationspatialparams.hh
@@ -78,8 +78,6 @@ class InfiltrationSpatialParams : public ImplicitSpatialParams<TypeTag>
dimWorld=GridView::dimensionworld
};
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
--
GitLab