diff --git a/dumux/decoupled/2p2c/cellData2p2c.hh b/dumux/decoupled/2p2c/cellData2p2c.hh index bb355c8b3483f672f17ee2ffda9790484b3beebe..8ae1be24c2c21d0dcb55a91552458544f4993c56 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 bed65129b0614ef90ccec80f29c8e315b42ec6ad..b8d30f148011b2eaaf5fe87ecd64064eda667c4f 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 95af7b73cee55758c19a8dd31b9290f6087dd5d8..e5130c9e7e7aced1aac8705320358be17b6d3977 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 d096bf54de9d9b1df23699be262269ab64dd357f..33cebda351667fed8ccdaf7ac81254f91e12671b 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 94f026e591ce376aa4a43c83612d506fa74d6745..63d9b78b79efaa5891664513f2f39528a03a1b29 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 dc8a1feecdd02e6bf772c403bffbfd01a5656951..7b4fd0500b5bd6adb95df2be0b33ebb4f8f83258 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 f6ab1237b20bd19e928060eb1e0e3bcd6956d5a5..8dd38d78ccc50dcec5ae28488e2d18439565d0dc 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 e8698ff2665f2356f64729c5aa6bc99037fed32b..5a5b974d7ac6861a5c2e403b83d5499424b64947 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 f045241bd4ab68490ba35178b470c475b181f94b..0572e6da3572e149d56401deffb66afcc2ef3b2d 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 4f94bdf45701952d458ce2f53827b131a18b63ac..ae19ca638bd3b9d37be292ce85e2ec2100aa4f38 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 78dcda127a3c072b9119cadc14efceb59b316cca..11de517c5aa50624479c79713c2c8a1fddc94418 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 c8e06c770fd381ee37ccc8edd05914861218b750..a032bac829dc69ad9f3e32edbb4be8f6c3dc1efd 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 1a5641b1158ba3c13a963de9bdc7fb0ba2a8232e..06c060b0907d0130bbf58f1bc48cd449c3a1197f 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 708a40aa26238a2445bd78321c4584249ec9e4ab..41a16545e4656ef69c667408df7b1de74f43ea93 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 c1f8417b1e21b1fc4de17d0ac32f417c94790091..625408a9d9665d3b4611c243e83a9e83e14b9157 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;