diff --git a/dumux/decoupled/1p/1pproperties.hh b/dumux/decoupled/1p/1pproperties.hh
index b590c1a34a1dd6bef276a851f6a340adb436e013..1939decae75256063375e5645e6318276c726a18 100644
--- a/dumux/decoupled/1p/1pproperties.hh
+++ b/dumux/decoupled/1p/1pproperties.hh
@@ -58,7 +58,6 @@ NEW_TYPE_TAG(DecoupledOneP, INHERITS_FROM(DecoupledModel));
// Property tags
//////////////////////////////////////////////////////////////////
-NEW_PROP_TAG( SpatialParameters ); //!< The type of the spatial parameters object
NEW_PROP_TAG( SpatialParams ); //!< The type of the spatial parameters object
NEW_PROP_TAG( ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
NEW_PROP_TAG( Fluid ); //!< The fluid for one-phase models
diff --git a/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh b/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh
index c3f7fc94989edb24f42d0c911ce06ae8afc7367a..7c4563fbb159f04a7fed6e60225e44bc04833c66 100644
--- a/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh
+++ b/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh
@@ -55,7 +55,6 @@ class DiffusionProblem1P: public OneModelProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
// material properties
- typedef typename GET_PROP_TYPE(TypeTag, Fluid) Fluid;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
diff --git a/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh b/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh
index 01e6f2538103d2ae44bb79f8fc6a03a5dcf98670..ff16275f2faa999a0601acd4f6ab5577003b5c88 100644
--- a/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh
+++ b/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh
@@ -60,8 +60,6 @@ template<class TypeTag> class FVPressure1P: public FVPressure<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
-
typedef typename GET_PROP_TYPE(TypeTag, Fluid) Fluid;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
@@ -87,9 +85,7 @@ template<class TypeTag> class FVPressure1P: public FVPressure<TypeTag>
typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
- typedef typename GridView::Grid Grid;
typedef typename GridView::template Codim<0>::EntityPointer ElementPointer;
- typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
diff --git a/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh b/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
index 94ee1dd09a057df046b25ecde2356de2d7cc831c..ee874e195250c7060384294ed02e3528be984b00 100644
--- a/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
+++ b/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
@@ -51,7 +51,6 @@ class FVVelocity1P
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename GET_PROP_TYPE(TypeTag, Fluid) Fluid;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
diff --git a/dumux/decoupled/1p/fluxData1p.hh b/dumux/decoupled/1p/fluxData1p.hh
index 93373efdc31ab85533216a38f9310d4631cc8b9c..d2bc84a075d658f266217251a21eabe35367d4cb 100644
--- a/dumux/decoupled/1p/fluxData1p.hh
+++ b/dumux/decoupled/1p/fluxData1p.hh
@@ -42,8 +42,6 @@ class FluxData1P
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GridView::IntersectionIterator IntersectionIterator;
- typedef typename GridView::Traits::template Codim<0>::Entity Element;
enum
{
diff --git a/dumux/decoupled/2p/cellData2padaptive.hh b/dumux/decoupled/2p/cellData2padaptive.hh
index 8e0064ebab2d9a8c2ab239dd4a59d877f19fd1d6..99e2b732b481e97341c8db1f34c9c7c5b5a7ab6f 100644
--- a/dumux/decoupled/2p/cellData2padaptive.hh
+++ b/dumux/decoupled/2p/cellData2padaptive.hh
@@ -43,15 +43,11 @@ template<class TypeTag, bool enableCompressibility = GET_PROP_VALUE(TypeTag, Ena
class CellData2PAdaptive: public CellData2P<TypeTag, enableCompressibility>
{
private:
- typedef CellData2P<TypeTag, enableCompressibility> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::Grid Grid;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef FluxData2P<TypeTag> FluxData;
- typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
- typedef Dune::FieldVector<Scalar, GridView::dimensionworld> GlobalPosition;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
enum
diff --git a/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh b/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh
index f60b9481b7dcab1769a168e7ec2e35eec1acb299..5acb522ecaa77fec2bd836bde5f2a772f305881c 100644
--- a/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh
+++ b/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh
@@ -51,7 +51,6 @@ class DiffusionProblem2P: public OneModelProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
// material properties
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
index 05d97d3d094be29555e56552a6c6cb083d36dc32..667853fd745bff10f90dccd0ad18bda0366d7e19 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
@@ -46,15 +46,11 @@ template<class TypeTag> class FVPressure2PAdaptive: public FVPressure2P<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
- typedef typename SpatialParams::MaterialLaw MaterialLaw;
-
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
@@ -85,7 +81,6 @@ template<class TypeTag> class FVPressure2PAdaptive: public FVPressure2P<TypeTag>
rhs = ParentType::rhs, matrix = ParentType::matrix
};
- typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::EntityPointer ElementPointer;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::Intersection Intersection;
diff --git a/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
index 00ba0c43c517de6675407bb5114bbd72d3865595..75dc5b0115e79944e2cf4f046fb28a9a1e27728e 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
@@ -43,20 +43,13 @@ class FVVelocity2PAdaptive: public FVVelocity2P<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
- typedef typename SpatialParams::MaterialLaw MaterialLaw;
-
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
- typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
-typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename GridView::Intersection Intersection;
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh
index a069b31248e486a0d8313b97e77dc8d0997da99e..fe8afbbe11390d5f515aea0b86abf6c2ffe7169f 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundpressure2p.hh
@@ -121,7 +121,6 @@ class FVMPFAL2PFABoundPressure2P: public FVPressure<TypeTag>
typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::template Codim<dim>::Iterator VertexIterator;
- typedef typename GridView::Grid Grid;
typedef typename GridView::template Codim<0>::EntityPointer ElementPointer;
typedef typename GridView::IntersectionIterator IntersectionIterator;
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh
index 9c9a6bd1e684a72d4839e39e784c61db2ce0b0d8..1616ccc2b633658076e1d18b6b6b08dda2f4f394 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2p.hh
@@ -73,12 +73,10 @@ template<class TypeTag> class FVMPFAL2PFABoundVelocity2P: public FVMPFAL2PFABoun
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
- typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::Grid Grid;
typedef typename GridView::IndexSet IndexSet;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
@@ -86,8 +84,6 @@ template<class TypeTag> class FVMPFAL2PFABoundVelocity2P: public FVMPFAL2PFABoun
typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename Grid::template Codim<0>::EntityPointer ElementPointer;
- typedef typename GET_PROP_TYPE(TypeTag, GridTypeIndices) GridTypeIndices;
-
typedef typename ParentType::InteractionVolume InteractionVolume;
enum
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh
index 12915c4ad2c9e17f59db5babee1fc957b827f3e3..0adc7ac8f2bea5607e1ec96d305f6f552efcb987 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/lmethod/fvmpfal2pfaboundvelocity2padaptive.hh
@@ -80,7 +80,6 @@ template<class TypeTag> class FVMPFAL2PFABoundVelocity2PAdaptive: public FVMPFAL
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
- typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::Grid Grid;
typedef typename GridView::IndexSet IndexSet;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
@@ -88,8 +87,6 @@ template<class TypeTag> class FVMPFAL2PFABoundVelocity2PAdaptive: public FVMPFAL
typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename Grid::template Codim<0>::EntityPointer ElementPointer;
- typedef typename GET_PROP_TYPE(TypeTag, GridTypeIndices) GridTypeIndices;
-
typedef typename ParentType::InteractionVolume InteractionVolume;
enum
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh
index 0101f2c4687f8b55df2258e97a28e2aa96493806..45c353bc4c7fc6579517a2bc71f8b949c6319014 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundpressure2p.hh
@@ -119,7 +119,6 @@ class FVMPFAO2PFABoundPressure2P: public FVPressure<TypeTag>
typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::template Codim<dim>::Iterator VertexIterator;
- typedef typename GridView::Grid Grid;
typedef typename GridView::template Codim<0>::EntityPointer ElementPointer;
typedef typename GridView::IntersectionIterator IntersectionIterator;
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh
index 2757b3998fc16bbcded04b9ec826b21c6180e83f..99896d86e432a378a020fc5e3edecde644046925 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfao2pfaboundvelocity2p.hh
@@ -73,12 +73,10 @@ template<class TypeTag> class FVMPFAO2PFABoundVelocity2P: public FVMPFAO2PFABoun
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
- typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::Grid Grid;
typedef typename GridView::IndexSet IndexSet;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
@@ -86,8 +84,6 @@ template<class TypeTag> class FVMPFAO2PFABoundVelocity2P: public FVMPFAO2PFABoun
typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename Grid::template Codim<0>::EntityPointer ElementPointer;
- typedef typename GET_PROP_TYPE(TypeTag, GridTypeIndices) GridTypeIndices;
-
typedef Dumux::FVMPFAOInteractionVolume<TypeTag> InteractionVolume;
enum
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh
index e8757bc861fcd4e17cdda3e13c403ff04c482656..30d1a6ca4fa89df5f10f7c23f25f0064a801f1ff 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/omethod/fvmpfaopressure2p.hh
@@ -111,7 +111,6 @@ class FVMPFAOPressure2P: public FVPressure<TypeTag>
typedef Dune::FieldMatrix<Scalar, dim, dim> DimMatrix;
typedef typename GET_PROP_TYPE(TypeTag, PressureCoefficientMatrix) Matrix;
- typedef typename GET_PROP_TYPE(TypeTag, PressureRHSVector) Vector;
typedef Dune::FieldVector<Scalar, dim> DimVector;
//initializes the matrix to store the system of equations
diff --git a/dumux/decoupled/2p/diffusion/mimetic/croperator.hh b/dumux/decoupled/2p/diffusion/mimetic/croperator.hh
index 34bf48d72580f1994f749774fa6040ac08ff1618..feaf51ae0c6b6911fa4574443f25858be0f6b56a 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/croperator.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/croperator.hh
@@ -107,8 +107,6 @@ class CROperatorAssembler
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView,CRLayout> EM;
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView,AllLayout> AM;
-// typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
-
enum
{
pressEqIdx = 0
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
index 796ab3ab91efacc5989669cffb9dcdd19cb8e9e0..f07167efc63fffcb6f52ed1af6b791dacf051009 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
@@ -82,11 +82,9 @@ class MimeticGroundwaterEquationLocalStiffness: public LocalStiffness<TypeTag, 1
satEqIdx = Indices::satEqIdx,
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
- typedef typename GridView::Grid Grid;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
index 5d2324b7f69f8e5b086fa855f64c2df6457f1af7..59d1fd6953204afdb3bd830bde353e446b96a19f 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
@@ -98,11 +98,8 @@ template<class TypeTag> class MimeticPressure2P
typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::Grid Grid;
- typedef typename GridView::template Codim<0>::EntityPointer ElementPointer;
typedef typename GridView::IntersectionIterator IntersectionIterator;
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
-
typedef typename GET_PROP_TYPE(TypeTag, LocalStiffness) LocalStiffness;
typedef Dune::BlockVector< Dune::FieldVector<Scalar, 1> > TraceType;
typedef Dune::BlockVector< Dune::FieldVector<Scalar, 2*dim> > NormalVelType;
diff --git a/dumux/decoupled/2p/fluxData2p.hh b/dumux/decoupled/2p/fluxData2p.hh
index 8d1f6b29507db915b8918829bfe21205d5a896e8..e438dc4927303ab96b5ea1790da29fc0063fe570 100644
--- a/dumux/decoupled/2p/fluxData2p.hh
+++ b/dumux/decoupled/2p/fluxData2p.hh
@@ -42,8 +42,6 @@ class FluxData2P
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GridView::IntersectionIterator IntersectionIterator;
- typedef typename GridView::Traits::template Codim<0>::Entity Element;
enum
{
diff --git a/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh b/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh
index 69208b1239ab04da77f4b874de865eb8e3f9004a..12482f5f44371f0d738c4efa557bde64da42588c 100644
--- a/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh
+++ b/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh
@@ -67,8 +67,6 @@ private:
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
-
public:
/*! \brief Calculates the indicator used for refinement/coarsening for each grid cell.
*
diff --git a/dumux/decoupled/2p/impes/gridadaptionindicator2plocal.hh b/dumux/decoupled/2p/impes/gridadaptionindicator2plocal.hh
index 49714f3745395e469da50e201e10890ba43060b5..a849a2cd0887f4670e686de5ab22c275632688b4 100644
--- a/dumux/decoupled/2p/impes/gridadaptionindicator2plocal.hh
+++ b/dumux/decoupled/2p/impes/gridadaptionindicator2plocal.hh
@@ -70,8 +70,6 @@ private:
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
-
public:
/*! \brief Calculates the indicator used for refinement/coarsening for each grid cell.
*
diff --git a/dumux/decoupled/2p/impes/impesproblem2p.hh b/dumux/decoupled/2p/impes/impesproblem2p.hh
index 11029f3b2b8b7667dcdc18b9b824577b9f675ec1..f5fb7c5cb4530808b951e811a08eb61e8b09c653 100644
--- a/dumux/decoupled/2p/impes/impesproblem2p.hh
+++ b/dumux/decoupled/2p/impes/impesproblem2p.hh
@@ -52,7 +52,6 @@ class IMPESProblem2P : public IMPETProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
// material properties
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
diff --git a/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh b/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh
index 3ac486d0f59b6261448a19391116227ff6829ccb..a8ef1643a0f148dc9dfa8803b48d15266248f07b 100644
--- a/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh
+++ b/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh
@@ -72,7 +72,6 @@ private:
pressEqIdx = Indices::pressureEqIdx
};
- typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::EntityPointer ElementPointer;
typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<Scalar, dim> DimVector;
diff --git a/dumux/decoupled/2p/transport/fv/convectivepart.hh b/dumux/decoupled/2p/transport/fv/convectivepart.hh
index 3df1b220607c83d17691d8fd530c5c72ebb14616..75ce71d9ed8ad9ec405728f04069757c498d1c0a 100644
--- a/dumux/decoupled/2p/transport/fv/convectivepart.hh
+++ b/dumux/decoupled/2p/transport/fv/convectivepart.hh
@@ -43,7 +43,6 @@ private:
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
enum{dim = GridView::dimension, dimWorld = GridView::dimensionworld};
- typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<Scalar, dimWorld> DimVector;
diff --git a/dumux/decoupled/2p/transport/fv/diffusivepart.hh b/dumux/decoupled/2p/transport/fv/diffusivepart.hh
index eeb833f5d51f43e7510ad0570156f652843fc97b..fb16789226a4f085673bd7f47a36aa0276f80760 100644
--- a/dumux/decoupled/2p/transport/fv/diffusivepart.hh
+++ b/dumux/decoupled/2p/transport/fv/diffusivepart.hh
@@ -41,7 +41,6 @@ private:
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
enum{dim = GridView::dimension};
- typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<Scalar, dim> DimVector;
diff --git a/dumux/decoupled/2p/transport/fv/evalcflflux.hh b/dumux/decoupled/2p/transport/fv/evalcflflux.hh
index f05d2a2b97acebbff1c3caa2d434ea09a6d1896b..d59bbd09b7310a5f48e4f5cf3116f9c3632683fa 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflflux.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflflux.hh
@@ -61,8 +61,6 @@ private:
dim = GridView::dimension, dimWorld = GridView::dimensionworld
};
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
-
public:
//! For initialization
diff --git a/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh b/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh
index af4f445429f0c1a67b0018345dbf201e89523b11..fb1e5ce0daf12f8e2e35e803b4bae17af3aeeade 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflfluxdefault.hh
@@ -67,10 +67,7 @@ private:
sn = Indices::saturationNw
};
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
-
typedef typename GridView::Traits::template Codim<0>::Entity Element;
- typedef typename GridView::template Codim<0>::EntityPointer ElementPointer;
typedef typename GridView::Intersection Intersection;
public:
diff --git a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
index 0e0f087b9b23ad5781934186c19adcfb5e1d4a53..6745108f401683a85a5384b8e2632ddc81d44232 100644
--- a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
+++ b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
@@ -119,10 +119,8 @@ class FVSaturation2P: public FVTransport<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, TransportSolutionType) TransportSolutionType;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
- typedef typename GridView::Grid Grid;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::template Codim<0>::EntityPointer ElementPointer;
- typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
diff --git a/dumux/decoupled/2p/transport/fv/gravitypart.hh b/dumux/decoupled/2p/transport/fv/gravitypart.hh
index 6de5831b111423fb1149488514e8e962c5932d1b..0a97bf236a492da6d9a88f8f8b5dff60412bf0a6 100644
--- a/dumux/decoupled/2p/transport/fv/gravitypart.hh
+++ b/dumux/decoupled/2p/transport/fv/gravitypart.hh
@@ -69,7 +69,6 @@ private:
wPhaseIdx = Indices::wPhaseIdx, nPhaseIdx = Indices::nPhaseIdx, numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
- typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::EntityPointer ElementPointer;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::Intersection Intersection;
diff --git a/dumux/decoupled/2p/transport/transportproblem2p.hh b/dumux/decoupled/2p/transport/transportproblem2p.hh
index bf4f2eccede6dd7f63f33a4ab064407b12745db8..cb3f4c12542808dfd5e58131441da26bd1725c5c 100644
--- a/dumux/decoupled/2p/transport/transportproblem2p.hh
+++ b/dumux/decoupled/2p/transport/transportproblem2p.hh
@@ -59,7 +59,6 @@ class TransportProblem2P : public OneModelProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
// material properties
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
diff --git a/dumux/decoupled/2p2c/2p2cfluidstate.hh b/dumux/decoupled/2p2c/2p2cfluidstate.hh
index 77025a80a6c057dfd730b155937bd33b6ed94ec0..b43996b0d16e9d730f3018d5efdadf343c3849fb 100644
--- a/dumux/decoupled/2p2c/2p2cfluidstate.hh
+++ b/dumux/decoupled/2p2c/2p2cfluidstate.hh
@@ -40,7 +40,6 @@ namespace Dumux
template <class TypeTag>
class TwoPTwoCFluidState
{
- typedef TwoPTwoCFluidState<TypeTag> ThisType;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
diff --git a/dumux/decoupled/2p2c/cellData2p2cadaptive.hh b/dumux/decoupled/2p2c/cellData2p2cadaptive.hh
index dce70edc61b5af0d2cb1ffd40980e750fe9bb7f3..fe462ffd84da2a5fd09c2d7d596bef518fa0fb13 100644
--- a/dumux/decoupled/2p2c/cellData2p2cadaptive.hh
+++ b/dumux/decoupled/2p2c/cellData2p2cadaptive.hh
@@ -41,7 +41,6 @@ template<class TypeTag>
class CellData2P2CAdaptive: public CellData2P2Cmultiphysics<TypeTag>
{
private:
- typedef CellData2P2CAdaptive<TypeTag> ThisType;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::Grid Grid;
@@ -65,7 +64,6 @@ private:
numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
typedef typename GridView::Traits::template Codim<0>::Entity Element;
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
static constexpr int pressureType = GET_PROP_VALUE(TypeTag, PressureFormulation); //!< gives kind of pressure used (\f$ 0 = p_w \f$, \f$ 1 = p_n \f$, \f$ 2 = p_{global} \f$)
int upwindError_[numPhases];
diff --git a/dumux/decoupled/2p2c/fluxData2p2c.hh b/dumux/decoupled/2p2c/fluxData2p2c.hh
index 469a199ebdb217c0ac571dd18c1ab8594ef089bd..8c549187d05b780a10192fd227295c16e6c73f15 100644
--- a/dumux/decoupled/2p2c/fluxData2p2c.hh
+++ b/dumux/decoupled/2p2c/fluxData2p2c.hh
@@ -42,10 +42,7 @@ template<class TypeTag>
class FluxData2P2C
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GridView::IntersectionIterator IntersectionIterator;
- typedef typename GridView::Traits::template Codim<0>::Entity Element;
enum
{
diff --git a/dumux/decoupled/2p2c/fvpressure2p2c.hh b/dumux/decoupled/2p2c/fvpressure2p2c.hh
index 8f7551486c56f0d418841f8981e7e4fc80adf36e..3599fffdbd3c16992679a4bcec2aeb0cc5452415 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2c.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2c.hh
@@ -67,11 +67,9 @@ template<class TypeTag> class FVPressure2P2C
{
//the model implementation
typedef typename GET_PROP_TYPE(TypeTag, PressureModel) Implementation;
- typedef FVPressure<TypeTag> BaseType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
@@ -114,8 +112,6 @@ template<class TypeTag> class FVPressure2P2C
// typedefs to abbreviate several dune classes...
typedef typename GridView::Traits::template Codim<0>::Entity Element;
- typedef typename GridView::template Codim<0>::Iterator ElementIterator;
- typedef typename GridView::Grid Grid;
typedef typename GridView::template Codim<0>::EntityPointer ElementPtr;
typedef typename GridView::Intersection Intersection;
@@ -127,7 +123,6 @@ template<class TypeTag> class FVPressure2P2C
// the typenames used for the stiffness matrix and solution vector
typedef typename GET_PROP_TYPE(TypeTag, PressureCoefficientMatrix) Matrix;
- typedef typename GET_PROP_TYPE(TypeTag, PressureRHSVector) RHSVector;
protected:
//! @copydoc FVPressure::EntryType
diff --git a/dumux/decoupled/2p2c/fvpressure2p2cadaptive.hh b/dumux/decoupled/2p2c/fvpressure2p2cadaptive.hh
index 31b098b83847e08fe91182b31a17808acb8b840b..ad048a57425fd05e9a598cf7bcf7dcad0c0e2a82 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2cadaptive.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2cadaptive.hh
@@ -79,22 +79,13 @@ template<class TypeTag> class FVPressure2P2CAdaptive
{
//the model implementation
typedef typename GET_PROP_TYPE(TypeTag, PressureModel) Implementation;
- typedef FVPressure2P2C<TypeTag> ParentType;
typedef FVPressure<TypeTag> BaseType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
- typedef typename SpatialParams::MaterialLaw MaterialLaw;
-
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
-
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
enum
@@ -121,9 +112,7 @@ template<class TypeTag> class FVPressure2P2CAdaptive
};
// typedefs to abbreviate several dune classes...
- typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
- typedef typename GridView::Grid Grid;
typedef typename GridView::template Codim<0>::EntityPointer ElementPointer;
typedef typename GridView::Intersection Intersection;
typedef typename GridView::IntersectionIterator IntersectionIterator;
@@ -133,11 +122,9 @@ template<class TypeTag> class FVPressure2P2CAdaptive
typedef Dune::FieldVector<Scalar,dim+1> TransmissivityMatrix;
typedef Dune::FieldMatrix<Scalar, dim, dim> DimMatrix;
typedef Dune::FieldVector<Scalar, GET_PROP_VALUE(TypeTag, NumPhases)> PhaseVector;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
// the typenames used for the stiffness matrix and solution vector
typedef typename GET_PROP_TYPE(TypeTag, PressureCoefficientMatrix) Matrix;
- typedef typename GET_PROP_TYPE(TypeTag, PressureRHSVector) RHSVector;
protected:
Problem& problem()
diff --git a/dumux/decoupled/2p2c/fvpressurecompositional.hh b/dumux/decoupled/2p2c/fvpressurecompositional.hh
index 06bcf353c8808b330ba38f89848e4340e05861f1..89c9e36c26405cbe29ae29584d2b8885beffc822 100644
--- a/dumux/decoupled/2p2c/fvpressurecompositional.hh
+++ b/dumux/decoupled/2p2c/fvpressurecompositional.hh
@@ -68,7 +68,6 @@ template<class TypeTag> class FVPressureCompositional
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
@@ -101,16 +100,12 @@ template<class TypeTag> class FVPressureCompositional
// typedefs to abbreviate several dune classes...
typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
-// typedef typename GridView::Grid Grid;
-// typedef typename GridView::template Codim<0>::EntityPointer ElementPointer;
typedef typename GridView::IntersectionIterator IntersectionIterator;
// convenience shortcuts for Vectors/Matrices
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
- typedef Dune::FieldMatrix<Scalar, dim, dim> FieldMatrix;
typedef Dune::FieldVector<Scalar, numPhases> PhaseVector;
typedef Dune::FieldVector<Scalar, numComponents> ComponentVector;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
public:
//the variables object is initialized, non-compositional before and compositional after first pressure calculation
diff --git a/dumux/decoupled/2p2c/fvtransport2p2c.hh b/dumux/decoupled/2p2c/fvtransport2p2c.hh
index f58d2d5c578a6001b63d187a78d75705c149eae0..83e29a541ed00a7dd52fe2cf9d9ea58535f35fe6 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2c.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2c.hh
@@ -99,7 +99,6 @@ class FVTransport2P2C
};
typedef typename GridView::Traits::template Codim<0>::Entity Element;
- typedef typename GridView::Grid Grid;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::template Codim<0>::EntityPointer ElementPointer;
typedef typename GridView::IntersectionIterator IntersectionIterator;
diff --git a/dumux/decoupled/2p2c/fvtransport2p2cadaptive.hh b/dumux/decoupled/2p2c/fvtransport2p2cadaptive.hh
index c1c623712af9211e3c2e1fe53ffd3474901d1c8f..5fbf83e308da3e0730d88703832eda552711ab2a 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2cadaptive.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2cadaptive.hh
@@ -57,14 +57,7 @@ class FVTransport2P2CAdaptive : public FVTransport2P2C<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
- typedef typename SpatialParams::MaterialLaw MaterialLaw;
-
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
-
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
@@ -89,12 +82,9 @@ class FVTransport2P2CAdaptive : public FVTransport2P2C<TypeTag>
contiWEqIdx=Indices::contiWEqIdx, contiNEqIdx=Indices::contiNEqIdx
};
- typedef typename GridView::Traits::template Codim<0>::Entity Element;
- typedef typename GridView::Grid Grid;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::template Codim<0>::EntityPointer ElementPointer;
typedef typename GridView::IntersectionIterator IntersectionIterator;
- typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldMatrix<Scalar,dim,dim> DimMatrix;
diff --git a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
index 2a0ab9e3bfa4945d8cc6e7f71e2fcd8b0f75e248..5abd88d2577eaa97008f0342fcf41f0dc5a25269 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
@@ -55,12 +55,7 @@ class FVTransport2P2CMultiPhysics : public FVTransport2P2C<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
- typedef typename SpatialParams::MaterialLaw MaterialLaw;
-
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
@@ -86,7 +81,6 @@ class FVTransport2P2CMultiPhysics : public FVTransport2P2C<TypeTag>
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::IntersectionIterator IntersectionIterator;
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldVector<Scalar, 2> PhaseVector;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
diff --git a/dumux/decoupled/2p2c/variableclass2p2cadaptive.hh b/dumux/decoupled/2p2c/variableclass2p2cadaptive.hh
index 89dcc619914f74d978f06142393394aefe0564bb..d42d9df7007bfc213a9374133209bc934ebc940b 100644
--- a/dumux/decoupled/2p2c/variableclass2p2cadaptive.hh
+++ b/dumux/decoupled/2p2c/variableclass2p2cadaptive.hh
@@ -58,10 +58,7 @@ private:
typedef typename CellData::AdaptedValues AdaptedValues;
typedef typename GridView::Grid Grid;
- typedef typename Grid::LevelGridView LevelGridView;
typedef typename Grid::LocalIdSet::IdType IdType;
- typedef typename LevelGridView::template Codim<0>::Iterator LevelIterator;
- typedef typename GridView::Traits::template Codim<0>::EntityPointer ElementPointer;
typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename GridView::Intersection Intersection;
enum
diff --git a/dumux/decoupled/common/decoupledproperties.hh b/dumux/decoupled/common/decoupledproperties.hh
index 66c2d6b8cb3e703e138847aaa7679e56ce0c8601..7eb1b29331fc0be920d9dd00a5cb886a72b8d5ce 100644
--- a/dumux/decoupled/common/decoupledproperties.hh
+++ b/dumux/decoupled/common/decoupledproperties.hh
@@ -123,7 +123,6 @@ SET_PROP(DecoupledModel, SolutionTypes)
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::Grid Grid;
- typedef typename Grid::ctype CoordScalar;
typedef typename GET_PROP_TYPE(TypeTag, Variables) Variables;
enum
diff --git a/dumux/decoupled/common/fv/fvvelocity.hh b/dumux/decoupled/common/fv/fvvelocity.hh
index 13cddab299ac1c6b2606290837ede6b602296205..00a81eadae6858a7c121524ad1da7585d42c440d 100644
--- a/dumux/decoupled/common/fv/fvvelocity.hh
+++ b/dumux/decoupled/common/fv/fvvelocity.hh
@@ -46,7 +46,6 @@ namespace Dumux
template<class TypeTag, class Velocity> class FVVelocity
{
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
@@ -57,11 +56,8 @@ template<class TypeTag, class Velocity> class FVVelocity
};
// typedefs to abbreviate several dune classes...
- typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::IntersectionIterator IntersectionIterator;
- typedef typename GridView::Intersection Intersection;
-
public:
diff --git a/dumux/decoupled/common/fv/mpfa/mpfalinteractionvolume.hh b/dumux/decoupled/common/fv/mpfa/mpfalinteractionvolume.hh
index 85cd4e56b85c6da584e3ef1bb22a9b854281ddc6..c86d088a55bc48b2ac6e23bc98d07fb3f272193a 100644
--- a/dumux/decoupled/common/fv/mpfa/mpfalinteractionvolume.hh
+++ b/dumux/decoupled/common/fv/mpfa/mpfalinteractionvolume.hh
@@ -39,7 +39,6 @@ class FVMPFALInteractionVolume
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
enum
{
diff --git a/dumux/decoupled/common/fv/mpfa/mpfaointeractionvolume.hh b/dumux/decoupled/common/fv/mpfa/mpfaointeractionvolume.hh
index 0b2044b9e0aa4c921e1c0e7be7d91b3e76d8231e..ac333e19164d777cfa5abff1b52a12a15658f3bb 100644
--- a/dumux/decoupled/common/fv/mpfa/mpfaointeractionvolume.hh
+++ b/dumux/decoupled/common/fv/mpfa/mpfaointeractionvolume.hh
@@ -39,7 +39,6 @@ class FVMPFAOInteractionVolume
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
enum
{
diff --git a/dumux/decoupled/common/impet.hh b/dumux/decoupled/common/impet.hh
index 88cf1da7879f9e12065386a5f87f400b3bc04edf..7af86489327d251ce31d6db5c0d781ae494b9303 100644
--- a/dumux/decoupled/common/impet.hh
+++ b/dumux/decoupled/common/impet.hh
@@ -47,20 +47,13 @@ namespace Dumux
*/
template<class TypeTag> class IMPET
{
- typedef IMPET<TypeTag> ThisType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP(TypeTag, ParameterTree) Parameters;
-
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename GET_PROP_TYPE(TypeTag, TransportSolutionType) TransportSolutionType;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
-
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
@@ -73,8 +66,6 @@ template<class TypeTag> class IMPET
iterToConverged,
};
- typedef typename SolutionTypes::ScalarSolution ScalarSolutionType;
-
public:
typedef typename SolutionTypes::ScalarSolution SolutionType;
diff --git a/dumux/decoupled/common/impetproblem.hh b/dumux/decoupled/common/impetproblem.hh
index 07f612a21e80b058a796cc620e6249de857e1606..db15bdaae45f3878966b41cf453df1f972ff479b 100644
--- a/dumux/decoupled/common/impetproblem.hh
+++ b/dumux/decoupled/common/impetproblem.hh
@@ -65,8 +65,6 @@ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
enum
{
dim = GridView::dimension,
diff --git a/dumux/decoupled/common/onemodelproblem.hh b/dumux/decoupled/common/onemodelproblem.hh
index 6ea9f80b7c75f849080c4db57a44f25bd610684e..b2f73e886f7636093aaddf55ceaa9f0daa3084f8 100644
--- a/dumux/decoupled/common/onemodelproblem.hh
+++ b/dumux/decoupled/common/onemodelproblem.hh
@@ -59,7 +59,6 @@ private:
typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::VertexMapper VertexMapper;
typedef typename SolutionTypes::ElementMapper ElementMapper;
- typedef typename SolutionTypes::ScalarSolution Solution;
enum
{
diff --git a/dumux/decoupled/common/variableclass.hh b/dumux/decoupled/common/variableclass.hh
index 4c69618c525ef025f76599440bf65596b3b638bc..1bed8c5a708e4c63af8d6d638d4caf2571daed0e 100644
--- a/dumux/decoupled/common/variableclass.hh
+++ b/dumux/decoupled/common/variableclass.hh
@@ -47,11 +47,9 @@ template<class TypeTag>
class VariableClass
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum
{
@@ -60,7 +58,6 @@ private:
numEq = GET_PROP_VALUE(TypeTag, NumEq)
};
- typedef typename GridView::Grid Grid;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::Traits::template Codim<dim>::Entity Vertex;
diff --git a/dumux/decoupled/common/variableclassadaptive.hh b/dumux/decoupled/common/variableclassadaptive.hh
index 9a444b9deb72f2c6ad8156e60c2f7459deaf4b41..6b39eccff157164eca64c3228ab40664e40583b5 100644
--- a/dumux/decoupled/common/variableclassadaptive.hh
+++ b/dumux/decoupled/common/variableclassadaptive.hh
@@ -48,7 +48,6 @@ private:
typedef VariableClass<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
typedef typename CellData::AdaptedValues AdaptedValues;
diff --git a/test/decoupled/1p/test_diffusionproblem.hh b/test/decoupled/1p/test_diffusionproblem.hh
index c9c8a5d696a5fc0b61812b208287b5b30b006b76..c2481f5013028bc165442e1c18e06bfe5d7723fc 100644
--- a/test/decoupled/1p/test_diffusionproblem.hh
+++ b/test/decoupled/1p/test_diffusionproblem.hh
@@ -176,8 +176,6 @@ class TestDiffusionProblem: public DiffusionProblem2P<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
typedef typename GET_PROP_TYPE(TypeTag, WettingPhase) WettingPhase;
typedef typename GET_PROP_TYPE(TypeTag, WettingPhase) NonwettingPhase;
@@ -201,7 +199,6 @@ class TestDiffusionProblem: public DiffusionProblem2P<TypeTag>
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
- typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldVector<Scalar, dim> LocalPosition;
diff --git a/test/decoupled/2p/buckleyleverettanalyticsolution.hh b/test/decoupled/2p/buckleyleverettanalyticsolution.hh
index b415293af834a89751abadea531d1b742b92d9b5..6f59d650f5bddcf5e269f4a33a6794bee27cf2a6 100644
--- a/test/decoupled/2p/buckleyleverettanalyticsolution.hh
+++ b/test/decoupled/2p/buckleyleverettanalyticsolution.hh
@@ -65,7 +65,6 @@ struct CheckMaterialLaw<Scalar, EffToAbsLaw< LinearMaterial<Scalar> > >
template<class TypeTag> class BuckleyLeverettAnalytic
{
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -77,7 +76,6 @@ template<class TypeTag> class BuckleyLeverettAnalytic
typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
enum
{
@@ -91,7 +89,6 @@ template<class TypeTag> class BuckleyLeverettAnalytic
};
typedef Dune::BlockVector<Dune::FieldVector<Scalar, 1> > BlockVector;
- typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::Traits::template Codim<0>::EntityPointer ElementPointer;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef Dune::FieldVector<Scalar, dimworld> GlobalPosition;
diff --git a/test/decoupled/2p/mcwhorteranalyticsolution.hh b/test/decoupled/2p/mcwhorteranalyticsolution.hh
index c0d32873f56f782cbe4fe12a96c88581e0d757a5..51b93444abeed5db40d249c6e56d2124879e500e 100644
--- a/test/decoupled/2p/mcwhorteranalyticsolution.hh
+++ b/test/decoupled/2p/mcwhorteranalyticsolution.hh
@@ -43,7 +43,6 @@ template<typename TypeTag>
class McWhorterAnalytic
{
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
-// typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -73,7 +72,6 @@ class McWhorterAnalytic
};
typedef Dune::BlockVector<Dune::FieldVector<Scalar, 1> > BlockVector;
- typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::Traits::template Codim<0>::EntityPointer ElementPointer;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef Dune::FieldVector<Scalar, dimworld> GlobalPosition;
diff --git a/test/decoupled/2p/test_impesadaptiveproblem.hh b/test/decoupled/2p/test_impesadaptiveproblem.hh
index 63e2684d435e43aa2309f799e1f3eb666552d5ae..cf8e53f0f0d199c0e74079d3624f518f86f8115c 100644
--- a/test/decoupled/2p/test_impesadaptiveproblem.hh
+++ b/test/decoupled/2p/test_impesadaptiveproblem.hh
@@ -116,8 +116,6 @@ class TestIMPESAdaptiveProblem: public IMPESProblem2P<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
typedef typename GET_PROP_TYPE(TypeTag, WettingPhase) WettingPhase;
typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
@@ -140,7 +138,6 @@ class TestIMPESAdaptiveProblem: public IMPESProblem2P<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
- typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
diff --git a/test/decoupled/2p/test_impesadaptivespatialparams.hh b/test/decoupled/2p/test_impesadaptivespatialparams.hh
index 172c20bddde53384a4d623bf6c4a770ae170b098..be9d83be5a91d05a06c5ba6ad2e5867f1d807c9f 100644
--- a/test/decoupled/2p/test_impesadaptivespatialparams.hh
+++ b/test/decoupled/2p/test_impesadaptivespatialparams.hh
@@ -74,7 +74,6 @@ class TestIMPESAdaptiveSpatialParams: public FVSpatialParams<TypeTag>
typedef typename Grid::Traits::template Codim<0>::Entity Element;
typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
- typedef Dune::FieldMatrix<Scalar,dim,dim> FieldMatrix;
public:
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
diff --git a/test/decoupled/2p/test_impesproblem.hh b/test/decoupled/2p/test_impesproblem.hh
index d3de8936444f3685fb2ce05995b261f58a67daa4..0decc3b1f829e496674a7fecdc7eccc05d90f4bc 100644
--- a/test/decoupled/2p/test_impesproblem.hh
+++ b/test/decoupled/2p/test_impesproblem.hh
@@ -166,9 +166,6 @@ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
-
typedef typename GET_PROP_TYPE(TypeTag, WettingPhase) WettingPhase;
typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
@@ -190,7 +187,6 @@ enum
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
-typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
diff --git a/test/decoupled/2p/test_impesspatialparams.hh b/test/decoupled/2p/test_impesspatialparams.hh
index bf50e558834aeea3c138398e8d9231cfdfe7079e..4ae084add1bda1d67030a68e6fe154a0e535aad7 100644
--- a/test/decoupled/2p/test_impesspatialparams.hh
+++ b/test/decoupled/2p/test_impesspatialparams.hh
@@ -74,7 +74,6 @@ class TestIMPESSpatialParams: public FVSpatialParams<TypeTag>
typedef typename Grid::Traits::template Codim<0>::Entity Element;
typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
- typedef Dune::FieldMatrix<Scalar,dim,dim> FieldMatrix;
public:
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
diff --git a/test/decoupled/2p/test_mpfa2pproblem.hh b/test/decoupled/2p/test_mpfa2pproblem.hh
index ccc4d3d8efaa5367f9e8009897df7ee701ce4e56..bccf89bf4e1b2572955512d432e5737d48a2988d 100644
--- a/test/decoupled/2p/test_mpfa2pproblem.hh
+++ b/test/decoupled/2p/test_mpfa2pproblem.hh
@@ -169,8 +169,6 @@ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
typedef typename GET_PROP_TYPE(TypeTag, WettingPhase) WettingPhase;
typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
@@ -178,7 +176,6 @@ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
-typedef typename SolutionTypes::ScalarSolution ScalarSolutionType;
typedef typename GET_PROP_TYPE(TypeTag, GridCreator) GridCreator;
typedef typename GET_PROP(TypeTag, ParameterTree) ParameterTree;
@@ -205,10 +202,7 @@ enum
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
-typedef typename GridView::template Codim<0>::Iterator ElementIterator;
-typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
-typedef Dune::FieldVector<Scalar, dim> LocalPosition;
public:
MPFATwoPTestProblem(TimeManager &timeManager,const GridView &gridView) :
diff --git a/test/decoupled/2p/test_mpfa2pspatialparams.hh b/test/decoupled/2p/test_mpfa2pspatialparams.hh
index 068ef74b453b8a6d59083932982197a2d92a814b..9ba6d4d982e03e49b8738501c684a7e6ddcc83a2 100644
--- a/test/decoupled/2p/test_mpfa2pspatialparams.hh
+++ b/test/decoupled/2p/test_mpfa2pspatialparams.hh
@@ -71,7 +71,6 @@ class Test2PSpatialParams: public FVSpatialParams<TypeTag>
typedef typename Grid::Traits::template Codim<0>::Entity Element;
typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
- typedef Dune::FieldVector<CoordScalar, dim> LocalPosition;
typedef Dune::FieldMatrix<Scalar, dim, dim> FieldMatrix;
typedef typename GET_PROP(TypeTag, ParameterTree) ParameterTree;
diff --git a/test/decoupled/2p/test_transportproblem.hh b/test/decoupled/2p/test_transportproblem.hh
index cdf53aba63cf7dc8b97f10c6169c77927135146b..d4b89af5f3cd67009d72b722837ad8dd5ce62adf 100644
--- a/test/decoupled/2p/test_transportproblem.hh
+++ b/test/decoupled/2p/test_transportproblem.hh
@@ -112,9 +112,6 @@ class TestTransportProblem: public TransportProblem2P<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
-
typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
@@ -137,8 +134,6 @@ class TestTransportProblem: public TransportProblem2P<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GridView::Traits::template Codim<0>::Entity Element;
- typedef typename GridView::Intersection Intersection;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
public:
diff --git a/test/decoupled/2p/test_transportspatialparams.hh b/test/decoupled/2p/test_transportspatialparams.hh
index bbf3e83e9b6b8ccb37ac22f75b09b5b77c83fc98..2f11f23e563908469481316a35dc9c372f2ec940 100644
--- a/test/decoupled/2p/test_transportspatialparams.hh
+++ b/test/decoupled/2p/test_transportspatialparams.hh
@@ -66,7 +66,6 @@ class TestTransportSpatialParams: public FVSpatialParams<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename Grid::ctype CoordScalar;
enum
{dim=Grid::dimension, dimWorld=Grid::dimensionworld};
diff --git a/test/decoupled/2p2c/test_adaptive2p2cproblem.hh b/test/decoupled/2p2c/test_adaptive2p2cproblem.hh
index c9e2cc1f3d8d53a522791cb227c4a813c3740cb9..7af179920da02a3c6cf671a45e26c8887b1294b5 100644
--- a/test/decoupled/2p2c/test_adaptive2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_adaptive2p2cproblem.hh
@@ -132,8 +132,6 @@ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
-
// boundary typedefs
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
diff --git a/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh b/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
index de51400f09c69dbfe22b9e76620d9bf45ab1f4aa..3d50965a578a4cd13aec9a24a74d9ce2e8a4e521 100644
--- a/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
+++ b/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
@@ -66,14 +66,11 @@ class Test2P2CSpatialParams : public FVSpatialParams<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename Grid::ctype CoordScalar;
enum
{dim=Grid::dimension, dimWorld=Grid::dimensionworld, numEq=1};
typedef typename Grid::Traits::template Codim<0>::Entity Element;
- typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
- typedef Dune::FieldVector<CoordScalar, dim> LocalPosition;
typedef Dune::FieldMatrix<Scalar,dim,dim> FieldMatrix;
public:
diff --git a/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh b/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
index f2065ff701a0f21542bc806594af89cff14468d1..127d25912b414c95429ab150ebef6391be3aed6f 100644
--- a/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
@@ -140,7 +140,6 @@ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
// boundary typedefs
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;