diff --git a/dumux/boxmodels/1p2c/1p2clocalresidual.hh b/dumux/boxmodels/1p2c/1p2clocalresidual.hh
index 06b76d5a6a5ef2a112785d446c93357e78828784..85599a2bcdebc9236989f757e931df3498a20546 100644
--- a/dumux/boxmodels/1p2c/1p2clocalresidual.hh
+++ b/dumux/boxmodels/1p2c/1p2clocalresidual.hh
@@ -59,9 +59,7 @@ template<class TypeTag>
class OnePTwoCLocalResidual : public BoxLocalResidual<TypeTag>
{
protected:
- typedef OnePTwoCLocalResidual<TypeTag> ThisType;
typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) Implementation;
- typedef BoxLocalResidual<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
@@ -75,7 +73,6 @@ protected:
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, OnePTwoCIndices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
enum
{
@@ -98,11 +95,7 @@ protected:
static const bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::template Codim<0>::Iterator ElementIterator;
- typedef Dune::FieldVector<Scalar, dimWorld> Vector;
- typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> Tensor;
public:
/*!
diff --git a/dumux/boxmodels/2p2c/2p2cmodel.hh b/dumux/boxmodels/2p2c/2p2cmodel.hh
index 6e344ba74a9c87005bbc40d71f5f1251abdabda1..d9bb29bd004d920f5a8f93a6db8fc9b9169f2862 100644
--- a/dumux/boxmodels/2p2c/2p2cmodel.hh
+++ b/dumux/boxmodels/2p2c/2p2cmodel.hh
@@ -97,10 +97,7 @@ class TwoPTwoCModel: public BoxModel<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, VertexMapper) VertexMapper;
- typedef typename GET_PROP_TYPE(TypeTag, ElementMapper) ElementMapper;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
enum {
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
diff --git a/dumux/boxmodels/MpNc/MpNcfluxvariables.hh b/dumux/boxmodels/MpNc/MpNcfluxvariables.hh
index cca3bbb5215841450936b76c6758a18dcac36ee0..27f06b21404c90ce5d9f76537fe2d85ed81dc00f 100644
--- a/dumux/boxmodels/MpNc/MpNcfluxvariables.hh
+++ b/dumux/boxmodels/MpNc/MpNcfluxvariables.hh
@@ -74,15 +74,12 @@ class MPNCFluxVariables
enableGravity = GET_PROP_VALUE(TypeTag, EnableGravity),
};
- typedef typename GridView::ctype CoordScalar;
typedef Dune::FieldVector<Scalar, dimWorld> Vector;
typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> Tensor;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename FVElementGeometry::SubControlVolume SCV;
typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
- typedef Dune::FieldVector<Scalar, numPhases> PhasesVector;
typedef MPNCFluxVariablesDiffusion<TypeTag, enableDiffusion> FluxVariablesDiffusion;
typedef MPNCFluxVariablesEnergy<TypeTag, enableEnergy, enableKineticEnergy> FluxVariablesEnergy;
diff --git a/dumux/boxmodels/MpNc/MpNclocalresidual.hh b/dumux/boxmodels/MpNc/MpNclocalresidual.hh
index 4c63795d57b322546bdfcd6fb28e1890a1e64de3..3fa6a8ebae1fc9765628b0cbb9aa1bac707687db 100644
--- a/dumux/boxmodels/MpNc/MpNclocalresidual.hh
+++ b/dumux/boxmodels/MpNc/MpNclocalresidual.hh
@@ -50,13 +50,10 @@ class MPNCLocalResidual : public BoxLocalResidual<TypeTag>
protected:
typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) Implementation;
- typedef MPNCLocalResidual<TypeTag> ThisType;
typedef BoxLocalResidual<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
enum {
dim = GridView::dimension,
@@ -78,11 +75,8 @@ protected:
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::IntersectionIterator IntersectionIterator;
- typedef typename GridView::template Codim<dim>::Entity Vertex;
- typedef typename GridView::template Codim<dim>::Iterator VertexIterator;
typedef typename GridView::CollectiveCommunication CollectiveCommunication;
@@ -92,14 +86,8 @@ protected:
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
- typedef Dune::FieldVector<Scalar, numPhases> PhasesVector;
- typedef Dune::FieldVector<Scalar, numComponents> ComponentVector;
- typedef Dune::FieldVector<Scalar, dim> LocalPosition;
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
- typedef Dune::FieldVector<Scalar, dimWorld> Vector;
- typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> Tensor;
typedef MPNCLocalResidualEnergy<TypeTag, enableEnergy, enableKineticEnergy> EnergyResid;
typedef MPNCLocalResidualMass<TypeTag, enableKinetic> MassResid;
diff --git a/dumux/boxmodels/MpNc/MpNcmodel.hh b/dumux/boxmodels/MpNc/MpNcmodel.hh
index 429042c8321e3fefe58e8486d07849350b678f33..dfcd924489f8c2249bba84383487e9d1b6100385 100644
--- a/dumux/boxmodels/MpNc/MpNcmodel.hh
+++ b/dumux/boxmodels/MpNc/MpNcmodel.hh
@@ -110,28 +110,18 @@ namespace Dumux
template<class TypeTag>
class MPNCModel : public BoxModel<TypeTag>
{
- typedef MPNCModel<TypeTag> ThisType;
typedef BoxModel<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
- typedef Dune::BlockVector<Dune::FieldVector<Scalar, 1> > ScalarField;
typedef Dumux::MPNCVtkWriter<TypeTag> MPNCVtkWriter;
diff --git a/dumux/boxmodels/MpNc/MpNcnewtoncontroller.hh b/dumux/boxmodels/MpNc/MpNcnewtoncontroller.hh
index 58bb2e7183d7d98576d3bf8bb932495b1190a491..3a23e194702d2103aed6cbfac6a0d14e2409514a 100644
--- a/dumux/boxmodels/MpNc/MpNcnewtoncontroller.hh
+++ b/dumux/boxmodels/MpNc/MpNcnewtoncontroller.hh
@@ -162,14 +162,11 @@ private:
template <class TypeTag>
class MPNCNewtonController : public NewtonController<TypeTag>
{
- typedef MPNCNewtonController<TypeTag> ThisType;
typedef NewtonController<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, NewtonMethod) NewtonMethod;
typedef typename GET_PROP_TYPE(TypeTag, JacobianAssembler) JacobianAssembler;
typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
diff --git a/dumux/boxmodels/MpNc/MpNcvolumevariables.hh b/dumux/boxmodels/MpNc/MpNcvolumevariables.hh
index 5820136e85e435a18072a4a5d2ca505ad1513276..8361a665998895eea29d55c74d1cfb105316cefc 100644
--- a/dumux/boxmodels/MpNc/MpNcvolumevariables.hh
+++ b/dumux/boxmodels/MpNc/MpNcvolumevariables.hh
@@ -66,7 +66,6 @@ class MPNCVolumeVariables
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
enum {
numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
@@ -91,7 +90,6 @@ class MPNCVolumeVariables
typedef MPNCVolumeVariablesIA<TypeTag, enableKinetic, enableKineticEnergy> IAVolumeVariables;
typedef MPNCVolumeVariablesDiffusion<TypeTag, enableDiffusion> DiffusionVolumeVariables;
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
public:
//! The return type of the fluidState() method
diff --git a/dumux/boxmodels/MpNc/MpNcvolumevariablesia.hh b/dumux/boxmodels/MpNc/MpNcvolumevariablesia.hh
index 026e8d07a0b6b39dc916f3a7181ccd3c2f86bbe6..b3b12041bcd3f83339d4ce50a09efe2c558298cd 100644
--- a/dumux/boxmodels/MpNc/MpNcvolumevariablesia.hh
+++ b/dumux/boxmodels/MpNc/MpNcvolumevariablesia.hh
@@ -52,11 +52,9 @@ class MPNCVolumeVariablesIA
"has been included.");
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
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, VolumeVariables) VolumeVariables;
typedef typename GridView::template Codim<0>::Entity Element;
diff --git a/dumux/boxmodels/MpNc/MpNcvtkwritercommon.hh b/dumux/boxmodels/MpNc/MpNcvtkwritercommon.hh
index 038a8dffc7fc3e4b50644e80ce0ea073fc98ff68..f34369b18905d4bdcd7b68640614d28e9ebef3b4 100644
--- a/dumux/boxmodels/MpNc/MpNcvtkwritercommon.hh
+++ b/dumux/boxmodels/MpNc/MpNcvtkwritercommon.hh
@@ -52,7 +52,6 @@ class MPNCVtkWriterCommon : public MPNCVtkWriterModule<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) LocalResidual;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
@@ -73,7 +72,6 @@ class MPNCVtkWriterCommon : public MPNCVtkWriterModule<TypeTag>
typedef Dune::FieldVector<Scalar, dim> VelocityVector;
typedef Dune::BlockVector<VelocityVector> VelocityField;
- typedef VelocityField VectorField;
typedef std::tr1::array<VelocityField, numPhases> PhaseVelocityField;
public:
diff --git a/dumux/boxmodels/MpNc/MpNcvtkwritermodule.hh b/dumux/boxmodels/MpNc/MpNcvtkwritermodule.hh
index 030de516b19eb3dc905b8888fbad1e7c72f5840b..6fd7906f70c51c4c229e4abf4bca162f3b16fe96 100644
--- a/dumux/boxmodels/MpNc/MpNcvtkwritermodule.hh
+++ b/dumux/boxmodels/MpNc/MpNcvtkwritermodule.hh
@@ -56,7 +56,6 @@ class MPNCVtkWriterModule
typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
typedef typename GridView::template Codim<0>::Entity Element;
diff --git a/dumux/boxmodels/MpNc/diffusion/diffusion.hh b/dumux/boxmodels/MpNc/diffusion/diffusion.hh
index c6fe29a74f683cb3e20ce68bdd7b9133d5cc7d0b..5ab8ac479fecebed95270b9a0123fb0294eb05d1 100644
--- a/dumux/boxmodels/MpNc/diffusion/diffusion.hh
+++ b/dumux/boxmodels/MpNc/diffusion/diffusion.hh
@@ -36,7 +36,6 @@ class MPNCDiffusion
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents)};
diff --git a/dumux/boxmodels/MpNc/diffusion/fluxvariables.hh b/dumux/boxmodels/MpNc/diffusion/fluxvariables.hh
index 5a349f0a49e75118a16701ee7dea7d38d409544b..8f99804257b0b3352a72b5e4c92789f0ad646b67 100644
--- a/dumux/boxmodels/MpNc/diffusion/fluxvariables.hh
+++ b/dumux/boxmodels/MpNc/diffusion/fluxvariables.hh
@@ -43,9 +43,7 @@ class MPNCFluxVariablesDiffusion
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GridView::template Codim<0>::Entity Element;
@@ -61,16 +59,10 @@ class MPNCFluxVariablesDiffusion
};
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
- typedef Dune::FieldVector<Scalar, dimWorld> Vector;
- typedef Dune::FieldVector<Scalar, dim> LocalPosition;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename FVElementGeometry::SubControlVolume SCV;
- typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
- typedef Dune::FieldVector<Scalar, numPhases> PhasesVector;
- typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
public:
MPNCFluxVariablesDiffusion()
@@ -216,9 +208,7 @@ class MPNCFluxVariablesDiffusion<TypeTag, false>
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
public:
diff --git a/dumux/boxmodels/MpNc/diffusion/volumevariables.hh b/dumux/boxmodels/MpNc/diffusion/volumevariables.hh
index 4c9fb17ca2500065e32d23e1be921ff36df4b757..fc550c0e6bb1d1ac61cfacda9fc9989ef954b365 100644
--- a/dumux/boxmodels/MpNc/diffusion/volumevariables.hh
+++ b/dumux/boxmodels/MpNc/diffusion/volumevariables.hh
@@ -40,12 +40,7 @@ class MPNCVolumeVariablesDiffusion
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { lPhaseIdx = FluidSystem::lPhaseIdx };
diff --git a/dumux/boxmodels/MpNc/energy/MpNcfluxvariablesenergy.hh b/dumux/boxmodels/MpNc/energy/MpNcfluxvariablesenergy.hh
index ae1146327107326abf619a657d0c47d5bd87e5fc..72e57580207bfb63ff504f8aea088a6c5d90e16b 100644
--- a/dumux/boxmodels/MpNc/energy/MpNcfluxvariablesenergy.hh
+++ b/dumux/boxmodels/MpNc/energy/MpNcfluxvariablesenergy.hh
@@ -93,8 +93,6 @@ class MPNCFluxVariablesEnergy<TypeTag, /*enableEnergy=*/true, /*kineticEnergyTr
typedef Dune::FieldVector<CoordScalar, dimWorld> Vector;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename FVElementGeometry::SubControlVolume SCV;
- typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
public:
MPNCFluxVariablesEnergy()
diff --git a/dumux/boxmodels/MpNc/energy/MpNclocalresidualenergy.hh b/dumux/boxmodels/MpNc/energy/MpNclocalresidualenergy.hh
index 1a5bb1f4c7f28677553b270aee1a0ac0be710c23..63a587edbe33a601b328e3e2b4c061082d53049b 100644
--- a/dumux/boxmodels/MpNc/energy/MpNclocalresidualenergy.hh
+++ b/dumux/boxmodels/MpNc/energy/MpNclocalresidualenergy.hh
@@ -125,9 +125,7 @@ class MPNCLocalResidualEnergy<TypeTag, /*enableEnergy=*/true, /*kineticenergyTra
enum { conti0EqIdx = Indices::conti0EqIdx };
enum { energyEqIdx = Indices::energyEqIdx };
- typedef Dune::FieldVector<Scalar, dim> Vector;
typedef typename Dune::FieldVector<Scalar, numComponents> ComponentVector;
- typedef typename Dune::FieldMatrix<Scalar, numPhases, numComponents> PhaseComponentMatrix;
diff --git a/dumux/boxmodels/MpNc/energy/MpNcvolumevariablesenergy.hh b/dumux/boxmodels/MpNc/energy/MpNcvolumevariablesenergy.hh
index 0208257182d589fb8de39ff0988fa76e9b428df5..9dd35b569ae486481322a9edc559c0e2ddcbfec2 100644
--- a/dumux/boxmodels/MpNc/energy/MpNcvolumevariablesenergy.hh
+++ b/dumux/boxmodels/MpNc/energy/MpNcvolumevariablesenergy.hh
@@ -53,7 +53,6 @@ class MPNCVolumeVariablesEnergy
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
@@ -114,7 +113,6 @@ template <class TypeTag>
class MPNCVolumeVariablesEnergy<TypeTag, /*enableEnergy=*/true, /*kineticEnergyTransfer=*/false>
{
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
diff --git a/dumux/boxmodels/MpNc/energy/MpNcvtkwriterenergy.hh b/dumux/boxmodels/MpNc/energy/MpNcvtkwriterenergy.hh
index 0e978d21c3e6d984f8acd51f414a75c8d4aaf6e6..2d247ade3a6089ef47d7a06b277dc57f64f33a51 100644
--- a/dumux/boxmodels/MpNc/energy/MpNcvtkwriterenergy.hh
+++ b/dumux/boxmodels/MpNc/energy/MpNcvtkwriterenergy.hh
@@ -58,7 +58,6 @@ class MPNCVtkWriterEnergy : public MPNCVtkWriterModule<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
@@ -145,7 +144,6 @@ class MPNCVtkWriterEnergy<TypeTag, /* enableEnergy = */ true, /* enableKineticEn
typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
diff --git a/dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh b/dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh
index a3657e8191c58b6007a714bc81826a9a48fb4f29..b730a499d867f25ba6837a850c0b9877ffb2f67c 100644
--- a/dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh
+++ b/dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh
@@ -232,7 +232,6 @@ class MPNCLocalResidualMass
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
diff --git a/dumux/boxmodels/MpNc/mass/MpNcvtkwritermass.hh b/dumux/boxmodels/MpNc/mass/MpNcvtkwritermass.hh
index dc68b0b045dd644f5f56e7b0824bc149efd9f3d9..2a5b14097bf72f792945c32168d2bd01e72eeaa3 100644
--- a/dumux/boxmodels/MpNc/mass/MpNcvtkwritermass.hh
+++ b/dumux/boxmodels/MpNc/mass/MpNcvtkwritermass.hh
@@ -51,13 +51,11 @@ class MPNCVtkWriterMass : public MPNCVtkWriterModule<TypeTag>
typedef MPNCVtkWriterModule<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
diff --git a/dumux/linear/domesticoverlapfrombcrsmatrix.hh b/dumux/linear/domesticoverlapfrombcrsmatrix.hh
index 4ddecd40d2c50393a1e6a87107382e8e21a68acd..c82ddbb20f586cc6f3be0ac6b1555647cbdfaa5d 100644
--- a/dumux/linear/domesticoverlapfrombcrsmatrix.hh
+++ b/dumux/linear/domesticoverlapfrombcrsmatrix.hh
@@ -63,16 +63,12 @@ public:
typedef int ProcessRank;
typedef int BorderDistance;
typedef int Index;
- typedef Index PeerIndex;
typedef Index LocalIndex;
- typedef std::pair<LocalIndex, ProcessRank> IndexRank;
typedef std::tr1::tuple<Index, BorderDistance, int> IndexDistanceNpeers;
- typedef std::list<IndexRank> SeedList;
typedef std::set<ProcessRank> PeerSet;
typedef std::list<IndexDistanceNpeers> ForeignOverlapWithPeer;
- typedef std::vector<std::map<ProcessRank, BorderDistance> > ForeignOverlapByIndex;
typedef std::pair<LocalIndex, BorderDistance> IndexDistance;
typedef std::set<LocalIndex> DomesticOverlapWithPeer;
diff --git a/dumux/linear/elementborderlistfromgrid.hh b/dumux/linear/elementborderlistfromgrid.hh
index a67e8dae992a62d76d3867a4ae362696318bee53..827976adf95effe352d2d7c80983ca80abbbceda 100644
--- a/dumux/linear/elementborderlistfromgrid.hh
+++ b/dumux/linear/elementborderlistfromgrid.hh
@@ -58,11 +58,6 @@ template <class GridView, class ElementMapper>
class ElementBorderListFromGrid : public Dune::CommDataHandleIF<ElementBorderListFromGrid<GridView, ElementMapper>,
int >
{
- typedef int ProcessRank;
- typedef int Index;
- typedef int Distance;
- typedef Index LocalIndex;
- typedef Index PeerIndex;
typedef std::list<BorderIndex> BorderList;
public:
diff --git a/dumux/linear/foreignoverlapfrombcrsmatrix.hh b/dumux/linear/foreignoverlapfrombcrsmatrix.hh
index b53b57ab90d4836536deaa8721b3485ed17cbce7..738b076c7795c8066895a772575dbf3cf4b9160a 100644
--- a/dumux/linear/foreignoverlapfrombcrsmatrix.hh
+++ b/dumux/linear/foreignoverlapfrombcrsmatrix.hh
@@ -68,7 +68,6 @@ public:
typedef int ProcessRank;
typedef int BorderDistance;
typedef int Index;
- typedef Index PeerIndex;
typedef Index LocalIndex;
typedef std::pair<LocalIndex, ProcessRank> IndexRank;
typedef std::tr1::tuple<LocalIndex, ProcessRank, BorderDistance> IndexRankDist;
diff --git a/dumux/linear/globalindices.hh b/dumux/linear/globalindices.hh
index 060c20c0981eb8cda34f44497cda28ba5da69af8..fbdd38853f80a9ee8eda7f4ceba730e5be91e525 100644
--- a/dumux/linear/globalindices.hh
+++ b/dumux/linear/globalindices.hh
@@ -61,34 +61,13 @@ class GlobalIndices
{}
typedef int ProcessRank;
- typedef int BorderDistance;
typedef int Index;
- typedef Index PeerIndex;
- typedef Index DomesticIndex;
- typedef std::pair<DomesticIndex, ProcessRank> IndexRank;
- typedef std::pair<PeerIndex, BorderDistance> IndexDistance;
- typedef std::tr1::tuple<Index, BorderDistance, int> IndexDistanceNpeers;
- typedef std::list<IndexRank> SeedList;
- typedef std::pair<ProcessRank, int> ProcessDistance;
typedef std::set<ProcessRank> PeerSet;
- typedef std::list<IndexDistanceNpeers> ForeignOverlapWithPeer;
- typedef std::map<ProcessRank, ForeignOverlapWithPeer> ForeignOverlapByRank;
- typedef std::vector<std::map<ProcessRank, BorderDistance> > ForeignOverlapByIndex;
- typedef std::vector<IndexDistanceNpeers> DomesticOverlapWithPeer;
- typedef std::map<ProcessRank, DomesticOverlapWithPeer> DomesticOverlap;
- typedef std::map<ProcessRank, std::set<PeerIndex> > DomesticFront;
- typedef std::map<ProcessRank, std::set<DomesticIndex> > ForeignFront;
- typedef std::map<PeerIndex, DomesticIndex> BorderWithPeer;
- typedef std::map<ProcessRank, BorderWithPeer> DomesticBorder;
typedef std::list<BorderIndex> BorderList;
- typedef std::map<PeerIndex, DomesticIndex> PeerToDomesticMap;
- typedef std::map<ProcessRank, PeerToDomesticMap> ForeignToDomesticMap;
- typedef std::map<DomesticIndex, PeerIndex> DomesticToPeerMap;
- typedef std::map<ProcessRank, DomesticToPeerMap > DomesticToForeignMap;
typedef std::map<Index, Index> GlobalToDomesticMap;
typedef std::map<Index, Index> DomesticToGlobalMap;
diff --git a/dumux/linear/overlappingbcrsmatrix.hh b/dumux/linear/overlappingbcrsmatrix.hh
index 72483206d648d1cd63fc4bbdaaee27c4a8b45c25..9c4f4194d14cb56dec7b3c62f735d5365eb24525 100644
--- a/dumux/linear/overlappingbcrsmatrix.hh
+++ b/dumux/linear/overlappingbcrsmatrix.hh
@@ -54,15 +54,11 @@ public:
private:
typedef typename Overlap::Index Index;
- typedef typename Overlap::Index RowIndex;
typedef typename Overlap::Index ColIndex;
typedef typename Overlap::PeerSet PeerSet;
typedef typename Overlap::BorderList BorderList;
typedef typename Overlap::ProcessRank ProcessRank;
typedef typename Overlap::ForeignOverlapWithPeer ForeignOverlapWithPeer;
- typedef std::vector<ColIndex> PeerColumns;
- typedef std::pair<RowIndex, PeerColumns> PeerRow;
- typedef std::vector<PeerRow> PeerRows;
typedef std::vector<std::set<ColIndex> > Entries;
diff --git a/dumux/linear/overlappingoperator.hh b/dumux/linear/overlappingoperator.hh
index 673745a17977649f37f077c725f5ed83fce3c6d2..0354aec4f6af7afaab23464b396fdc74d8b083b7 100644
--- a/dumux/linear/overlappingoperator.hh
+++ b/dumux/linear/overlappingoperator.hh
@@ -40,9 +40,7 @@ class OverlappingOperator :
{
public:
//! export types
- typedef OverlappingMatrix matrix_type;
typedef DomainVector domain_type;
- typedef RangeVector range_type;
typedef typename domain_type::field_type field_type;
//redefine the category, that is the only difference
diff --git a/dumux/linear/overlappingscalarproduct.hh b/dumux/linear/overlappingscalarproduct.hh
index 1f366a20113499d9445cf94e7f81c3b4cdf0e3c1..9d24fe04c51e4138bea17d2710963d9cafba2d83 100644
--- a/dumux/linear/overlappingscalarproduct.hh
+++ b/dumux/linear/overlappingscalarproduct.hh
@@ -40,7 +40,6 @@ class OverlappingScalarProduct : public Dune::ScalarProduct<OverlappingBlockVect
{
public:
typedef typename OverlappingBlockVector::field_type field_type;
- typedef OverlappingBlockVector domain_type;
enum { category = Dune::SolverCategory::overlapping };
diff --git a/dumux/linear/vertexborderlistfromgrid.hh b/dumux/linear/vertexborderlistfromgrid.hh
index baf8200033e7a96b94dbf69cf5e326a464731690..f5463d556ab6d48b15897fd6277e03861c9112c0 100644
--- a/dumux/linear/vertexborderlistfromgrid.hh
+++ b/dumux/linear/vertexborderlistfromgrid.hh
@@ -57,10 +57,6 @@ template <class GridView, class VertexMapper>
class VertexBorderListFromGrid : public Dune::CommDataHandleIF<VertexBorderListFromGrid<GridView, VertexMapper>,
int >
{
- typedef int ProcessRank;
- typedef int Index;
- typedef Index LocalIndex;
- typedef Index PeerIndex;
typedef std::list<BorderIndex> BorderList;
public:
diff --git a/dumux/material/components/ch4.hh b/dumux/material/components/ch4.hh
index 922b5e781b1df125063c418e6930208a5607fb68..715c07c875aef241b4a9e03519d55e31a220b92e 100644
--- a/dumux/material/components/ch4.hh
+++ b/dumux/material/components/ch4.hh
@@ -48,7 +48,6 @@ namespace Dumux
template <class Scalar>
class CH4 : public Component<Scalar, CH4<Scalar> >
{
- typedef Component<Scalar, CH4<Scalar> > ParentType;
typedef Dumux::IdealGas<Scalar> IdealGas;
public:
diff --git a/dumux/material/components/h2.hh b/dumux/material/components/h2.hh
index 3b6d5ad9c71d6017f66055f51a5ee4d3dd74f853..716a77bf22c8beff2eac3dae5f2bf699fd8a4cba 100644
--- a/dumux/material/components/h2.hh
+++ b/dumux/material/components/h2.hh
@@ -48,7 +48,6 @@ namespace Dumux
template <class Scalar>
class H2 : public Component<Scalar, H2<Scalar> >
{
- typedef Component<Scalar, H2<Scalar> > ParentType;
typedef Dumux::IdealGas<Scalar> IdealGas;
public:
diff --git a/dumux/material/components/h2o.hh b/dumux/material/components/h2o.hh
index 0c8e302fa8ee1e712bdb8874d283eccf23c157ab..9c3c4a5e9e641f7772abeab9e499b4f2c0def7b6 100644
--- a/dumux/material/components/h2o.hh
+++ b/dumux/material/components/h2o.hh
@@ -61,7 +61,6 @@ namespace Dumux
template <class Scalar>
class H2O : public Component<Scalar, H2O<Scalar> >
{
- typedef Component<Scalar, H2O<Scalar> > ParentType;
typedef IAPWS::Common<Scalar> Common;
typedef IAPWS::Region1<Scalar> Region1;
diff --git a/dumux/material/components/n2.hh b/dumux/material/components/n2.hh
index 6d2ec66fd763fd38ec7307efbc3bf953f0e32fe9..b9a978a76f8bd9fc5afa302354fe8741a63060d2 100644
--- a/dumux/material/components/n2.hh
+++ b/dumux/material/components/n2.hh
@@ -48,7 +48,6 @@ namespace Dumux
template <class Scalar>
class N2 : public Component<Scalar, N2<Scalar> >
{
- typedef Component<Scalar, N2<Scalar> > ParentType;
typedef Dumux::IdealGas<Scalar> IdealGas;
public:
diff --git a/dumux/material/components/o2.hh b/dumux/material/components/o2.hh
index 468f4b7ae45cbc07cb03b805422498df86c6bc33..8f137aa4ca6d4083c69ac6546af5389ff0f749c9 100644
--- a/dumux/material/components/o2.hh
+++ b/dumux/material/components/o2.hh
@@ -48,7 +48,6 @@ namespace Dumux
template <class Scalar>
class O2 : public Component<Scalar, O2<Scalar> >
{
- typedef Component<Scalar, O2<Scalar> > ParentType;
typedef Dumux::IdealGas<Scalar> IdealGas;
public:
diff --git a/dumux/material/components/oil.hh b/dumux/material/components/oil.hh
index 30c32ad817612dc8246f1894b142fb0fd6bc304e..f0704a67abddaf23295f393190939c97a3d7bdf0 100644
--- a/dumux/material/components/oil.hh
+++ b/dumux/material/components/oil.hh
@@ -42,7 +42,6 @@ namespace Dumux
template <class Scalar>
class Oil : public Component<Scalar, Oil<Scalar> >
{
- typedef Component<Scalar, Oil<Scalar> > ParentType;
public:
/*!
diff --git a/dumux/material/components/simplednapl.hh b/dumux/material/components/simplednapl.hh
index 6f787dddef427bdbbc9557d6d62b2644f8818abd..9cbdf24da8a7cd699189aea51805e79f50406d6c 100644
--- a/dumux/material/components/simplednapl.hh
+++ b/dumux/material/components/simplednapl.hh
@@ -43,7 +43,6 @@ namespace Dumux
template <class Scalar>
class SimpleDNAPL : public Component<Scalar, SimpleDNAPL<Scalar> >
{
- typedef Component<Scalar, SimpleDNAPL<Scalar> > ParentType;
public:
/*!
diff --git a/dumux/material/components/simpleh2o.hh b/dumux/material/components/simpleh2o.hh
index fba5f30efe2322b5548b23a626b7c087ff385bef..256c552c1fa1045f2140fa8f02d672f22a095fbd 100644
--- a/dumux/material/components/simpleh2o.hh
+++ b/dumux/material/components/simpleh2o.hh
@@ -47,7 +47,6 @@ namespace Dumux
template <class Scalar>
class SimpleH2O : public Component<Scalar, SimpleH2O<Scalar> >
{
- typedef Component<Scalar, SimpleH2O<Scalar> > ParentType;
typedef Dumux::IdealGas<Scalar> IdealGas;
static const Scalar R; // specific gas constant of water
diff --git a/dumux/material/components/unit.hh b/dumux/material/components/unit.hh
index 6bcd57b6283da278e52b2e6ce34f961cb76aff11..5cb262b5b8d9ef3a039ca7efb03ddba2fcb7b596 100644
--- a/dumux/material/components/unit.hh
+++ b/dumux/material/components/unit.hh
@@ -42,7 +42,6 @@ namespace Dumux
template <class Scalar>
class Unit : public Component<Scalar, Unit<Scalar> >
{
- typedef Component<Scalar, Unit<Scalar> > ParentType;
public:
/*!
diff --git a/dumux/material/constraintsolvers/misciblemultiphasecomposition.hh b/dumux/material/constraintsolvers/misciblemultiphasecomposition.hh
index 0d6faeb190211670ec1ae6c3e8f9bf1d4a3233e1..10a4fdc70d8c63dd4a026e471e3200d1ccbaea5e 100644
--- a/dumux/material/constraintsolvers/misciblemultiphasecomposition.hh
+++ b/dumux/material/constraintsolvers/misciblemultiphasecomposition.hh
@@ -69,7 +69,6 @@ class MiscibleMultiPhaseComposition
"This solver requires that the number fluid phases is equal "
"to the number of components");
- typedef Dune::FieldVector<Scalar, numComponents> ComponentVector;
public:
/*!
diff --git a/dumux/material/eos/pengrobinsonparamsmixture.hh b/dumux/material/eos/pengrobinsonparamsmixture.hh
index a60bc8aebd50d37da5f0718d765178e1e8e741e3..1cfabdc6206809f78f0135fc523a5ff06cc17139 100644
--- a/dumux/material/eos/pengrobinsonparamsmixture.hh
+++ b/dumux/material/eos/pengrobinsonparamsmixture.hh
@@ -56,7 +56,6 @@ class PengRobinsonParamsMixture : public PengRobinsonParams<Scalar>
typedef Dumux::PengRobinsonParams<Scalar> PureParams;
// The Peng-Robinson EOS for this mixture
- typedef Dumux::PengRobinson<Scalar> PengRobinson;
// number of components of which the fluid is composed
enum { numComponents = StaticParams::numComponents };
@@ -65,7 +64,6 @@ class PengRobinsonParamsMixture : public PengRobinsonParams<Scalar>
static constexpr Scalar R = Dumux::Constants<Scalar>::R;
public:
- typedef StaticParams StaticParameters;
/*!
* \brief Update Peng-Robinson parameters for the pure components.
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterialparams.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterialparams.hh
index cf45dca6c0077e4d00f7112ff05a885d799f2994..754f9a0275eb4a0fbe32bf0c3805ee922b1724ef 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterialparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedlinearmaterialparams.hh
@@ -44,8 +44,6 @@ class RegularizedLinearMaterialParams : public LinearMaterialParams<ScalarT>
{
public:
typedef ScalarT Scalar;
- typedef LinearMaterialParams<Scalar> Parent;
- typedef RegularizedLinearMaterialParams<Scalar> Self;
RegularizedLinearMaterialParams()
{}
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh
index af78efe3454f66e82905d8ab61a00bdd4fd8d2bc..2acd2d069090b210ce45f3df6bf82a40fe322f75 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh
@@ -47,7 +47,6 @@ class RegularizedVanGenuchtenParams : public VanGenuchtenParams<ScalarT>
public:
typedef ScalarT Scalar;
typedef VanGenuchtenParams<Scalar> Parent;
- typedef RegularizedVanGenuchtenParams<Scalar> Self;
RegularizedVanGenuchtenParams()
{}
diff --git a/dumux/material/fluidsystems/h2on2fluidsystem.hh b/dumux/material/fluidsystems/h2on2fluidsystem.hh
index afc0db8b211c7d790be75a393e83352369f53ece..de5e897bdfd5ddd15bef8345511c71708ae43098 100644
--- a/dumux/material/fluidsystems/h2on2fluidsystem.hh
+++ b/dumux/material/fluidsystems/h2on2fluidsystem.hh
@@ -72,7 +72,6 @@ class H2ON2
typedef Dumux::IdealGas<Scalar> IdealGas;
typedef Dumux::H2O<Scalar> IapwsH2O;
- typedef Dumux::SimpleH2O<Scalar> SimpleH2O;
typedef Dumux::TabulatedComponent<Scalar, IapwsH2O > TabulatedH2O;
diff --git a/dumux/material/old_fluidsystems/2p_system.hh b/dumux/material/old_fluidsystems/2p_system.hh
index 8733f654657afa31eb3923c7b94ffbea16dc1001..21817229812aba2e9b1f051423691815e5554384 100644
--- a/dumux/material/old_fluidsystems/2p_system.hh
+++ b/dumux/material/old_fluidsystems/2p_system.hh
@@ -57,7 +57,6 @@ NEW_PROP_TAG(NonwettingPhase);
template <class TypeTag>
class FluidSystem2P
{
- typedef FluidSystem2P<TypeTag> ThisType;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, WettingPhase) WettingPhase;
typedef typename GET_PROP_TYPE(TypeTag, NonwettingPhase) NonwettingPhase;
diff --git a/dumux/material/spatialparameters/boxspatialparameters.hh b/dumux/material/spatialparameters/boxspatialparameters.hh
index ebf14c147a567f572fcd2c1bec23611bde41938a..ac55f3e55f612a89a3e476c8544144ec3c48fc07 100644
--- a/dumux/material/spatialparameters/boxspatialparameters.hh
+++ b/dumux/material/spatialparameters/boxspatialparameters.hh
@@ -50,7 +50,6 @@ NEW_PROP_TAG(MaterialLawParams);
template<class TypeTag>
class BoxSpatialParameters: public BoxSpatialParametersOneP<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) Implementation;
diff --git a/dumux/nonlinear/newtoncontroller.hh b/dumux/nonlinear/newtoncontroller.hh
index 02d7ad9348f0981a618efd40e70879999b06f20e..484d3c061a6f12b94453a81cf8b7439bf8dac15e 100644
--- a/dumux/nonlinear/newtoncontroller.hh
+++ b/dumux/nonlinear/newtoncontroller.hh
@@ -340,7 +340,6 @@ public:
{
// calculate the relative error as the maximum relative
// deflection in any degree of freedom.
- typedef typename SolutionVector::block_type FV;
error_ = 0;
for (int i = 0; i < int(uLastIter.size()); ++i) {
diff --git a/dumux/nonlinear/newtonconvergencewriter.hh b/dumux/nonlinear/newtonconvergencewriter.hh
index 165ef3a935f975c2b47fcc6a946811d885118958..dadbbfa37db7a72f3311fc528af2b036cd6661de 100644
--- a/dumux/nonlinear/newtonconvergencewriter.hh
+++ b/dumux/nonlinear/newtonconvergencewriter.hh
@@ -44,7 +44,6 @@ struct NewtonConvergenceWriter
typedef typename GET_PROP_TYPE(TypeTag, NewtonController) NewtonController;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) JacobianMatrix;
typedef Dumux::VtkMultiWriter<GridView> VtkMultiWriter;
diff --git a/test/boxmodels/1p/1ptestproblem.hh b/test/boxmodels/1p/1ptestproblem.hh
index b3ed88b5327fd0fe6709a4a07fcbcfb216a3a2f8..51bb003bf056570c3e3053d1c5773ec2ff6bdb2c 100644
--- a/test/boxmodels/1p/1ptestproblem.hh
+++ b/test/boxmodels/1p/1ptestproblem.hh
@@ -108,7 +108,6 @@ SET_BOOL_PROP(OnePTestProblem, EnableGravity, true);
template <class TypeTag = TTAG(OnePTestProblem) >
class OnePTestProblem : public OnePBoxProblem<TypeTag>
{
- typedef OnePTestProblem<TypeTag> ThisType;
typedef OnePBoxProblem<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
@@ -136,7 +135,6 @@ class OnePTestProblem : public OnePBoxProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef Dune::FieldVector<Scalar, dim> LocalPosition;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
public:
diff --git a/test/boxmodels/1p2c/tissue_tumor_problem.hh b/test/boxmodels/1p2c/tissue_tumor_problem.hh
index 3f99531376139c48c90c9c663b58009bb0bab59d..54a2a1af1d643a1cc01f122bd8910646bdc67b14 100644
--- a/test/boxmodels/1p2c/tissue_tumor_problem.hh
+++ b/test/boxmodels/1p2c/tissue_tumor_problem.hh
@@ -123,7 +123,6 @@ SET_BOOL_PROP(TissueTumorProblem, EnableGravity, false);
template <class TypeTag = TTAG(TissueTumorProblem) >
class TissueTumorProblem : public OnePTwoCBoxProblem<TypeTag>
{
- typedef TissueTumorProblem<TypeTag> ThisType;
typedef OnePTwoCBoxProblem<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
diff --git a/test/boxmodels/1p2c/tissue_tumor_spatialparameters.hh b/test/boxmodels/1p2c/tissue_tumor_spatialparameters.hh
index ce3ac02cedc7ee8cb5fbd97f4a998953dac5cf6d..3f3f7a9860045b822a456f12a67c78d8c10a8a6f 100644
--- a/test/boxmodels/1p2c/tissue_tumor_spatialparameters.hh
+++ b/test/boxmodels/1p2c/tissue_tumor_spatialparameters.hh
@@ -57,21 +57,15 @@ class TissueTumorSpatialParameters : public BoxSpatialParametersOneP<TypeTag>
dimWorld=GridView::dimensionworld
};
- typedef Dune::FieldVector<CoordScalar,dim> LocalPosition;
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
- typedef Dune::FieldVector<CoordScalar,dimWorld> Vector;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::template Codim<0>::Entity Element;
- typedef RegularizedBrooksCorey<Scalar> EffMaterialLaw;
//typedef LinearMaterial<Scalar> EffMaterialLaw;
public:
TissueTumorSpatialParameters(const GridView &gv)
diff --git a/test/boxmodels/2p/lensproblem.hh b/test/boxmodels/2p/lensproblem.hh
index 8131dcd0a9159b5122d8a434737e291af68d5c4e..486804310f3a51ac0e70caec1f7fb2d22512bf34 100644
--- a/test/boxmodels/2p/lensproblem.hh
+++ b/test/boxmodels/2p/lensproblem.hh
@@ -152,7 +152,6 @@ SET_BOOL_PROP(LensProblem, EnableGravity, true);
template <class TypeTag >
class LensProblem : public TwoPProblem<TypeTag>
{
- typedef LensProblem<TypeTag> ThisType;
typedef TwoPProblem<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
@@ -191,14 +190,10 @@ class LensProblem : public TwoPProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::template Codim<dim>::Entity Vertex;
typedef typename GridView::Intersection Intersection;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dune::FieldVector<Scalar, dim> LocalPosition;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
public:
diff --git a/test/boxmodels/2p2c/injectionproblem.hh b/test/boxmodels/2p2c/injectionproblem.hh
index 46626f5381ba8321117dd546eb60aef2c5a70010..d63c42861e92c28209fc80484dfecd361ffcba20 100644
--- a/test/boxmodels/2p2c/injectionproblem.hh
+++ b/test/boxmodels/2p2c/injectionproblem.hh
@@ -96,7 +96,6 @@ SET_BOOL_PROP(InjectionProblem, EnableVelocityOutput, false);
template <class TypeTag = TTAG(InjectionProblem) >
class InjectionProblem : public TwoPTwoCProblem<TypeTag>
{
- typedef InjectionProblem<TypeTag> ThisType;
typedef TwoPTwoCProblem<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
diff --git a/test/boxmodels/2p2c/injectionspatialparameters.hh b/test/boxmodels/2p2c/injectionspatialparameters.hh
index e19c131f289d0b988e8cbdab0becce1c6268559c..3f034308031d920556c6a372b5924d3ba102fff1 100644
--- a/test/boxmodels/2p2c/injectionspatialparameters.hh
+++ b/test/boxmodels/2p2c/injectionspatialparameters.hh
@@ -90,14 +90,12 @@ class InjectionSpatialParameters : public BoxSpatialParameters<TypeTag>
gPhaseIdx = FluidSystem::gPhaseIdx
};
- typedef Dune::FieldVector<CoordScalar,dim> LocalPosition;
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
typedef Dune::FieldVector<CoordScalar,dimWorld> Vector;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
diff --git a/test/boxmodels/2p2cni/waterairproblem.hh b/test/boxmodels/2p2cni/waterairproblem.hh
index cda85c1b20da9107b1a43929402d34074fc8904f..c9b1600e2188fd53798fead63cdd5fede2ea1ab5 100644
--- a/test/boxmodels/2p2cni/waterairproblem.hh
+++ b/test/boxmodels/2p2cni/waterairproblem.hh
@@ -114,10 +114,8 @@ class WaterAirProblem : public TwoPTwoCNIProblem<TypeTag>
{
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
typedef typename GridView::Grid Grid;
- typedef WaterAirProblem<TypeTag> ThisType;
typedef TwoPTwoCNIProblem<TypeTag> ParentType;
// copy some indices for convenience
@@ -154,7 +152,6 @@ class WaterAirProblem : public TwoPTwoCNIProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef Dune::FieldVector<Scalar, dim> LocalPosition;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
public:
diff --git a/test/boxmodels/2p2cni/waterairspatialparameters.hh b/test/boxmodels/2p2cni/waterairspatialparameters.hh
index ec8bdc70ab94336c6bafe87f2d634221b278ca05..ec669d029ec5918fba33a0030d6f24f6b99bcce0 100644
--- a/test/boxmodels/2p2cni/waterairspatialparameters.hh
+++ b/test/boxmodels/2p2cni/waterairspatialparameters.hh
@@ -89,21 +89,18 @@ class WaterAirSpatialParameters : public BoxSpatialParameters<TypeTag>
gPhaseIdx = Indices::gPhaseIdx
};
- typedef Dune::FieldVector<CoordScalar,dim> LocalPosition;
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
typedef Dune::FieldVector<CoordScalar,dimWorld> Vector;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
diff --git a/test/boxmodels/2pni/injectionproblem2pni.hh b/test/boxmodels/2pni/injectionproblem2pni.hh
index cc3fb3b217069bb44f99179fdf9d3c5488a36df9..72342ae5c4a11655e9543c6fa581dd4179c36908 100644
--- a/test/boxmodels/2pni/injectionproblem2pni.hh
+++ b/test/boxmodels/2pni/injectionproblem2pni.hh
@@ -144,7 +144,6 @@ class InjectionProblem2PNI
: public TwoPNIProblem<TypeTag>
#endif
{
- typedef InjectionProblem2PNI<TypeTag> ThisType;
typedef TwoPNIProblem<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -184,7 +183,6 @@ class InjectionProblem2PNI
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef Dune::FieldVector<Scalar, dim> LocalPosition;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
public:
diff --git a/test/boxmodels/MpNc/obstacleproblem.hh b/test/boxmodels/MpNc/obstacleproblem.hh
index bb76421d3a4aff227d390cd78c1732d977def747..6df7736f39c18138b036625e07ad0a185129be57 100644
--- a/test/boxmodels/MpNc/obstacleproblem.hh
+++ b/test/boxmodels/MpNc/obstacleproblem.hh
@@ -128,7 +128,6 @@ template <class TypeTag>
class ObstacleProblem
: public MPNCProblem<TypeTag>
{
- typedef ObstacleProblem<TypeTag> ThisType;
typedef MPNCProblem<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
diff --git a/test/boxmodels/MpNc/obstaclespatialparameters.hh b/test/boxmodels/MpNc/obstaclespatialparameters.hh
index 760b4bfdbfb24d3c9a67513ebee538c6877c0018..3c990977ea1faaeac4ead9b7f4c3770dc0254f75 100644
--- a/test/boxmodels/MpNc/obstaclespatialparameters.hh
+++ b/test/boxmodels/MpNc/obstaclespatialparameters.hh
@@ -81,8 +81,6 @@ class ObstacleSpatialParameters : public BoxSpatialParameters<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
@@ -100,7 +98,6 @@ class ObstacleSpatialParameters : public BoxSpatialParameters<TypeTag>
typedef typename GridView::template Codim<0>::Entity Element;
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
- typedef Dune::FieldVector<Scalar,dimWorld> Vector;
public:
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
diff --git a/test/boxmodels/richards/richardslensproblem.hh b/test/boxmodels/richards/richardslensproblem.hh
index da3ccdd63aab1516e8000cb08387f1fc6244fcb4..c32530b22a7207eb4d0ee68afb2ecec2b3d08fe6 100644
--- a/test/boxmodels/richards/richardslensproblem.hh
+++ b/test/boxmodels/richards/richardslensproblem.hh
@@ -123,7 +123,6 @@ SET_BOOL_PROP(RichardsLensProblem, NewtonWriteConvergence, false);
template <class TypeTag>
class RichardsLensProblem : public RichardsBoxProblem<TypeTag>
{
- typedef RichardsLensProblem<TypeTag> ThisType;
typedef RichardsBoxProblem<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
@@ -145,7 +144,6 @@ class RichardsLensProblem : public RichardsBoxProblem<TypeTag>
};
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::template Codim<dim>::Entity Vertex;
typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<Scalar, dim> GlobalPosition;
diff --git a/tutorial/tutorialspatialparameters_coupled.hh b/tutorial/tutorialspatialparameters_coupled.hh
index f98943063c60eda22c7921ccf8839a6d9d2084b2..d8b150ee9db29442331610d4b198d89850675b2f 100644
--- a/tutorial/tutorialspatialparameters_coupled.hh
+++ b/tutorial/tutorialspatialparameters_coupled.hh
@@ -82,7 +82,6 @@ class TutorialSpatialParametersCoupled: public BoxSpatialParameters<TypeTag> /*@
dim = Grid::dimension,
dimWorld = Grid::dimensionworld
};
- typedef Dune::FieldVector<Scalar, dim> GlobalPosition;
// Get object types for function arguments
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;