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

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

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@11288 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 10a70aea
......@@ -41,9 +41,6 @@ class ElOnePTwoCElementVolumeVariables : public BoxElementVolumeVariables<TypeTa
typedef BoxElementVolumeVariables<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
typedef typename GET_PROP_TYPE(TypeTag, VertexMapper) VertexMapper;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
......
......@@ -76,8 +76,6 @@ namespace Dumux
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
public:
/*
* \brief The constructor
......
......@@ -131,7 +131,6 @@ template<class TypeTag>
class ElOnePTwoCModel: public GET_PROP_TYPE(TypeTag, BaseModel)
{
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
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, ElementBoundaryTypes) ElementBoundaryTypes;
......@@ -144,9 +143,7 @@ class ElOnePTwoCModel: public GET_PROP_TYPE(TypeTag, BaseModel)
dimWorld = GridView::dimensionworld
};
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::template Codim<dim>::Iterator VertexIterator;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
......
......@@ -54,8 +54,6 @@ class El2PAssembler
typedef typename GET_PROP_TYPE(TypeTag, PTAG(VertexMapper)) VertexMapper;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementMapper)) ElementMapper;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
#if HAVE_DUNE_PDELAB
typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureFEM)) PressureFEM;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureGridFunctionSpace)) PressureGFS;
......@@ -75,18 +73,12 @@ class El2PAssembler
typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) SolutionVector;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(JacobianMatrix)) JacobianMatrix;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
enum{dim = GridView::dimension};
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename GridView::template Codim<dim>::Entity Vertex;
typedef typename GridView::template Codim<dim>::EntityPointer VertexPointer;
typedef typename GridView::template Codim<dim>::Iterator VertexIterator;
typedef SolutionVector Vector;
enum {
enablePartialReassemble = GET_PROP_VALUE(TypeTag, PTAG(ImplicitEnablePartialReassemble)),
......
......@@ -40,12 +40,10 @@ template<class TypeTag>
class ElTwoPElementVolumeVariables : public std::vector<typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) >
{
typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
typedef std::vector<VolumeVariables> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) SolutionVector;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(VertexMapper)) VertexMapper;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
......@@ -57,7 +55,6 @@ class ElTwoPElementVolumeVariables : public std::vector<typename GET_PROP_TYPE(T
#endif
enum { dim = GridView::dimension };
enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridFunctionSpace)) GridFunctionSpace;
typedef Dune::PDELab::LocalFunctionSpace<GridFunctionSpace> LocalFunctionSpace;
......
......@@ -62,7 +62,6 @@ NEW_PROP_TAG(SpatialParams);
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
......
......@@ -42,11 +42,9 @@ class ElTwoPLocalJacobian : public ImplicitLocalJacobian<TypeTag>
{
private:
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::Traits::template Codim<0>::EntityPointer ElementPointer;
enum {
dim = GridView::dimension,
};
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, ElementSolutionVector) ElementSolutionVector;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
......
......@@ -74,7 +74,6 @@ class El2PLocalOperator
enum{numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq))};
enum{dim = GridView::dimension};
typedef Dune::FieldVector<Scalar, dim> GlobalPosition;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
......
......@@ -103,8 +103,6 @@ template<class TypeTag>
class ElTwoPModel: public GET_PROP_TYPE(TypeTag, BaseModel)
{
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
......@@ -124,11 +122,8 @@ class ElTwoPModel: public GET_PROP_TYPE(TypeTag, BaseModel)
dim = GridView::dimension,
dimWorld = GridView::dimensionworld
};
typedef typename GridView::template Codim<dim>::Entity Vertex;
typedef typename GridView::template Codim<dim>::Iterator VertexIterator;
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::ctype CoordScalar;
#if DUNE_VERSION_NEWER(DUNE_GRID, 2, 3)
typedef typename Element::Geometry::JacobianInverseTransposed JacobianInverseTransposed;
#else
......@@ -140,11 +135,7 @@ class ElTwoPModel: public GET_PROP_TYPE(TypeTag, BaseModel)
typedef Dune::FieldVector<Scalar, dim> DimVector;
typedef Dune::FieldMatrix<Scalar, dim, dim> DimMatrix;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) SolutionVector;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementSolutionVector)) ElementSolutionVector;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(DofMapper)) DofMapper;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridFunctionSpace)) GridFunctionSpace;
typedef Dune::PDELab::LocalFunctionSpace<GridFunctionSpace> LocalFunctionSpace;
......
......@@ -40,7 +40,6 @@ class ElTwoPNewtonController : public NewtonController<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Model)) Model;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(NewtonMethod)) NewtonMethod;
typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) JacobianMatrix;
......
......@@ -62,7 +62,6 @@ class ElTwoPVolumeVariables: public TwoPVolumeVariables<TypeTag> {
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef Dune::FieldVector<Scalar, dim> DimVector;
typedef Dune::FieldMatrix<Scalar, dim, dim> DimMatrix;
enum {
numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)),
......
......@@ -61,9 +61,7 @@ class ElasticFluxVariablesBase
dimWorld = GridView::dimensionworld
};
typedef typename GridView::ctype CoordScalar;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldVector<Scalar, dim> DimVector;
typedef Dune::FieldMatrix<Scalar, dim, dim> DimMatrix;
......
......@@ -49,7 +49,6 @@ protected:
enum { dim = GridView::dimension };
typedef Dune::FieldVector<Scalar, dim> DimVector;
typedef Dune::FieldMatrix<Scalar, dim, dim> DimMatrix;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
......
......@@ -73,10 +73,8 @@ class ElasticModel : public GET_PROP_TYPE(TypeTag, BaseModel)
};
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::template Codim<dim>::Iterator VertexIterator;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldVector<Scalar, dim> DimVector;
typedef Dune::FieldMatrix<Scalar, dim, dim> DimMatrix;
public:
......
......@@ -102,7 +102,6 @@ namespace Dumux
template<class TypeTag = TTAG( El1P2CProblem)>
class El1P2CProblem: public ImplicitPorousMediaProblem<TypeTag>
{
typedef El1P2CProblem<TypeTag> ThisType;
typedef ImplicitPorousMediaProblem<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
......@@ -142,7 +141,6 @@ class El1P2CProblem: public ImplicitPorousMediaProblem<TypeTag>
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:
......
......@@ -66,7 +66,6 @@ class El1P2CSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
};
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
typedef Dune::FieldVector<CoordScalar,dimWorld> Vector;
typedef Dune::FieldMatrix<Scalar,dim,dim> Tensor;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
......
......@@ -164,7 +164,6 @@ SET_BOOL_PROP(El2P_TestProblem, VtkRockMechanicsSignConvention, true);
template<class TypeTag = TTAG(El2P_TestProblem)>
class El2P_TestProblem : public ImplicitPorousMediaProblem<TypeTag>
{
typedef El2P_TestProblem<TypeTag> ThisType;
typedef ImplicitPorousMediaProblem<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
......@@ -212,7 +211,6 @@ class El2P_TestProblem : public ImplicitPorousMediaProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef typename Grid::ctype CoordScalar;
typedef Dune::FieldVector<Scalar, dim> LocalPosition;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::BlockVector<GlobalPosition> InitialStressField;
......
......@@ -79,7 +79,6 @@ class El2PSpatialParams : public ImplicitSpatialParams<TypeTag>
};
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
typedef Dune::FieldVector<CoordScalar,dimWorld> Vector;
typedef Dune::FieldMatrix<Scalar,dim,dim> Tensor;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
......
......@@ -97,7 +97,6 @@ SET_BOOL_PROP(ElasticMatrixProblem, ProblemEnableGravity, false);
template <class TypeTag>
class ElasticMatrixProblem: public ImplicitPorousMediaProblem<TypeTag>
{
typedef ElasticMatrixProblem<TypeTag> ThisType;
typedef ImplicitPorousMediaProblem<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
......
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