Commit a7b0c350 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

remove unused private typedefs from dumux/decoupled and test/decoupled

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11286 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent e02cd5d1
......@@ -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
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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
{
......
......@@ -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
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
......
......@@ -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
......
......@@ -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
......
......@@ -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;
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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;
......
......@@ -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;
......
......@@ -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
{
......
......@@ -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.
*
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment