Commit 5a2bceee authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

[properties] remove obsolete PTAG usages

In some places, property retrievals of the form
GET_PROP...(TypeTag, PTAG(...))
can still be found. The use of PTAG is not required for a very long time
already. This patch replaces such calls by
GET_PROP...(TypeTag, ...)

Reviewed by gruenich.



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14240 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 916dc63e
......@@ -43,7 +43,7 @@ template<class TypeTag>
class FluxData2P2C
{
private:
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
enum
{
......@@ -52,7 +52,7 @@ private:
enum
{
numEquations = GET_PROP_VALUE(TypeTag, PTAG(NumEq))
numEquations = GET_PROP_VALUE(TypeTag, NumEq)
};
typename Dune::BlockVector<typename Dune::FieldVector<bool, numEquations>> isUpwindCell_;
......
......@@ -39,7 +39,7 @@ template <class TypeTag, int PVOffset=0>
struct StokesncniCommonIndices : public StokesncCommonIndices<TypeTag, PVOffset>
{
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
// number of dimensions
......
......@@ -56,7 +56,7 @@ namespace Properties
SET_PROP(BoxElasticOnePTwoC, NumEq)
{
private:
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
enum{dim = GridView::dimension};
public:
static const int value = dim + 2;
......
......@@ -48,30 +48,30 @@ namespace PDELab {
template<class TypeTag>
class El2PAssembler
{
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Model)) Model;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
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(PressureFEM)) PressureFEM;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureGridFunctionSpace)) PressureGFS;
typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, VertexMapper) VertexMapper;
typedef typename GET_PROP_TYPE(TypeTag, ElementMapper) ElementMapper;
typedef typename GET_PROP_TYPE(TypeTag, PressureFEM) PressureFEM;
typedef typename GET_PROP_TYPE(TypeTag, PressureGridFunctionSpace) PressureGFS;
typedef typename PressureGFS::template Child<0>::Type PressureScalarGFS;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(DisplacementFEM)) DisplacementFEM;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(DisplacementGridFunctionSpace)) DisplacementGFS;
typedef typename GET_PROP_TYPE(TypeTag, DisplacementFEM) DisplacementFEM;
typedef typename GET_PROP_TYPE(TypeTag, DisplacementGridFunctionSpace) DisplacementGFS;
typedef typename DisplacementGFS::template Child<0>::Type DisplacementScalarGFS;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridFunctionSpace)) GridFunctionSpace;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Constraints)) Constraints;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(ConstraintsTrafo)) ConstraintsTrafo;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(LocalOperator)) LocalOperator;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridOperator)) GridOperator;
typedef typename GET_PROP_TYPE(TypeTag, GridFunctionSpace) GridFunctionSpace;
typedef typename GET_PROP_TYPE(TypeTag, Constraints) Constraints;
typedef typename GET_PROP_TYPE(TypeTag, ConstraintsTrafo) ConstraintsTrafo;
typedef typename GET_PROP_TYPE(TypeTag, LocalOperator) LocalOperator;
typedef typename GET_PROP_TYPE(TypeTag, GridOperator) GridOperator;
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, SolutionVector) SolutionVector;
typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) JacobianMatrix;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
enum{dim = GridView::dimension};
typedef typename GridView::template Codim<0>::Entity Element;
......@@ -80,8 +80,8 @@ class El2PAssembler
typedef typename GridView::template Codim<dim>::Entity Vertex;
enum {
enablePartialReassemble = GET_PROP_VALUE(TypeTag, PTAG(ImplicitEnablePartialReassemble)),
enableJacobianRecycling = GET_PROP_VALUE(TypeTag, PTAG(ImplicitEnableJacobianRecycling)),
enablePartialReassemble = GET_PROP_VALUE(TypeTag, ImplicitEnablePartialReassemble),
enableJacobianRecycling = GET_PROP_VALUE(TypeTag, ImplicitEnableJacobianRecycling),
};
// copying the jacobian assembler is not a good idea
......
......@@ -39,28 +39,28 @@ namespace Dumux
* volume variables object for each of the element's vertices
*/
template<class TypeTag>
class ElTwoPElementVolumeVariables : public std::vector<typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) >
class ElTwoPElementVolumeVariables : public std::vector<typename GET_PROP_TYPE(TypeTag, VolumeVariables) >
{
typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
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(PrimaryVariables)) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
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, SolutionVector) SolutionVector;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename Element::Geometry::JacobianInverseTransposed JacobianInverseTransposed;
enum { dim = GridView::dimension };
enum { dimWorld = GridView::dimensionworld };
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridFunctionSpace)) GridFunctionSpace;
typedef typename GET_PROP_TYPE(TypeTag, GridFunctionSpace) GridFunctionSpace;
typedef Dune::PDELab::LocalFunctionSpace<GridFunctionSpace> LocalFunctionSpace;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum {
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx
......
......@@ -60,11 +60,11 @@ NEW_PROP_TAG(SpatialParams);
{
typedef ImplicitDarcyFluxVariables<TypeTag> TwoPBase;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
enum
{
......@@ -73,7 +73,7 @@ NEW_PROP_TAG(SpatialParams);
};
typedef typename GridView::ctype CoordScalar;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldVector<CoordScalar, dim> DimVector;
typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
......@@ -81,7 +81,7 @@ NEW_PROP_TAG(SpatialParams);
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
enum {numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq))};
enum {numEq = GET_PROP_VALUE(TypeTag, NumEq)};
public:
/*
......@@ -165,7 +165,7 @@ NEW_PROP_TAG(SpatialParams);
const Element &element,
const ElementVolumeVariables &elemVolVars)
{
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridFunctionSpace)) GridFunctionSpace;
typedef typename GET_PROP_TYPE(TypeTag, GridFunctionSpace) GridFunctionSpace;
typedef Dune::PDELab::LocalFunctionSpace<GridFunctionSpace> LocalFunctionSpace;
const GridFunctionSpace& gridFunctionSpace = problem.model().jacobianAssembler().gridFunctionSpace();
const typename GridFunctionSpace::Ordering& ordering = gridFunctionSpace.ordering();
......
......@@ -50,7 +50,7 @@ private:
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum {
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx
......@@ -110,7 +110,7 @@ public:
int col,
int pvIdx)
{
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridFunctionSpace)) GridFunctionSpace;
typedef typename GET_PROP_TYPE(TypeTag, GridFunctionSpace) GridFunctionSpace;
typedef Dune::PDELab::LocalFunctionSpace<GridFunctionSpace> LocalFunctionSpace;
// copy the values of the globalSol vector to the localFunctionSpace values of the current element
......
......@@ -55,25 +55,25 @@ class El2PLocalOperator
// copying the local operator for PDELab is not a good idea
El2PLocalOperator(const El2PLocalOperator &);
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Model)) Model;
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(MaterialLaw)) MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLawParams)) MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity::Geometry::JacobianInverseTransposed JacobianInverseTransposed;
typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename GridView::Intersection Intersection;
typedef typename Dune::PDELab::IntersectionGeometry<Intersection>::ctype DT;
enum{numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq))};
enum{numEq = GET_PROP_VALUE(TypeTag, NumEq)};
enum{dim = GridView::dimension};
enum{dimWorld = GridView::dimensionworld};
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldVector<Scalar, dim> DimVector;
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;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
enum {
......
......@@ -41,8 +41,8 @@ template<class TypeTag>
class ElTwoPLocalResidual: public BoxLocalResidual<TypeTag> {
protected:
typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) Implementation;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
enum {
dim = GridView::dimension
......@@ -58,7 +58,7 @@ protected:
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum {
numFluidPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases))
numFluidPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
enum {
contiWEqIdx = Indices::contiWEqIdx,
......@@ -68,7 +68,7 @@ protected:
};
//TODO: delete this if not required
// only effective porosity update in element variables doesn't work
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridFunctionSpace)) GridFunctionSpace;
typedef typename GET_PROP_TYPE(TypeTag, GridFunctionSpace) GridFunctionSpace;
typedef Dune::PDELab::LocalFunctionSpace<GridFunctionSpace> LocalFunctionSpace;
public:
......
......@@ -103,9 +103,9 @@ NEW_PROP_TAG(InitialPressSat); //!< The initial pressure and saturation function
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, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
......@@ -128,8 +128,8 @@ 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(SolutionVector)) SolutionVector;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridFunctionSpace)) GridFunctionSpace;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
typedef typename GET_PROP_TYPE(TypeTag, GridFunctionSpace) GridFunctionSpace;
typedef Dune::PDELab::LocalFunctionSpace<GridFunctionSpace> LocalFunctionSpace;
public:
......@@ -704,12 +704,12 @@ public:
* \brief Applies the initial solution for all vertices of the grid.
*/
void applyInitialSolution_() {
typedef typename GET_PROP_TYPE(TypeTag, PTAG(InitialPressSat)) InitialPressSat;
typedef typename GET_PROP_TYPE(TypeTag, InitialPressSat) InitialPressSat;
InitialPressSat initialPressSat(this->problem_().gridView());
std::cout << "el2pmodel calls: initialPressSat" << std::endl;
initialPressSat.setPressure(this->problem_().pInit());
typedef typename GET_PROP_TYPE(TypeTag, PTAG(InitialDisplacement)) InitialDisplacement;
typedef typename GET_PROP_TYPE(TypeTag, InitialDisplacement) InitialDisplacement;
InitialDisplacement initialDisplacement(this->problem_().gridView());
typedef Dune::PDELab::CompositeGridFunction<InitialPressSat,
......
......@@ -36,14 +36,14 @@ class ElTwoPNewtonController : public NewtonController<TypeTag>
{
typedef NewtonController<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(NewtonController)) Implementation;
typedef typename GET_PROP_TYPE(TypeTag, NewtonController) Implementation;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(NewtonMethod)) NewtonMethod;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, NewtonMethod) NewtonMethod;
typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) JacobianMatrix;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) SolutionVector;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
typedef typename GET_PROP_TYPE(TypeTag, LinearSolver) LinearSolver;
public:
......
......@@ -123,7 +123,7 @@ SET_BOOL_PROP(BoxElasticTwoP, EvalGradientsAtSCVCenter, true);
SET_PROP(BoxElasticTwoP, MaterialLawParams)
{
private:
typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw)) MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
public:
typedef typename MaterialLaw::Params type;
......@@ -225,12 +225,12 @@ public:
SET_PROP(BoxElasticTwoP, PressureGridFunctionSpace)
{private:
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureFEM)) FEM;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, PressureFEM) FEM;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename Dune::PDELab::EntityBlockedOrderingTag OrderingTag;
typedef typename Dune::PDELab::ISTLVectorBackend<> VBE;
enum{numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)),
enum{numEq = GET_PROP_VALUE(TypeTag, NumEq),
dim = GridView::dimension};
public:
typedef Dune::PDELab::NoConstraints Constraints;
......@@ -247,9 +247,9 @@ public:
SET_PROP(BoxElasticTwoP, DisplacementGridFunctionSpace)
{private:
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(DisplacementFEM)) FEM;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, DisplacementFEM) FEM;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename Dune::PDELab::EntityBlockedOrderingTag OrderingTag;
typedef typename Dune::PDELab::ISTLVectorBackend<> VBE;
enum{dim = GridView::dimension};
......@@ -268,9 +268,9 @@ public:
SET_PROP(BoxElasticTwoP, GridFunctionSpace)
{private:
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureGridFunctionSpace)) PressureGFS;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(DisplacementGridFunctionSpace)) DisplacementGFS;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, PressureGridFunctionSpace) PressureGFS;
typedef typename GET_PROP_TYPE(TypeTag, DisplacementGridFunctionSpace) DisplacementGFS;
typedef typename Dune::PDELab::LexicographicOrderingTag OrderingTag;
typedef typename Dune::PDELab::ISTLVectorBackend<> VBE;
public:
......@@ -360,8 +360,8 @@ public:
SET_PROP(BoxElasticTwoP, PrimaryVariables)
{
private:
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
enum{numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq))};
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
enum{numEq = GET_PROP_VALUE(TypeTag, NumEq)};
public:
typedef Dune::FieldVector<Scalar, numEq> type;
};
......
......@@ -44,23 +44,23 @@ template<class TypeTag>
class ElTwoPVolumeVariables: public TwoPVolumeVariables<TypeTag> {
typedef TwoPVolumeVariables<TypeTag> TwoPBase;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) Implementation;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) Implementation;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum {
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx
};
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
enum { dim = GridView::dimension };
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldVector<Scalar, dim> DimVector;
public:
......
......@@ -53,7 +53,7 @@ namespace Properties
SET_PROP(BoxElastic, NumEq)
{
private:
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
enum{dim = GridView::dimension};
public:
static const int value = dim;
......
......@@ -779,15 +779,15 @@ SET_SCALAR_PROP(NumericModel, ProblemSalinity, 1e-3);
template <class TypeTag, bool verbose=true>
class BrineCO2FluidSystem
: public FluidSystems::BrineCO2<typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)),
typename GET_PROP_TYPE(TypeTag, PTAG(CO2Table)),
: public FluidSystems::BrineCO2<typename GET_PROP_TYPE(TypeTag, Scalar),
typename GET_PROP_TYPE(TypeTag, CO2Table),
typename GET_PROP(TypeTag, Components)::H2O,
typename GET_PROP(TypeTag, Components)::BrineRawComponent,
typename GET_PROP(TypeTag, Components)::Brine>
{
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef typename FluidSystems::BrineCO2<typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)),
typename GET_PROP_TYPE(TypeTag, PTAG(CO2Table)),
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename FluidSystems::BrineCO2<typename GET_PROP_TYPE(TypeTag, Scalar),
typename GET_PROP_TYPE(TypeTag, CO2Table),
typename GET_PROP(TypeTag, Components)::H2O,
typename GET_PROP(TypeTag, Components)::BrineRawComponent,
typename GET_PROP(TypeTag, Components)::Brine> ParentType;
......
......@@ -56,9 +56,9 @@ template<class TypeTag>
class El1P2CSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
{
typedef ImplicitSpatialParamsOneP<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
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=GridView::dimension,
......@@ -68,7 +68,7 @@ class El1P2CSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
typedef Dune::FieldMatrix<Scalar,dim,dim> DimMatrix;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::template Codim<0>::Entity Element;
public:
......
......@@ -97,8 +97,8 @@ SET_TYPE_PROP(El2P_TestProblem, SpatialParams, El2PSpatialParams<TypeTag>);
SET_PROP(El2P_TestProblem, InitialDisplacement)
{
private:
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
enum{dim = GridView::dimension};
public:
typedef Dumux::InitialDisplacement<GridView, Scalar, dim> type;
......@@ -108,8 +108,8 @@ public:
SET_PROP(El2P_TestProblem, InitialPressSat)
{
private:
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
public:
typedef Dumux::InitialPressSat<GridView, Scalar> type;
};
......@@ -160,11 +160,11 @@ template<class TypeTag = TTAG(El2P_TestProblem)>
class El2P_TestProblem : public ImplicitPorousMediaProblem<TypeTag>
{
typedef ImplicitPorousMediaProblem<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
enum {
// Grid and world dimension
......@@ -188,26 +188,26 @@ class El2P_TestProblem : public ImplicitPorousMediaProblem<TypeTag>
};
typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
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 GridView::template Codim<dim>::Iterator VertexIterator;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(VertexMapper)) VertexMapper;
typedef typename GET_PROP_TYPE(TypeTag, VertexMapper) VertexMapper;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename Grid::ctype CoordScalar;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::BlockVector<GlobalPosition> InitialStressField;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(LocalFEMSpace)) LocalFEMSpace;
typedef typename GET_PROP_TYPE(TypeTag, LocalFEMSpace) LocalFEMSpace;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(CO2Table)) CO2Table;
typedef typename GET_PROP_TYPE(TypeTag, CO2Table) CO2Table;
typedef Dumux::CO2<Scalar, CO2Table> CO2;
public:
......
......@@ -69,9 +69,9 @@ template<class TypeTag>
class El2PSpatialParams : public ImplicitSpatialParams<TypeTag>
{
typedef ImplicitSpatialParams<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
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=GridView::dimension,
......@@ -81,7 +81,7 @@ class El2PSpatialParams : public ImplicitSpatialParams<TypeTag>
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
typedef Dune::FieldMatrix<Scalar,dim,dim> DimMatrix;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::template Codim<0>::Entity Element;