From 297e91006ebb6663395a9fde64182cd06c8dc93b Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Thu, 5 Jan 2012 11:51:59 +0000
Subject: [PATCH] properties: remove all superfluous PTAG() invocations
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7305 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/boxmodels/1p/1pfluxvariables.hh | 12 ++--
dumux/boxmodels/1p/1plocalresidual.hh | 14 ++--
dumux/boxmodels/1p/1pmodel.hh | 10 +--
dumux/boxmodels/1p/1pproblem.hh | 12 ++--
dumux/boxmodels/1p/1ppropertydefaults.hh | 2 +-
dumux/boxmodels/1p/1pvolumevariables.hh | 18 ++---
dumux/boxmodels/1p2c/1p2cboundaryvariables.hh | 14 ++--
dumux/boxmodels/1p2c/1p2cfluxvariables.hh | 16 ++---
dumux/boxmodels/1p2c/1p2clocalresidual.hh | 26 ++++----
dumux/boxmodels/1p2c/1p2cmodel.hh | 18 ++---
dumux/boxmodels/1p2c/1p2cproblem.hh | 12 ++--
dumux/boxmodels/1p2c/1p2cvolumevariables.hh | 20 +++---
dumux/boxmodels/2p/2pfluxvariables.hh | 14 ++--
dumux/boxmodels/2p/2plocalresidual.hh | 18 ++---
dumux/boxmodels/2p/2pmodel.hh | 20 +++---
dumux/boxmodels/2p/2pproblem.hh | 12 ++--
dumux/boxmodels/2p/2ppropertydefaults.hh | 18 ++---
dumux/boxmodels/2p/2pvolumevariables.hh | 32 ++++-----
dumux/boxmodels/2p2c/2p2cboundaryvariables.hh | 16 ++---
dumux/boxmodels/2p2c/2p2cfluxvariables.hh | 18 ++---
dumux/boxmodels/2p2c/2p2cindices.hh | 4 +-
dumux/boxmodels/2p2c/2p2clocalresidual.hh | 30 ++++-----
dumux/boxmodels/2p2c/2p2cmodel.hh | 34 +++++-----
dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh | 4 +-
dumux/boxmodels/2p2c/2p2cproblem.hh | 12 ++--
dumux/boxmodels/2p2c/2p2cpropertydefaults.hh | 8 +--
dumux/boxmodels/2p2c/2p2cvolumevariables.hh | 26 ++++----
dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh | 10 +--
dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh | 14 ++--
dumux/boxmodels/2p2cni/2p2cniproblem.hh | 6 +-
.../2p2cni/2p2cnipropertydefaults.hh | 4 +-
.../boxmodels/2p2cni/2p2cnivolumevariables.hh | 14 ++--
dumux/boxmodels/2pni/2pnifluxvariables.hh | 10 +--
dumux/boxmodels/2pni/2pnilocalresidual.hh | 16 ++---
dumux/boxmodels/2pni/2pniproblem.hh | 6 +-
dumux/boxmodels/2pni/2pnivolumevariables.hh | 18 ++---
dumux/boxmodels/MpNc/MpNcfluxvariables.hh | 30 ++++-----
dumux/boxmodels/MpNc/MpNcindices.hh | 18 ++---
dumux/boxmodels/MpNc/MpNclocalresidual.hh | 38 +++++------
dumux/boxmodels/MpNc/MpNcmodel.hh | 46 ++++++-------
dumux/boxmodels/MpNc/MpNcnewtoncontroller.hh | 48 +++++++-------
dumux/boxmodels/MpNc/MpNcproblem.hh | 14 ++--
dumux/boxmodels/MpNc/MpNcpropertydefaults.hh | 18 ++---
dumux/boxmodels/MpNc/MpNcvolumevariables.hh | 42 ++++++------
dumux/boxmodels/MpNc/MpNcvolumevariablesia.hh | 14 ++--
dumux/boxmodels/MpNc/MpNcvtkwriter.hh | 18 ++---
dumux/boxmodels/MpNc/MpNcvtkwritercommon.hh | 32 ++++-----
dumux/boxmodels/MpNc/MpNcvtkwritermodule.hh | 24 +++----
dumux/boxmodels/MpNc/diffusion/diffusion.hh | 20 +++---
.../boxmodels/MpNc/diffusion/fluxvariables.hh | 34 +++++-----
.../MpNc/diffusion/volumevariables.hh | 24 +++----
.../MpNc/energy/MpNcfluxvariablesenergy.hh | 32 ++++-----
.../MpNc/energy/MpNclocalresidualenergy.hh | 36 +++++-----
.../MpNc/energy/MpNcvolumevariablesenergy.hh | 38 +++++------
.../MpNc/energy/MpNcvtkwriterenergy.hh | 38 +++++------
dumux/boxmodels/MpNc/mass/MpNcindicesmass.hh | 4 +-
.../MpNc/mass/MpNclocalresidualmass.hh | 40 +++++------
.../MpNc/mass/MpNcvolumevariablesmass.hh | 22 +++----
.../boxmodels/MpNc/mass/MpNcvtkwritermass.hh | 18 ++---
dumux/boxmodels/common/boxassembler.hh | 20 +++---
.../common/boxelementboundarytypes.hh | 10 +--
.../common/boxelementvolumevariables.hh | 16 ++---
.../boxmodels/common/boxfvelementgeometry.hh | 4 +-
dumux/boxmodels/common/boxlocaljacobian.hh | 30 ++++-----
dumux/boxmodels/common/boxlocalresidual.hh | 28 ++++----
dumux/boxmodels/common/boxmodel.hh | 36 +++++-----
dumux/boxmodels/common/boxproblem.hh | 26 ++++----
dumux/boxmodels/common/boxpropertydefaults.hh | 24 +++----
dumux/boxmodels/common/boxvolumevariables.hh | 12 ++--
.../richards/richardsfluxvariables.hh | 14 ++--
.../richards/richardslocalresidual.hh | 12 ++--
dumux/boxmodels/richards/richardsmodel.hh | 12 ++--
.../richards/richardsnewtoncontroller.hh | 18 ++---
dumux/boxmodels/richards/richardsproblem.hh | 12 ++--
.../richards/richardspropertydefaults.hh | 12 ++--
.../richards/richardsvolumevariables.hh | 22 +++----
dumux/common/parameters.hh | 10 +--
dumux/common/start.hh | 22 +++----
dumux/common/timemanager.hh | 4 +-
dumux/decoupled/1p/1pproperties.hh | 4 +-
.../1p/diffusion/diffusionproblem1p.hh | 12 ++--
.../decoupled/1p/diffusion/fv/fvpressure1p.hh | 22 +++----
.../decoupled/1p/diffusion/fv/fvvelocity1p.hh | 18 ++---
dumux/decoupled/2p/2pfluidstate.hh | 10 +--
dumux/decoupled/2p/2pproperties.hh | 18 ++---
dumux/decoupled/2p/2pproperties_old.hh | 10 +--
dumux/decoupled/2p/cellData2p.hh | 20 +++---
.../2p/diffusion/diffusionproblem2p.hh | 12 ++--
.../2p/diffusion/diffusionproblem2p_old.hh | 12 ++--
.../decoupled/2p/diffusion/fv/fvpressure2p.hh | 40 +++++------
.../2p/diffusion/fv/fvpressure2padaptive.hh | 32 ++++-----
.../decoupled/2p/diffusion/fv/fvvelocity2p.hh | 36 +++++-----
.../2p/diffusion/fv/fvvelocity2padaptive.hh | 24 +++----
.../2p/diffusion/fvmpfa/fvmpfaopressure2p.hh | 38 +++++------
.../2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh | 24 +++----
.../2p/diffusion/fvmpfa/mpfaproperties.hh | 2 +-
.../2p/diffusion/mimetic/croperator.hh | 2 +-
.../2p/diffusion/mimetic/localstiffness.hh | 10 +--
.../diffusion/mimetic/mimeticgroundwater.hh | 14 ++--
.../2p/diffusion/mimetic/mimeticpressure2p.hh | 28 ++++----
dumux/decoupled/2p/fluxData2p.hh | 8 +--
dumux/decoupled/2p/impes/impesproblem2p.hh | 12 ++--
.../decoupled/2p/impes/impesproblem2p_old.hh | 12 ++--
.../2p/transport/fv/capillarydiffusion.hh | 16 ++---
.../2p/transport/fv/convectivepart.hh | 6 +-
.../2p/transport/fv/diffusivepart.hh | 6 +-
.../decoupled/2p/transport/fv/evalcflflux.hh | 4 +-
.../2p/transport/fv/evalcflflux_coats.hh | 26 ++++----
.../2p/transport/fv/evalcflflux_default.hh | 12 ++--
.../transport/fv/evalcflflux_default_old.hh | 12 ++--
.../2p/transport/fv/fvsaturation2p.hh | 40 +++++------
.../decoupled/2p/transport/fv/gravitypart.hh | 20 +++---
.../2p/transport/transportproblem2p.hh | 16 ++---
dumux/decoupled/2p/variableclass2p.hh | 12 ++--
.../decoupled/2p/variableclass2p_gridadapt.hh | 16 ++---
dumux/decoupled/2p2c/2p2cproblem.hh | 14 ++--
dumux/decoupled/2p2c/2p2cproperties.hh | 14 ++--
dumux/decoupled/2p2c/dec2p2cfluidstate.hh | 12 ++--
dumux/decoupled/2p2c/fvpressure2p2c.hh | 38 +++++------
.../2p2c/fvpressure2p2cmultiphysics.hh | 28 ++++----
dumux/decoupled/2p2c/fvtransport2p2c.hh | 36 +++++-----
.../2p2c/fvtransport2p2cmultiphysics.hh | 28 ++++----
dumux/decoupled/2p2c/pseudo1p2cfluidstate.hh | 12 ++--
dumux/decoupled/2p2c/variableclass2p2c.hh | 16 ++---
dumux/decoupled/common/decoupledproperties.hh | 24 +++----
.../common/decoupledproperties_old.hh | 24 +++----
dumux/decoupled/common/gridadapt.hh | 14 ++--
dumux/decoupled/common/impet.hh | 14 ++--
dumux/decoupled/common/impet_old.hh | 12 ++--
dumux/decoupled/common/impetproblem.hh | 28 ++++----
dumux/decoupled/common/impetproblem_old.hh | 26 ++++----
dumux/decoupled/common/impetproperties.hh | 4 +-
dumux/decoupled/common/onemodelproblem.hh | 16 ++---
dumux/decoupled/common/onemodelproblem_old.hh | 16 ++---
dumux/decoupled/common/variableclass.hh | 12 ++--
dumux/decoupled/common/variableclass_old.hh | 6 +-
dumux/linear/boxlinearsolver.hh | 52 +++++++--------
dumux/linear/impetbicgstabilu0solver.hh | 10 +--
dumux/linear/seqsolverbackend.hh | 34 +++++-----
dumux/material/fluidsystems/1pfluidsystem.hh | 4 +-
.../fluidsystems/2pimmisciblefluidsystem.hh | 6 +-
.../fluidsystems/defaultcomponents.hh | 4 +-
.../material/fluidsystems/h2on2fluidsystem.hh | 4 +-
dumux/material/old_fluidsystems/2p_system.hh | 6 +-
.../old_fluidsystems/h2o_n2_system.hh | 6 +-
.../spatialparameters/boxspatialparameters.hh | 10 +--
.../boxspatialparameters1p.hh | 8 +--
.../spatialparameters/fvspatialparameters.hh | 8 +--
.../fvspatialparameters1p.hh | 6 +-
dumux/nonlinear/newtoncontroller.hh | 24 +++----
dumux/nonlinear/newtonconvergencewriter.hh | 8 +--
dumux/nonlinear/newtonmethod.hh | 12 ++--
test/boxmodels/1p/1ptestproblem.hh | 16 ++---
test/boxmodels/1p/1ptestspatialparameters.hh | 6 +-
.../1p2c/interstitialfluidtrailfluidsystem.hh | 2 +-
test/boxmodels/1p2c/tissue_tumor_problem.hh | 16 ++---
.../1p2c/tissue_tumor_spatialparameters.hh | 16 ++---
test/boxmodels/2p/lensproblem.hh | 30 ++++-----
test/boxmodels/2p/lensspatialparameters.hh | 14 ++--
test/boxmodels/2p/test_2p.cc | 8 +--
test/boxmodels/2p2c/injectionproblem.hh | 18 ++---
.../2p2c/injectionspatialparameters.hh | 22 +++----
test/boxmodels/2p2cni/waterairproblem.hh | 22 +++----
.../2p2cni/waterairspatialparameters.hh | 24 +++----
test/boxmodels/2pni/injectionproblem2pni.hh | 26 ++++----
test/boxmodels/MpNc/obstacleproblem.hh | 26 ++++----
.../MpNc/obstaclespatialparameters.hh | 24 +++----
.../boxmodels/richards/richardslensproblem.hh | 18 ++---
.../richards/richardslensspatialparameters.hh | 12 ++--
.../generalproblem/generallensproblem.hh | 28 ++++----
.../generallensspatialparameters.hh | 16 ++---
.../generalproblem/test_generalproblem_2p.cc | 10 +--
.../propertysystem/test_propertysystem.cc | 66 +++++++++----------
test/decoupled/1p/test_1p.cc | 6 +-
test/decoupled/1p/test_1p_problem.hh | 16 ++---
test/decoupled/1p/test_1p_spatialparams.hh | 6 +-
test/decoupled/1p/test_diffusion.cc | 10 +--
test/decoupled/1p/test_diffusion_problem.hh | 18 ++---
.../1p/test_diffusion_spatialparams.hh | 10 +--
test/decoupled/2p/test_impes.cc | 8 +--
test/decoupled/2p/test_impes_problem.hh | 22 +++----
test/decoupled/2p/test_impes_spatialparams.hh | 10 +--
test/decoupled/2p/test_transport.cc | 6 +-
test/decoupled/2p/test_transport_problem.hh | 22 +++----
.../2p/test_transport_spatialparams.hh | 10 +--
test/decoupled/2p2c/test_dec2p2c.cc | 8 +--
.../2p2c/test_dec2p2c_spatialparams.hh | 6 +-
test/decoupled/2p2c/test_dec2p2cproblem.hh | 26 ++++----
test/decoupled/2p2c/test_multiphysics2p2c.cc | 8 +--
.../2p2c/test_multiphysics2p2cproblem.hh | 28 ++++----
.../2padaptive/test_impes_adaptive.cc | 12 ++--
.../2padaptive/test_impes_adaptive_problem.hh | 22 +++----
.../test_impes_adaptive_spatialparams.hh | 10 +--
tutorial/tutorial_coupled.cc | 8 +--
tutorial/tutorial_decoupled.cc | 10 +--
tutorial/tutorialproblem_coupled.hh | 18 ++---
tutorial/tutorialproblem_decoupled.hh | 22 +++----
tutorial/tutorialspatialparameters_coupled.hh | 12 ++--
.../tutorialspatialparameters_decoupled.hh | 10 +--
199 files changed, 1748 insertions(+), 1748 deletions(-)
diff --git a/dumux/boxmodels/1p/1pfluxvariables.hh b/dumux/boxmodels/1p/1pfluxvariables.hh
index 78abfdf194..511f4eab7e 100644
--- a/dumux/boxmodels/1p/1pfluxvariables.hh
+++ b/dumux/boxmodels/1p/1pfluxvariables.hh
@@ -50,18 +50,18 @@ namespace Dumux
template <class TypeTag>
class OnePFluxVariables
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
- 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 Dune::FieldVector<Scalar, dim> Vector;
typedef Dune::FieldMatrix<Scalar, dim, dim> Tensor;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
public:
diff --git a/dumux/boxmodels/1p/1plocalresidual.hh b/dumux/boxmodels/1p/1plocalresidual.hh
index 02dbae0c7f..0454731a4e 100644
--- a/dumux/boxmodels/1p/1plocalresidual.hh
+++ b/dumux/boxmodels/1p/1plocalresidual.hh
@@ -48,17 +48,17 @@ class OnePLocalResidual : public BoxLocalResidual<TypeTag>
{
typedef OnePLocalResidual<TypeTag> ThisType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ 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, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
enum { dimWorld = GridView::dimensionworld };
typedef Dune::FieldVector<Scalar, dimWorld> Vector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(OnePIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, OnePIndices) Indices;
enum { pressureIdx = Indices::pressureIdx };
public:
diff --git a/dumux/boxmodels/1p/1pmodel.hh b/dumux/boxmodels/1p/1pmodel.hh
index c9c6340e98..8a59e13238 100644
--- a/dumux/boxmodels/1p/1pmodel.hh
+++ b/dumux/boxmodels/1p/1pmodel.hh
@@ -55,12 +55,12 @@ namespace Dumux
template<class TypeTag >
class OnePBoxModel : public BoxModel<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementBoundaryTypes)) ElementBoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) SolutionVector;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
enum { dim = GridView::dimension };
diff --git a/dumux/boxmodels/1p/1pproblem.hh b/dumux/boxmodels/1p/1pproblem.hh
index 2e5799632a..21a84fe155 100644
--- a/dumux/boxmodels/1p/1pproblem.hh
+++ b/dumux/boxmodels/1p/1pproblem.hh
@@ -44,16 +44,16 @@ class OnePBoxProblem : public BoxProblem<TypeTag>
{
typedef BoxProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
- 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 { dimWorld = GridView::dimensionworld };
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
public:
diff --git a/dumux/boxmodels/1p/1ppropertydefaults.hh b/dumux/boxmodels/1p/1ppropertydefaults.hh
index d17b6ccaa4..4e53006fd2 100644
--- a/dumux/boxmodels/1p/1ppropertydefaults.hh
+++ b/dumux/boxmodels/1p/1ppropertydefaults.hh
@@ -82,7 +82,7 @@ SET_TYPE_PROP(BoxOneP, FluidSystem, Dumux::FluidSystems::OneP<typename GET_PROP_
SET_PROP(BoxOneP, Fluid)
{ private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
};
diff --git a/dumux/boxmodels/1p/1pvolumevariables.hh b/dumux/boxmodels/1p/1pvolumevariables.hh
index e91466fe22..9fd5991442 100644
--- a/dumux/boxmodels/1p/1pvolumevariables.hh
+++ b/dumux/boxmodels/1p/1pvolumevariables.hh
@@ -47,15 +47,15 @@ class OnePVolumeVariables : public BoxVolumeVariables<TypeTag>
{
typedef BoxVolumeVariables<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- 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(OnePIndices)) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
-
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, OnePIndices) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
public:
diff --git a/dumux/boxmodels/1p2c/1p2cboundaryvariables.hh b/dumux/boxmodels/1p2c/1p2cboundaryvariables.hh
index 08bbcf1fd6..2883d3e23d 100644
--- a/dumux/boxmodels/1p2c/1p2cboundaryvariables.hh
+++ b/dumux/boxmodels/1p2c/1p2cboundaryvariables.hh
@@ -50,26 +50,26 @@ namespace Dumux
template <class TypeTag>
class OnePTwoCBoundaryVariables
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(OnePTwoCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, OnePTwoCIndices) Indices;
enum {
phaseIdx = Indices::phaseIdx,
comp0Idx = Indices::comp0Idx,
comp1Idx = Indices::comp1Idx
};
- 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> Vector;
typedef Dune::FieldMatrix<Scalar, dim, dim> Tensor;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename FVElementGeometry::BoundaryFace BoundaryFace;
public:
diff --git a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
index c522639507..79096bfcec 100644
--- a/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
+++ b/dumux/boxmodels/1p2c/1p2cfluxvariables.hh
@@ -55,19 +55,19 @@ namespace Dumux
template <class TypeTag>
class OnePTwoCFluxVariables
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- 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(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(OnePTwoCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, OnePTwoCIndices) Indices;
enum {
phaseIdx = Indices::phaseIdx,
comp0Idx = Indices::comp0Idx,
comp1Idx = Indices::comp1Idx
};
- 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,
@@ -76,11 +76,11 @@ class OnePTwoCFluxVariables
typedef typename GridView::ctype CoordScalar;
typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldVector<Scalar, dimWorld> Vector;
typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> Tensor;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
public:
diff --git a/dumux/boxmodels/1p2c/1p2clocalresidual.hh b/dumux/boxmodels/1p2c/1p2clocalresidual.hh
index a7854cc340..3eeb2716f3 100644
--- a/dumux/boxmodels/1p2c/1p2clocalresidual.hh
+++ b/dumux/boxmodels/1p2c/1p2clocalresidual.hh
@@ -60,28 +60,28 @@ class OnePTwoCLocalResidual : public BoxLocalResidual<TypeTag>
{
protected:
typedef OnePTwoCLocalResidual<TypeTag> ThisType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(LocalResidual)) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) Implementation;
typedef BoxLocalResidual<TypeTag> ParentType;
- 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;
typedef typename GridView::IntersectionIterator IntersectionIterator;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryVariables)) BoundaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryVariables) BoundaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(OnePTwoCIndices)) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, OnePTwoCIndices) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
enum
{
dim = GridView::dimension,
dimWorld = GridView::dimensionworld,
- numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)),
+ numEq = GET_PROP_VALUE(TypeTag, NumEq),
// indices of the primary variables
pressureIdx = Indices::pressureIdx,
@@ -96,7 +96,7 @@ protected:
transEqIdx = Indices::transEqIdx
};
- static const bool useMoles = GET_PROP_VALUE(TypeTag, PTAG(UseMoles));
+ static const bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
diff --git a/dumux/boxmodels/1p2c/1p2cmodel.hh b/dumux/boxmodels/1p2c/1p2cmodel.hh
index 11e0cf88bc..1f89660156 100644
--- a/dumux/boxmodels/1p2c/1p2cmodel.hh
+++ b/dumux/boxmodels/1p2c/1p2cmodel.hh
@@ -78,14 +78,14 @@ namespace Dumux
template<class TypeTag >
class OnePTwoCBoxModel : public BoxModel<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementBoundaryTypes)) ElementBoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) SolutionVector;
-
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ 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;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
+
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
enum {
dim = GridView::dimension,
dimWorld = GridView::dimensionworld
@@ -93,7 +93,7 @@ class OnePTwoCBoxModel : public BoxModel<TypeTag>
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::template Codim<dim>::Iterator VertexIterator;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
public:
diff --git a/dumux/boxmodels/1p2c/1p2cproblem.hh b/dumux/boxmodels/1p2c/1p2cproblem.hh
index 306b383b16..6d0a054806 100644
--- a/dumux/boxmodels/1p2c/1p2cproblem.hh
+++ b/dumux/boxmodels/1p2c/1p2cproblem.hh
@@ -46,12 +46,12 @@ class OnePTwoCBoxProblem : public BoxProblem<TypeTag>
{
typedef BoxProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
- 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,
@@ -60,7 +60,7 @@ class OnePTwoCBoxProblem : public BoxProblem<TypeTag>
typedef typename GridView::ctype CoordScalar;
typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldVector<Scalar, dim> Vector;
public:
diff --git a/dumux/boxmodels/1p2c/1p2cvolumevariables.hh b/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
index b304e3c770..76b31c4af6 100644
--- a/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
+++ b/dumux/boxmodels/1p2c/1p2cvolumevariables.hh
@@ -48,14 +48,14 @@ class OnePTwoCVolumeVariables : public BoxVolumeVariables<TypeTag>
{
typedef BoxVolumeVariables<TypeTag> ParentType;
- 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(FluidSystem)) FluidSystem;
- static const bool useMoles = GET_PROP_VALUE(TypeTag, PTAG(UseMoles));
-
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(OnePTwoCIndices)) 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, FluidSystem) FluidSystem;
+ static const bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
+
+ typedef typename GET_PROP_TYPE(TypeTag, OnePTwoCIndices) Indices;
enum {
phaseIdx = Indices::phaseIdx,
comp0Idx = Indices::comp0Idx,
@@ -68,11 +68,11 @@ class OnePTwoCVolumeVariables : public BoxVolumeVariables<TypeTag>
transEqIdx = Indices::transEqIdx
};
- 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 { dimWorld = GridView::dimensionworld };
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldVector<Scalar,dimWorld> Vector;
public:
diff --git a/dumux/boxmodels/2p/2pfluxvariables.hh b/dumux/boxmodels/2p/2pfluxvariables.hh
index a7e08a63a2..c4f0f41bce 100644
--- a/dumux/boxmodels/2p/2pfluxvariables.hh
+++ b/dumux/boxmodels/2p/2pfluxvariables.hh
@@ -53,23 +53,23 @@ namespace Dumux
template <class TypeTag>
class TwoPFluxVariables
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
+ 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 {
dim = GridView::dimension,
dimWorld = GridView::dimensionworld,
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases))
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> Tensor;
typedef Dune::FieldVector<Scalar, dimWorld> Vector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
public:
diff --git a/dumux/boxmodels/2p/2plocalresidual.hh b/dumux/boxmodels/2p/2plocalresidual.hh
index 773fd115b7..1e840efdb0 100644
--- a/dumux/boxmodels/2p/2plocalresidual.hh
+++ b/dumux/boxmodels/2p/2plocalresidual.hh
@@ -47,26 +47,26 @@ template<class TypeTag>
class TwoPLocalResidual : public BoxLocalResidual<TypeTag>
{
protected:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(LocalResidual)) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ 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, PTAG(TwoPIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
enum
{
contiWEqIdx = Indices::contiWEqIdx,
contiNEqIdx = Indices::contiNEqIdx,
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx,
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases))
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
enum { dimWorld = GridView::dimensionworld };
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldVector<Scalar, dimWorld> Vector;
public:
diff --git a/dumux/boxmodels/2p/2pmodel.hh b/dumux/boxmodels/2p/2pmodel.hh
index 6a12ea1642..9a00f8553a 100644
--- a/dumux/boxmodels/2p/2pmodel.hh
+++ b/dumux/boxmodels/2p/2pmodel.hh
@@ -75,21 +75,21 @@ namespace Dumux
template<class TypeTag >
class TwoPModel : public BoxModel<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
+ typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
enum {
nPhaseIdx = Indices::nPhaseIdx,
wPhaseIdx = Indices::wPhaseIdx,
pressureIdx = Indices::pressureIdx,
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases))
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::ctype CoordScalar;
enum {
@@ -97,7 +97,7 @@ class TwoPModel : public BoxModel<TypeTag>
dimWorld = GridView::dimensionworld
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldVector<Scalar, numPhases> PhasesVector;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
@@ -128,7 +128,7 @@ public:
void addOutputVtkFields(const SolutionVector &sol,
MultiWriter &writer)
{
- bool velocityOutput = GET_PROP_VALUE(TypeTag, PTAG(EnableVelocityOutput));
+ bool velocityOutput = GET_PROP_VALUE(TypeTag, EnableVelocityOutput);
typedef Dune::BlockVector<Dune::FieldVector<double, 1> > ScalarField;
typedef Dune::BlockVector<Dune::FieldVector<double, dim> > VectorField;
diff --git a/dumux/boxmodels/2p/2pproblem.hh b/dumux/boxmodels/2p/2pproblem.hh
index dffa7c05ca..b34ded32a0 100644
--- a/dumux/boxmodels/2p/2pproblem.hh
+++ b/dumux/boxmodels/2p/2pproblem.hh
@@ -42,12 +42,12 @@ class TwoPProblem : public BoxProblem<TypeTag>
{
typedef BoxProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
- 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,
@@ -56,7 +56,7 @@ class TwoPProblem : public BoxProblem<TypeTag>
typedef typename GridView::ctype CoordScalar;
typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldVector<Scalar, dim> Vector;
public:
diff --git a/dumux/boxmodels/2p/2ppropertydefaults.hh b/dumux/boxmodels/2p/2ppropertydefaults.hh
index d254c317d5..3fdd5cab0a 100644
--- a/dumux/boxmodels/2p/2ppropertydefaults.hh
+++ b/dumux/boxmodels/2p/2ppropertydefaults.hh
@@ -81,7 +81,7 @@ SET_SCALAR_PROP(BoxTwoP, MassUpwindWeight, 1.0);
//! The indices required by the isothermal 2p model
SET_TYPE_PROP(BoxTwoP,
TwoPIndices,
- TwoPIndices<GET_PROP_VALUE(TypeTag, PTAG(Formulation)), 0>);
+ TwoPIndices<GET_PROP_VALUE(TypeTag, Formulation), 0>);
/*!
* \brief Set the property for the material parameters by extracting
@@ -89,27 +89,27 @@ SET_TYPE_PROP(BoxTwoP,
*/
SET_TYPE_PROP(BoxTwoP,
MaterialLawParams,
- typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw))::Params);
+ typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params);
SET_PROP(BoxTwoP, WettingPhase)
{ private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
};
SET_PROP(BoxTwoP, NonwettingPhase)
{ private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
};
SET_PROP(BoxTwoP, FluidSystem)
{ private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(WettingPhase)) WettingPhase;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(NonwettingPhase)) NonwettingPhase;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, WettingPhase) WettingPhase;
+ typedef typename GET_PROP_TYPE(TypeTag, NonwettingPhase) NonwettingPhase;
public:
typedef Dumux::FluidSystems::TwoPImmiscible<Scalar,
@@ -120,8 +120,8 @@ public:
SET_PROP(BoxTwoP, FluidState)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
typedef ImmiscibleFluidState<Scalar, FluidSystem> type;
};
diff --git a/dumux/boxmodels/2p/2pvolumevariables.hh b/dumux/boxmodels/2p/2pvolumevariables.hh
index ed50c7e6cc..03a3c7125c 100644
--- a/dumux/boxmodels/2p/2pvolumevariables.hh
+++ b/dumux/boxmodels/2p/2pvolumevariables.hh
@@ -48,17 +48,17 @@ class TwoPVolumeVariables : public BoxVolumeVariables<TypeTag>
{
typedef BoxVolumeVariables<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
- 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(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
-
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
enum {
pwSn = Indices::pwSn,
pnSw = Indices::pnSw,
@@ -66,11 +66,11 @@ class TwoPVolumeVariables : public BoxVolumeVariables<TypeTag>
saturationIdx = Indices::saturationIdx,
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx,
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
- formulation = GET_PROP_VALUE(TypeTag, PTAG(Formulation))
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
+ formulation = GET_PROP_VALUE(TypeTag, Formulation)
};
- 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;
public:
@@ -132,7 +132,7 @@ public:
fluidState.setTemperature(t);
// material law parameters
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw)) MaterialLaw;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
const typename MaterialLaw::Params &materialParams =
problem.spatialParameters().materialLawParams(element, elemGeom, scvIdx);
@@ -158,7 +158,7 @@ public:
pN - MaterialLaw::pC(materialParams, Sw));
}
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typename FluidSystem::ParameterCache paramCache;
paramCache.updateAll(fluidState);
diff --git a/dumux/boxmodels/2p2c/2p2cboundaryvariables.hh b/dumux/boxmodels/2p2c/2p2cboundaryvariables.hh
index 1ad1946753..2877118314 100644
--- a/dumux/boxmodels/2p2c/2p2cboundaryvariables.hh
+++ b/dumux/boxmodels/2p2c/2p2cboundaryvariables.hh
@@ -51,12 +51,12 @@ namespace Dumux
template <class TypeTag>
class TwoPTwoCBoundaryVariables
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
- enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)) };
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
enum {
lPhaseIdx = Indices::lPhaseIdx,
gPhaseIdx = Indices::gPhaseIdx,
@@ -64,15 +64,15 @@ class TwoPTwoCBoundaryVariables
gCompIdx = Indices::gCompIdx
};
- 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> Vector;
typedef Dune::FieldMatrix<Scalar, dim, dim> Tensor;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename FVElementGeometry::BoundaryFace BoundaryFace;
public:
diff --git a/dumux/boxmodels/2p2c/2p2cfluxvariables.hh b/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
index 0d9386be3b..706197bc91 100644
--- a/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
+++ b/dumux/boxmodels/2p2c/2p2cfluxvariables.hh
@@ -52,13 +52,13 @@ namespace Dumux
template <class TypeTag>
class TwoPTwoCFluxVariables
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- 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(SpatialParameters)) SpatialParameters;
- enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)) };
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
enum {
lPhaseIdx = Indices::lPhaseIdx,
gPhaseIdx = Indices::gPhaseIdx,
@@ -66,15 +66,15 @@ class TwoPTwoCFluxVariables
gCompIdx = Indices::gCompIdx
};
- 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> Vector;
typedef Dune::FieldMatrix<Scalar, dim, dim> Tensor;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
public:
diff --git a/dumux/boxmodels/2p2c/2p2cindices.hh b/dumux/boxmodels/2p2c/2p2cindices.hh
index 65feb762dd..b578c2e5ed 100644
--- a/dumux/boxmodels/2p2c/2p2cindices.hh
+++ b/dumux/boxmodels/2p2c/2p2cindices.hh
@@ -58,7 +58,7 @@ template <class TypeTag,
int PVOffset = 0>
class TwoPTwoCIndices
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
// Phase indices
@@ -96,7 +96,7 @@ public:
template <class TypeTag, int PVOffset>
class TwoPTwoCIndices<TypeTag, TwoPTwoCFormulation::pgSl, PVOffset>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
// Phase indices
diff --git a/dumux/boxmodels/2p2c/2p2clocalresidual.hh b/dumux/boxmodels/2p2c/2p2clocalresidual.hh
index d004e5b694..5db2c99ef3 100644
--- a/dumux/boxmodels/2p2c/2p2clocalresidual.hh
+++ b/dumux/boxmodels/2p2c/2p2clocalresidual.hh
@@ -55,25 +55,25 @@ namespace Dumux
* This class is used to fill the gaps in BoxLocalResidual for the 2P-2C flow.
*/
template<class TypeTag>
-class TwoPTwoCLocalResidual: public GET_PROP_TYPE(TypeTag, PTAG(BaseLocalResidual))
+class TwoPTwoCLocalResidual: public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
{
protected:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(LocalResidual)) Implementation;
- 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(FVElementGeometry)) FVElementGeometry;
- 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(ElementBoundaryTypes)) ElementBoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
enum
{
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
- numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents))
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
+ numComponents = GET_PROP_VALUE(TypeTag, NumComponents)
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
enum
{
contiLEqIdx = Indices::contiLEqIdx,
@@ -84,11 +84,11 @@ protected:
gCompIdx = Indices::gCompIdx
};
- 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;
static constexpr unsigned int replaceCompEqIdx =
- GET_PROP_VALUE(TypeTag, PTAG(ReplaceCompEqIdx));
+ GET_PROP_VALUE(TypeTag, ReplaceCompEqIdx);
public:
/*!
diff --git a/dumux/boxmodels/2p2c/2p2cmodel.hh b/dumux/boxmodels/2p2c/2p2cmodel.hh
index d3dc12dcc3..6e344ba74a 100644
--- a/dumux/boxmodels/2p2c/2p2cmodel.hh
+++ b/dumux/boxmodels/2p2c/2p2cmodel.hh
@@ -91,23 +91,23 @@ class TwoPTwoCModel: public BoxModel<TypeTag>
{
typedef BoxModel<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- 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(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementBoundaryTypes)) ElementBoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
- 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(SolutionVector)) SolutionVector;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, VertexMapper) VertexMapper;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementMapper) ElementMapper;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
enum {
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
- numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents))
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
+ numComponents = GET_PROP_VALUE(TypeTag, NumComponents)
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
enum {
pressureIdx = Indices::pressureIdx,
switchIdx = Indices::switchIdx,
@@ -123,10 +123,10 @@ class TwoPTwoCModel: public BoxModel<TypeTag>
plSg = TwoPTwoCFormulation::plSg,
pgSl = TwoPTwoCFormulation::pgSl,
- formulation = GET_PROP_VALUE(TypeTag, PTAG(Formulation))
+ formulation = GET_PROP_VALUE(TypeTag, Formulation)
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::ctype CoordScalar;
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
@@ -137,7 +137,7 @@ class TwoPTwoCModel: public BoxModel<TypeTag>
typedef typename GridView::template Codim<dim>::Entity Vertex;
typedef typename GridView::template Codim<dim>::Iterator VertexIterator;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldVector<Scalar, numPhases> PhasesVector;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
diff --git a/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh b/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh
index d62e269029..693bfa4b9a 100644
--- a/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh
+++ b/dumux/boxmodels/2p2c/2p2cnewtoncontroller.hh
@@ -49,8 +49,8 @@ template <class TypeTag>
class TwoPTwoCNewtonController : public NewtonController<TypeTag>
{
typedef NewtonController<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) SolutionVector;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
public:
TwoPTwoCNewtonController(const Problem &problem)
diff --git a/dumux/boxmodels/2p2c/2p2cproblem.hh b/dumux/boxmodels/2p2c/2p2cproblem.hh
index bc8305b68d..984d0f098a 100644
--- a/dumux/boxmodels/2p2c/2p2cproblem.hh
+++ b/dumux/boxmodels/2p2c/2p2cproblem.hh
@@ -45,12 +45,12 @@ class TwoPTwoCProblem : public BoxProblem<TypeTag>
{
typedef BoxProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
- 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,
@@ -59,7 +59,7 @@ class TwoPTwoCProblem : public BoxProblem<TypeTag>
typedef typename GridView::ctype CoordScalar;
typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldVector<Scalar, dim> Vector;
public:
diff --git a/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh b/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh
index 8f5c186603..d76db3bc3f 100644
--- a/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh
+++ b/dumux/boxmodels/2p2c/2p2cpropertydefaults.hh
@@ -59,7 +59,7 @@ namespace Properties {
SET_PROP(BoxTwoPTwoC, NumComponents)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
static const int value = FluidSystem::numComponents;
@@ -77,7 +77,7 @@ public:
SET_PROP(BoxTwoPTwoC, NumPhases)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
static const int value = FluidSystem::numPhases;
@@ -102,7 +102,7 @@ SET_INT_PROP(BoxTwoPTwoC, ReplaceCompEqIdx, 2);
SET_PROP(BoxTwoPTwoC, 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;
@@ -135,7 +135,7 @@ SET_SCALAR_PROP(BoxTwoPTwoC, MassUpwindWeight, 1.0);
SET_PROP(BoxTwoPTwoC,
TwoPTwoCIndices)
{ private:
- enum { Formulation = GET_PROP_VALUE(TypeTag, PTAG(Formulation)) };
+ enum { Formulation = GET_PROP_VALUE(TypeTag, Formulation) };
public:
typedef TwoPTwoCIndices<TypeTag, Formulation, 0> type;
};
diff --git a/dumux/boxmodels/2p2c/2p2cvolumevariables.hh b/dumux/boxmodels/2p2c/2p2cvolumevariables.hh
index a44aa8292a..34337ae1f7 100644
--- a/dumux/boxmodels/2p2c/2p2cvolumevariables.hh
+++ b/dumux/boxmodels/2p2c/2p2cvolumevariables.hh
@@ -58,18 +58,18 @@ class TwoPTwoCVolumeVariables : public BoxVolumeVariables<TypeTag>
{
typedef BoxVolumeVariables<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- 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(MaterialLaw)) MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLawParams)) MaterialLawParams;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
enum {
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
- numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents))
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
+ numComponents = GET_PROP_VALUE(TypeTag, NumComponents)
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
enum {
lCompIdx = Indices::lCompIdx,
gCompIdx = Indices::gCompIdx,
@@ -86,7 +86,7 @@ class TwoPTwoCVolumeVariables : public BoxVolumeVariables<TypeTag>
// formulations
enum {
- formulation = GET_PROP_VALUE(TypeTag, PTAG(Formulation)),
+ formulation = GET_PROP_VALUE(TypeTag, Formulation),
plSg = TwoPTwoCFormulation::plSg,
pgSl = TwoPTwoCFormulation::pgSl
};
@@ -97,12 +97,12 @@ class TwoPTwoCVolumeVariables : public BoxVolumeVariables<TypeTag>
pressureIdx = Indices::pressureIdx
};
- 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, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef Dumux::MiscibleMultiPhaseComposition<Scalar, FluidSystem> MiscibleMultiPhaseComposition;
typedef Dumux::ComputeFromReferencePhase<Scalar, FluidSystem> ComputeFromReferencePhase;
diff --git a/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh b/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
index e741564acf..28de0b6e63 100644
--- a/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnifluxvariables.hh
@@ -55,12 +55,12 @@ class TwoPTwoCNIFluxVariables : public TwoPTwoCFluxVariables<TypeTag>
{
typedef TwoPTwoCFluxVariables<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- 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 { dimWorld = GridView::dimensionworld };
diff --git a/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh b/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh
index 043992b9a4..125aa6e070 100644
--- a/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnilocalresidual.hh
@@ -53,15 +53,15 @@ class TwoPTwoCNILocalResidual : public TwoPTwoCLocalResidual<TypeTag>
{
typedef TwoPTwoCLocalResidual<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ 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, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
enum {
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
energyEqIdx = Indices::energyEqIdx,
temperatureIdx = Indices::temperatureIdx,
lPhaseIdx = Indices::lPhaseIdx,
diff --git a/dumux/boxmodels/2p2cni/2p2cniproblem.hh b/dumux/boxmodels/2p2cni/2p2cniproblem.hh
index 187aeefce5..7666f7a4b0 100644
--- a/dumux/boxmodels/2p2cni/2p2cniproblem.hh
+++ b/dumux/boxmodels/2p2cni/2p2cniproblem.hh
@@ -43,9 +43,9 @@ class TwoPTwoCNIProblem : public TwoPTwoCProblem<TypeTag>
{
typedef TwoPTwoCProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
/*!
diff --git a/dumux/boxmodels/2p2cni/2p2cnipropertydefaults.hh b/dumux/boxmodels/2p2cni/2p2cnipropertydefaults.hh
index 3a19659888..3cc12d87fe 100644
--- a/dumux/boxmodels/2p2cni/2p2cnipropertydefaults.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnipropertydefaults.hh
@@ -71,11 +71,11 @@ SET_TYPE_PROP(BoxTwoPTwoCNI, FluxVariables, TwoPTwoCNIFluxVariables<TypeTag>);
//! The indices required by the non-isothermal 2p2c model
SET_PROP(BoxTwoPTwoCNI, TwoPTwoCIndices)
-{ typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCNIIndices)) type; };
+{ typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCNIIndices) type; };
SET_PROP(BoxTwoPTwoCNI, TwoPTwoCNIIndices)
{ private:
- enum { formulation = GET_PROP_VALUE(TypeTag, PTAG(Formulation)) };
+ enum { formulation = GET_PROP_VALUE(TypeTag, Formulation) };
public:
typedef TwoPTwoCNIIndices<TypeTag, formulation, 0> type;
};
diff --git a/dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh b/dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh
index 7225d3bbf6..a0638f62d0 100644
--- a/dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh
+++ b/dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh
@@ -50,16 +50,16 @@ class TwoPTwoCNIVolumeVariables : public TwoPTwoCVolumeVariables<TypeTag>
typedef TwoPTwoCVolumeVariables<TypeTag> ParentType;
typedef typename ParentType::FluidState FluidState;
- 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(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
enum { temperatureIdx = Indices::temperatureIdx };
- 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;
//! \endcond
diff --git a/dumux/boxmodels/2pni/2pnifluxvariables.hh b/dumux/boxmodels/2pni/2pnifluxvariables.hh
index 22811ed1d1..4d01e24ef2 100644
--- a/dumux/boxmodels/2pni/2pnifluxvariables.hh
+++ b/dumux/boxmodels/2pni/2pnifluxvariables.hh
@@ -55,12 +55,12 @@ class TwoPNIFluxVariables : public TwoPFluxVariables<TypeTag>
{
typedef TwoPFluxVariables<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- 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 { dimWorld = GridView::dimensionworld };
diff --git a/dumux/boxmodels/2pni/2pnilocalresidual.hh b/dumux/boxmodels/2pni/2pnilocalresidual.hh
index ec572a0dc1..1fbce6bcae 100644
--- a/dumux/boxmodels/2pni/2pnilocalresidual.hh
+++ b/dumux/boxmodels/2pni/2pnilocalresidual.hh
@@ -54,24 +54,24 @@ class TwoPNILocalResidual : public TwoPLocalResidual<TypeTag>
{
typedef TwoPLocalResidual<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ 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, PTAG(TwoPIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
enum {
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
temperatureIdx = Indices::temperatureIdx,
energyEqIdx = Indices::energyEqIdx,
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
enum { dimWorld = GridView::dimensionworld };
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldVector<Scalar, dimWorld> Vector;
public:
diff --git a/dumux/boxmodels/2pni/2pniproblem.hh b/dumux/boxmodels/2pni/2pniproblem.hh
index 107c5c7348..76d11d6b1c 100644
--- a/dumux/boxmodels/2pni/2pniproblem.hh
+++ b/dumux/boxmodels/2pni/2pniproblem.hh
@@ -45,9 +45,9 @@ class TwoPNIProblem : public TwoPProblem<TypeTag>
{
typedef TwoPProblem<TypeTag> ParentType;
- 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(TimeManager)) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
public:
/*!
diff --git a/dumux/boxmodels/2pni/2pnivolumevariables.hh b/dumux/boxmodels/2pni/2pnivolumevariables.hh
index 4ca3437e69..5f8a08235f 100644
--- a/dumux/boxmodels/2pni/2pnivolumevariables.hh
+++ b/dumux/boxmodels/2pni/2pnivolumevariables.hh
@@ -42,18 +42,18 @@ namespace Dumux
template <class TypeTag>
class TwoPNIVolumeVariables : public TwoPVolumeVariables<TypeTag>
{
- 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(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
- enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)) };
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
enum { temperatureIdx = Indices::temperatureIdx };
- 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;
public:
diff --git a/dumux/boxmodels/MpNc/MpNcfluxvariables.hh b/dumux/boxmodels/MpNc/MpNcfluxvariables.hh
index b43381a016..825e18e0d2 100644
--- a/dumux/boxmodels/MpNc/MpNcfluxvariables.hh
+++ b/dumux/boxmodels/MpNc/MpNcfluxvariables.hh
@@ -54,31 +54,31 @@ namespace Dumux
template <class TypeTag>
class MPNCFluxVariables
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
enum {
dimWorld = GridView::dimensionworld,
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
- numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)),
-
- enableDiffusion = GET_PROP_VALUE(TypeTag, PTAG(EnableDiffusion)),
- enableEnergy = GET_PROP_VALUE(TypeTag, PTAG(EnableEnergy)),
- enableKinetic = GET_PROP_VALUE(TypeTag, PTAG(EnableKinetic)),
- enableKineticEnergy = GET_PROP_VALUE(TypeTag, PTAG(EnableKineticEnergy)),
- enableGravity = GET_PROP_VALUE(TypeTag, PTAG(EnableGravity))
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
+ numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
+
+ enableDiffusion = GET_PROP_VALUE(TypeTag, EnableDiffusion),
+ enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy),
+ enableKinetic = GET_PROP_VALUE(TypeTag, EnableKinetic),
+ enableKineticEnergy = GET_PROP_VALUE(TypeTag, EnableKineticEnergy),
+ enableGravity = GET_PROP_VALUE(TypeTag, EnableGravity)
};
typedef typename GridView::ctype CoordScalar;
typedef Dune::FieldVector<CoordScalar, dimWorld> Vector;
typedef Dune::FieldMatrix<CoordScalar, dimWorld, dimWorld> Tensor;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename FVElementGeometry::SubControlVolume SCV;
typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
diff --git a/dumux/boxmodels/MpNc/MpNcindices.hh b/dumux/boxmodels/MpNc/MpNcindices.hh
index da6806791d..9f20607021 100644
--- a/dumux/boxmodels/MpNc/MpNcindices.hh
+++ b/dumux/boxmodels/MpNc/MpNcindices.hh
@@ -39,22 +39,22 @@ template <class TypeTag, int BasePVOffset = 0>
struct MPNCIndices :
public MPNCMassIndices<BasePVOffset,
TypeTag,
- GET_PROP_VALUE(TypeTag, PTAG(EnableKinetic)) >,
+ GET_PROP_VALUE(TypeTag, EnableKinetic) >,
public MPNCEnergyIndices<BasePVOffset +
- MPNCMassIndices<0, TypeTag, GET_PROP_VALUE(TypeTag, PTAG(EnableKinetic)) >::NumPrimaryVars,
- GET_PROP_VALUE(TypeTag, PTAG(EnableEnergy)),
- GET_PROP_VALUE(TypeTag, PTAG(EnableKineticEnergy))>
+ MPNCMassIndices<0, TypeTag, GET_PROP_VALUE(TypeTag, EnableKinetic) >::NumPrimaryVars,
+ GET_PROP_VALUE(TypeTag, EnableEnergy),
+ GET_PROP_VALUE(TypeTag, EnableKineticEnergy)>
{
private:
- enum { enableEnergy = GET_PROP_VALUE(TypeTag, PTAG(EnableEnergy)) };
- enum { enableDiffusion = GET_PROP_VALUE(TypeTag, PTAG(EnableDiffusion)) };
- enum { enableKinetic = GET_PROP_VALUE(TypeTag, PTAG(EnableKinetic)) }; //mass transfer
- enum { enableKineticEnergy = GET_PROP_VALUE(TypeTag, PTAG(EnableKineticEnergy)) }; // energy transfer
+ enum { enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy) };
+ enum { enableDiffusion = GET_PROP_VALUE(TypeTag, EnableDiffusion) };
+ enum { enableKinetic = GET_PROP_VALUE(TypeTag, EnableKinetic) }; //mass transfer
+ enum { enableKineticEnergy = GET_PROP_VALUE(TypeTag, EnableKineticEnergy) }; // energy transfer
typedef MPNCMassIndices<BasePVOffset, TypeTag, enableKinetic> MassIndices;
typedef MPNCEnergyIndices<BasePVOffset + MassIndices::NumPrimaryVars, enableEnergy, enableKineticEnergy> EnergyIndices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
enum { numComponents = FluidSystem::numComponents };
enum { numPhases = FluidSystem::numPhases };
diff --git a/dumux/boxmodels/MpNc/MpNclocalresidual.hh b/dumux/boxmodels/MpNc/MpNclocalresidual.hh
index bc9012b2df..4c63795d57 100644
--- a/dumux/boxmodels/MpNc/MpNclocalresidual.hh
+++ b/dumux/boxmodels/MpNc/MpNclocalresidual.hh
@@ -46,32 +46,32 @@ namespace Dumux
template<class TypeTag>
class MPNCLocalResidual : public BoxLocalResidual<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
protected:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(LocalResidual)) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) Implementation;
typedef MPNCLocalResidual<TypeTag> ThisType;
typedef BoxLocalResidual<TypeTag> ParentType;
- 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;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
enum {
dim = GridView::dimension,
dimWorld = GridView::dimensionworld,
- numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)),
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
- numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)),
+ numEq = GET_PROP_VALUE(TypeTag, NumEq),
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
+ numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
- enableEnergy = GET_PROP_VALUE(TypeTag, PTAG(EnableEnergy)),
- enableKineticEnergy = GET_PROP_VALUE(TypeTag, PTAG(EnableKineticEnergy)),
+ enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy),
+ enableKineticEnergy = GET_PROP_VALUE(TypeTag, EnableKineticEnergy),
- enableDiffusion = GET_PROP_VALUE(TypeTag, PTAG(EnableDiffusion)),
- enableKinetic = GET_PROP_VALUE(TypeTag, PTAG(EnableKinetic)),
- enableSmoothUpwinding = GET_PROP_VALUE(TypeTag, PTAG(EnableSmoothUpwinding)),
+ enableDiffusion = GET_PROP_VALUE(TypeTag, EnableDiffusion),
+ enableKinetic = GET_PROP_VALUE(TypeTag, EnableKinetic),
+ enableSmoothUpwinding = GET_PROP_VALUE(TypeTag, EnableSmoothUpwinding),
phase0NcpIdx = Indices::phase0NcpIdx
};
@@ -79,18 +79,18 @@ protected:
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename GridView::template Codim<dim>::Entity Vertex;
typedef typename GridView::template Codim<dim>::Iterator VertexIterator;
typedef typename GridView::CollectiveCommunication CollectiveCommunication;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementBoundaryTypes)) ElementBoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ 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;
typedef Dune::FieldVector<Scalar, numPhases> PhasesVector;
typedef Dune::FieldVector<Scalar, numComponents> ComponentVector;
diff --git a/dumux/boxmodels/MpNc/MpNcmodel.hh b/dumux/boxmodels/MpNc/MpNcmodel.hh
index 24a7594521..90e5d89f18 100644
--- a/dumux/boxmodels/MpNc/MpNcmodel.hh
+++ b/dumux/boxmodels/MpNc/MpNcmodel.hh
@@ -92,41 +92,41 @@ class MPNCModel : public BoxModel<TypeTag>
typedef MPNCModel<TypeTag> ThisType;
typedef BoxModel<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementBoundaryTypes)) ElementBoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) SolutionVector;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
typedef Dune::BlockVector<Dune::FieldVector<Scalar, 1> > ScalarField;
typedef Dumux::MPNCVtkWriter<TypeTag> MPNCVtkWriter;
enum {
- enableEnergy = GET_PROP_VALUE(TypeTag, PTAG(EnableEnergy)),
- enableDiffusion = GET_PROP_VALUE(TypeTag, PTAG(EnableDiffusion)),
- enableKinetic = GET_PROP_VALUE(TypeTag, PTAG(EnableKinetic)),
- enableKineticEnergy = GET_PROP_VALUE(TypeTag, PTAG(EnableKineticEnergy)),
- enableSmoothUpwinding = GET_PROP_VALUE(TypeTag, PTAG(EnableSmoothUpwinding)),
- enablePartialReassemble = GET_PROP_VALUE(TypeTag, PTAG(EnablePartialReassemble)),
- enableJacobianRecycling = GET_PROP_VALUE(TypeTag, PTAG(EnableJacobianRecycling)),
- numDiffMethod = GET_PROP_VALUE(TypeTag, PTAG(NumericDifferenceMethod)),
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
- numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)),
- numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)),
+ enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy),
+ enableDiffusion = GET_PROP_VALUE(TypeTag, EnableDiffusion),
+ enableKinetic = GET_PROP_VALUE(TypeTag, EnableKinetic),
+ enableKineticEnergy = GET_PROP_VALUE(TypeTag, EnableKineticEnergy),
+ enableSmoothUpwinding = GET_PROP_VALUE(TypeTag, EnableSmoothUpwinding),
+ enablePartialReassemble = GET_PROP_VALUE(TypeTag, EnablePartialReassemble),
+ enableJacobianRecycling = GET_PROP_VALUE(TypeTag, EnableJacobianRecycling),
+ numDiffMethod = GET_PROP_VALUE(TypeTag, NumericDifferenceMethod),
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
+ numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
+ numEq = GET_PROP_VALUE(TypeTag, NumEq),
dimWorld = GridView::dimensionworld,
dim = GridView::dimension
};
diff --git a/dumux/boxmodels/MpNc/MpNcnewtoncontroller.hh b/dumux/boxmodels/MpNc/MpNcnewtoncontroller.hh
index 82d57aa36c..58bb2e7183 100644
--- a/dumux/boxmodels/MpNc/MpNcnewtoncontroller.hh
+++ b/dumux/boxmodels/MpNc/MpNcnewtoncontroller.hh
@@ -41,12 +41,12 @@ namespace Dumux {
template <class TypeTag, bool enableKinetic /* = false */>
class MpNcNewtonChop
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCIndices)) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) SolutionVector;
+ typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)) };
- enum { numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)) };
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
+ enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { fug0Idx = Indices::fug0Idx };
enum { S0Idx = Indices::S0Idx };
enum { p0Idx = Indices::p0Idx };
@@ -92,12 +92,12 @@ private:
template <class TypeTag>
class MpNcNewtonChop<TypeTag, /*enableKinetic=*/true>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCIndices)) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) SolutionVector;
+ typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)) };
- enum { numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)) };
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
+ enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { moleFrac00Idx = Indices::moleFrac00Idx };
enum { S0Idx = Indices::S0Idx };
enum { p0Idx = Indices::p0Idx };
@@ -165,24 +165,24 @@ class MPNCNewtonController : public NewtonController<TypeTag>
typedef MPNCNewtonController<TypeTag> ThisType;
typedef NewtonController<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) SolutionVector;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(NewtonMethod)) NewtonMethod;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(JacobianAssembler)) JacobianAssembler;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, NewtonMethod) NewtonMethod;
+ typedef typename GET_PROP_TYPE(TypeTag, JacobianAssembler) JacobianAssembler;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCIndices)) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
enum {
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
- numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)),
- enableEnergy = GET_PROP_VALUE(TypeTag, PTAG(EnableEnergy)),
- enableKinetic = GET_PROP_VALUE(TypeTag, PTAG(EnableKinetic)),
- numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)),
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
+ numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
+ enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy),
+ enableKinetic = GET_PROP_VALUE(TypeTag, EnableKinetic),
+ numEq = GET_PROP_VALUE(TypeTag, NumEq),
- enablePartialReassemble = GET_PROP_VALUE(TypeTag, PTAG(EnablePartialReassemble)),
+ enablePartialReassemble = GET_PROP_VALUE(TypeTag, EnablePartialReassemble),
p0Idx = Indices::p0Idx,
S0Idx = Indices::S0Idx,
@@ -218,7 +218,7 @@ public:
this->model_().jacobianAssembler().computeColors(reassembleTol);
}
- if (GET_PROP_VALUE(TypeTag, PTAG(NewtonUseLineSearch))) {
+ if (GET_PROP_VALUE(TypeTag, NewtonUseLineSearch)) {
lineSearchUpdate_(uCurrentIter, uLastIter, deltaU);
}
else {
diff --git a/dumux/boxmodels/MpNc/MpNcproblem.hh b/dumux/boxmodels/MpNc/MpNcproblem.hh
index 00243bfe82..43eb2eef1a 100644
--- a/dumux/boxmodels/MpNc/MpNcproblem.hh
+++ b/dumux/boxmodels/MpNc/MpNcproblem.hh
@@ -45,17 +45,17 @@ template<class TypeTag>
class MPNCProblem : public BoxProblem<TypeTag>
{
typedef BoxProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::Grid Grid;
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
// material properties
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
enum {
dim = Grid::dimension,
@@ -70,7 +70,7 @@ public:
gravity_(0),
spatialParameters_(gridView)
{
- if (GET_PROP_VALUE(TypeTag, PTAG(EnableGravity)))
+ if (GET_PROP_VALUE(TypeTag, EnableGravity))
gravity_[dim-1] = -9.81;
}
diff --git a/dumux/boxmodels/MpNc/MpNcpropertydefaults.hh b/dumux/boxmodels/MpNc/MpNcpropertydefaults.hh
index df4dfa2329..1655cd7879 100644
--- a/dumux/boxmodels/MpNc/MpNcpropertydefaults.hh
+++ b/dumux/boxmodels/MpNc/MpNcpropertydefaults.hh
@@ -65,7 +65,7 @@ namespace Properties
SET_PROP(BoxMPNC, NumComponents)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
static const int value = FluidSystem::numComponents;
@@ -80,7 +80,7 @@ public:
SET_PROP(BoxMPNC, NumPhases)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
static const int value = FluidSystem::numPhases;
@@ -92,7 +92,7 @@ public:
SET_PROP(BoxMPNC, NumEq)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
public:
static const int value = Indices::NumPrimaryVars;
@@ -105,7 +105,7 @@ public:
SET_PROP(BoxMPNC, 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;
@@ -118,8 +118,8 @@ public:
SET_PROP(BoxMPNC, CompositionFromFugacitiesSolver)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
typedef Dumux::CompositionFromFugacities<Scalar, FluidSystem> type;
@@ -184,7 +184,7 @@ SET_PROP(BoxMPNC, MPNCVtkCommonModule)
//! mass module
SET_PROP(BoxMPNC, MPNCVtkMassModule)
{
-private: enum { enableKinetic = GET_PROP_VALUE(TypeTag, PTAG(EnableKinetic)) };
+private: enum { enableKinetic = GET_PROP_VALUE(TypeTag, EnableKinetic) };
public: typedef MPNCVtkWriterMass<TypeTag, enableKinetic> type;
};
@@ -193,8 +193,8 @@ public: typedef MPNCVtkWriterMass<TypeTag, enableKinetic> type;
SET_PROP(BoxMPNC, MPNCVtkEnergyModule)
{
private:
- enum { enableEnergy = GET_PROP_VALUE(TypeTag, PTAG(EnableEnergy)) };
- enum { enableKineticEnergy = GET_PROP_VALUE(TypeTag, PTAG(EnableKineticEnergy)) };
+ enum { enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy) };
+ enum { enableKineticEnergy = GET_PROP_VALUE(TypeTag, EnableKineticEnergy) };
public:
typedef MPNCVtkWriterEnergy<TypeTag, enableEnergy, enableKineticEnergy> type;
};
diff --git a/dumux/boxmodels/MpNc/MpNcvolumevariables.hh b/dumux/boxmodels/MpNc/MpNcvolumevariables.hh
index 57948b1741..5820136e85 100644
--- a/dumux/boxmodels/MpNc/MpNcvolumevariables.hh
+++ b/dumux/boxmodels/MpNc/MpNcvolumevariables.hh
@@ -50,33 +50,33 @@ namespace Dumux
template <class TypeTag>
class MPNCVolumeVariables
: public BoxVolumeVariables<TypeTag>
- , public MPNCVolumeVariablesIA<TypeTag, GET_PROP_VALUE(TypeTag, PTAG(EnableKinetic)), GET_PROP_VALUE(TypeTag, PTAG(EnableKineticEnergy))>
- , public MPNCVolumeVariablesMass<TypeTag, GET_PROP_VALUE(TypeTag, PTAG(EnableKinetic))>
- , public MPNCVolumeVariablesDiffusion<TypeTag, GET_PROP_VALUE(TypeTag, PTAG(EnableDiffusion)) || GET_PROP_VALUE(TypeTag, PTAG(EnableKinetic))>
- , public MPNCVolumeVariablesEnergy<TypeTag, GET_PROP_VALUE(TypeTag, PTAG(EnableEnergy)), GET_PROP_VALUE(TypeTag, PTAG(EnableKineticEnergy))>
+ , public MPNCVolumeVariablesIA<TypeTag, GET_PROP_VALUE(TypeTag, EnableKinetic), GET_PROP_VALUE(TypeTag, EnableKineticEnergy)>
+ , public MPNCVolumeVariablesMass<TypeTag, GET_PROP_VALUE(TypeTag, EnableKinetic)>
+ , public MPNCVolumeVariablesDiffusion<TypeTag, GET_PROP_VALUE(TypeTag, EnableDiffusion) || GET_PROP_VALUE(TypeTag, EnableKinetic)>
+ , public MPNCVolumeVariablesEnergy<TypeTag, GET_PROP_VALUE(TypeTag, EnableEnergy), GET_PROP_VALUE(TypeTag, EnableKineticEnergy)>
{
typedef BoxVolumeVariables<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) Implementation;
- 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(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- 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(PrimaryVariables)) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) Implementation;
+ 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, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
enum {
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
- numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)),
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
+ numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
dimWorld = GridView::dimensionworld,
- enableEnergy = GET_PROP_VALUE(TypeTag, PTAG(EnableEnergy)),
- enableKinetic = GET_PROP_VALUE(TypeTag, PTAG(EnableKinetic)),
- enableKineticEnergy = GET_PROP_VALUE(TypeTag, PTAG(EnableKineticEnergy)),
- enableDiffusion = GET_PROP_VALUE(TypeTag, PTAG(EnableDiffusion)) || enableKinetic,
+ enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy),
+ enableKinetic = GET_PROP_VALUE(TypeTag, EnableKinetic),
+ enableKineticEnergy = GET_PROP_VALUE(TypeTag, EnableKineticEnergy),
+ enableDiffusion = GET_PROP_VALUE(TypeTag, EnableDiffusion) || enableKinetic,
numEnergyEqs = Indices::NumPrimaryEnergyVars,
diff --git a/dumux/boxmodels/MpNc/MpNcvolumevariablesia.hh b/dumux/boxmodels/MpNc/MpNcvolumevariablesia.hh
index 4c21f5224e..026e8d07a0 100644
--- a/dumux/boxmodels/MpNc/MpNcvolumevariablesia.hh
+++ b/dumux/boxmodels/MpNc/MpNcvolumevariablesia.hh
@@ -51,13 +51,13 @@ class MPNCVolumeVariablesIA
"but no suitable specialization of the IA volume variables module "
"has been included.");
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- 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(VolumeVariables)) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
typedef typename GridView::template Codim<0>::Entity Element;
diff --git a/dumux/boxmodels/MpNc/MpNcvtkwriter.hh b/dumux/boxmodels/MpNc/MpNcvtkwriter.hh
index 178aaa126c..0b14593474 100644
--- a/dumux/boxmodels/MpNc/MpNcvtkwriter.hh
+++ b/dumux/boxmodels/MpNc/MpNcvtkwriter.hh
@@ -36,17 +36,17 @@ namespace Dumux
template<class TypeTag>
class MPNCVtkWriter
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCVtkCommonModule)) MPNCVtkCommonModule;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCVtkMassModule)) MPNCVtkMassModule;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCVtkEnergyModule)) MPNCVtkEnergyModule;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCVtkCustomModule)) MPNCVtkCustomModule;
+ typedef typename GET_PROP_TYPE(TypeTag, MPNCVtkCommonModule) MPNCVtkCommonModule;
+ typedef typename GET_PROP_TYPE(TypeTag, MPNCVtkMassModule) MPNCVtkMassModule;
+ typedef typename GET_PROP_TYPE(TypeTag, MPNCVtkEnergyModule) MPNCVtkEnergyModule;
+ typedef typename GET_PROP_TYPE(TypeTag, MPNCVtkCustomModule) MPNCVtkCustomModule;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementBoundaryTypes)) ElementBoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
enum { dim = GridView::dimension };
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
diff --git a/dumux/boxmodels/MpNc/MpNcvtkwritercommon.hh b/dumux/boxmodels/MpNc/MpNcvtkwritercommon.hh
index 373bf42106..038a8dffc7 100644
--- a/dumux/boxmodels/MpNc/MpNcvtkwritercommon.hh
+++ b/dumux/boxmodels/MpNc/MpNcvtkwritercommon.hh
@@ -44,18 +44,18 @@ class MPNCVtkWriterCommon : public MPNCVtkWriterModule<TypeTag>
{
typedef MPNCVtkWriterModule<TypeTag> 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(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementBoundaryTypes)) ElementBoundaryTypes;
-
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(LocalResidual)) LocalResidual;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
-
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
+
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) LocalResidual;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
enum { dim = GridView::dimension };
@@ -65,11 +65,11 @@ class MPNCVtkWriterCommon : public MPNCVtkWriterModule<TypeTag>
typedef typename ParentType::ComponentBuffer ComponentBuffer;
typedef typename ParentType::PhaseComponentBuffer PhaseComponentBuffer;
- enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)) };
- enum { numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)) };
- enum { numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)) };
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
+ enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
+ enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
- enum { velocityAveragingInModel = GET_PROP_VALUE(TypeTag, PTAG(VelocityAveragingInModel)) };
+ enum { velocityAveragingInModel = GET_PROP_VALUE(TypeTag, VelocityAveragingInModel) };
typedef Dune::FieldVector<Scalar, dim> VelocityVector;
typedef Dune::BlockVector<VelocityVector> VelocityField;
diff --git a/dumux/boxmodels/MpNc/MpNcvtkwritermodule.hh b/dumux/boxmodels/MpNc/MpNcvtkwritermodule.hh
index 3363801ee2..030de516b1 100644
--- a/dumux/boxmodels/MpNc/MpNcvtkwritermodule.hh
+++ b/dumux/boxmodels/MpNc/MpNcvtkwritermodule.hh
@@ -45,18 +45,18 @@ namespace Dumux
template<class TypeTag>
class MPNCVtkWriterModule
{
- enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)) };
- enum { numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)) };
-
- 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(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementBoundaryTypes)) ElementBoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
-
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCIndices)) Indices;
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
+ enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
+
+ 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, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+
+ typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
typedef typename GridView::template Codim<0>::Entity Element;
diff --git a/dumux/boxmodels/MpNc/diffusion/diffusion.hh b/dumux/boxmodels/MpNc/diffusion/diffusion.hh
index aacc1a16a3..c6fe29a74f 100644
--- a/dumux/boxmodels/MpNc/diffusion/diffusion.hh
+++ b/dumux/boxmodels/MpNc/diffusion/diffusion.hh
@@ -33,18 +33,18 @@ namespace Dumux {
template <class TypeTag, bool enableDiffusion>
class MPNCDiffusion
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
- enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)) };
- enum { numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents))};
- enum { enableKinetic= GET_PROP_VALUE(TypeTag, PTAG(EnableKinetic))};
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
+ enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents)};
+ enum { enableKinetic= GET_PROP_VALUE(TypeTag, EnableKinetic)};
enum { gPhaseIdx = FluidSystem::gPhaseIdx };
enum { lPhaseIdx = FluidSystem::lPhaseIdx };
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef Dune::FieldMatrix<Scalar, numComponents, numComponents> DiffMatrix;
typedef Dune::FieldVector<Scalar, numComponents> DiffVector;
@@ -135,10 +135,10 @@ protected:
template <class TypeTag>
class MPNCDiffusion<TypeTag, false>
{
- enum { numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)) };
+ enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef Dune::FieldVector<Scalar, numComponents> CompVector;
public:
diff --git a/dumux/boxmodels/MpNc/diffusion/fluxvariables.hh b/dumux/boxmodels/MpNc/diffusion/fluxvariables.hh
index 7068620c26..5a349f0a49 100644
--- a/dumux/boxmodels/MpNc/diffusion/fluxvariables.hh
+++ b/dumux/boxmodels/MpNc/diffusion/fluxvariables.hh
@@ -37,15 +37,15 @@ namespace Dumux {
template<class TypeTag, bool enableDiffusion>
class MPNCFluxVariablesDiffusion
{
- 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;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- 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(FluxVariables)) FluxVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
typedef typename GridView::template Codim<0>::Entity Element;
@@ -53,8 +53,8 @@ class MPNCFluxVariablesDiffusion
dim = GridView::dimension,
dimWorld = GridView::dimensionworld,
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
- numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)),
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
+ numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
lPhaseIdx = FluidSystem::lPhaseIdx,
gPhaseIdx = FluidSystem::gPhaseIdx
@@ -64,13 +64,13 @@ class MPNCFluxVariablesDiffusion
typedef Dune::FieldVector<Scalar, dimWorld> Vector;
typedef Dune::FieldVector<Scalar, dim> LocalPosition;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename FVElementGeometry::SubControlVolume SCV;
typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
typedef Dune::FieldVector<Scalar, numPhases> PhasesVector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
public:
MPNCFluxVariablesDiffusion()
@@ -213,13 +213,13 @@ protected:
template<class TypeTag>
class MPNCFluxVariablesDiffusion<TypeTag, false>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
public:
MPNCFluxVariablesDiffusion()
diff --git a/dumux/boxmodels/MpNc/diffusion/volumevariables.hh b/dumux/boxmodels/MpNc/diffusion/volumevariables.hh
index 87be47db80..4c9fb17ca2 100644
--- a/dumux/boxmodels/MpNc/diffusion/volumevariables.hh
+++ b/dumux/boxmodels/MpNc/diffusion/volumevariables.hh
@@ -36,18 +36,18 @@ namespace Dumux {
template<class TypeTag, bool enableDiffusion>
class MPNCVolumeVariablesDiffusion
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
- enum { numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)) };
+ enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { lPhaseIdx = FluidSystem::lPhaseIdx };
enum { gPhaseIdx = FluidSystem::gPhaseIdx };
@@ -132,9 +132,9 @@ protected:
template<class TypeTag>
class MPNCVolumeVariablesDiffusion<TypeTag, false>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
MPNCVolumeVariablesDiffusion()
diff --git a/dumux/boxmodels/MpNc/energy/MpNcfluxvariablesenergy.hh b/dumux/boxmodels/MpNc/energy/MpNcfluxvariablesenergy.hh
index fd734895e1..ae11463271 100644
--- a/dumux/boxmodels/MpNc/energy/MpNcfluxvariablesenergy.hh
+++ b/dumux/boxmodels/MpNc/energy/MpNcfluxvariablesenergy.hh
@@ -43,15 +43,15 @@ class MPNCFluxVariablesEnergy
"No kinetic energy transfer module included, "
"but kinetic energy transfer enabled.");
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- 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;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- 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(FluxVariables)) FluxVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
public:
MPNCFluxVariablesEnergy()
@@ -70,14 +70,14 @@ public:
template <class TypeTag>
class MPNCFluxVariablesEnergy<TypeTag, /*enableEnergy=*/true, /*kineticEnergyTransfer=*/false>
{
- 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;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- 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(FluxVariables)) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename GridView::ctype CoordScalar;
typedef typename GridView::template Codim<0>::Entity Element;
@@ -87,12 +87,12 @@ class MPNCFluxVariablesEnergy<TypeTag, /*enableEnergy=*/true, /*kineticEnergyTr
dimWorld = GridView::dimensionworld,
gPhaseIdx = FluidSystem::gPhaseIdx,
lPhaseIdx = FluidSystem::lPhaseIdx,
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases))
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
typedef Dune::FieldVector<CoordScalar, dimWorld> Vector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename FVElementGeometry::SubControlVolume SCV;
typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
@@ -140,7 +140,7 @@ public:
const int i = fvElemGeom.subContVolFace[faceIdx].i;
const int j = fvElemGeom.subContVolFace[faceIdx].j;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables))::FluidState FluidState;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables)::FluidState FluidState;
const FluidState &fsI = elemVolVars[i].fluidState();
const FluidState &fsJ = elemVolVars[j].fluidState();
const Scalar Sli = fsI.saturation(lPhaseIdx);
diff --git a/dumux/boxmodels/MpNc/energy/MpNclocalresidualenergy.hh b/dumux/boxmodels/MpNc/energy/MpNclocalresidualenergy.hh
index f5df71603f..1a5bb1f4c7 100644
--- a/dumux/boxmodels/MpNc/energy/MpNclocalresidualenergy.hh
+++ b/dumux/boxmodels/MpNc/energy/MpNclocalresidualenergy.hh
@@ -46,14 +46,14 @@ class MPNCLocalResidualEnergy
"No kinetic energy transfer module included, "
"but kinetic energy transfer enabled.");
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
-
- enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)) };
- enum { numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)) };
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ 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, Scalar) Scalar;
+
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
+ enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
typedef typename Dune::FieldVector<Scalar, numComponents> ComponentVector;
public:
@@ -108,20 +108,20 @@ public:
template <class TypeTag>
class MPNCLocalResidualEnergy<TypeTag, /*enableEnergy=*/true, /*kineticenergyTransfer=*/false>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
enum { dim = GridView::dimension };
- enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)) };
- enum { numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)) };
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
+ enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { conti0EqIdx = Indices::conti0EqIdx };
enum { energyEqIdx = Indices::energyEqIdx };
diff --git a/dumux/boxmodels/MpNc/energy/MpNcvolumevariablesenergy.hh b/dumux/boxmodels/MpNc/energy/MpNcvolumevariablesenergy.hh
index e8e65b820b..0208257182 100644
--- a/dumux/boxmodels/MpNc/energy/MpNcvolumevariablesenergy.hh
+++ b/dumux/boxmodels/MpNc/energy/MpNcvolumevariablesenergy.hh
@@ -51,17 +51,17 @@ class MPNCVolumeVariablesEnergy
"No kinetic energy transfer module included, "
"but kinetic energy transfer enabled.");
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)) };
- //typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCEnergyIndices)) EnergyIndices;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
+ //typedef typename GET_PROP_TYPE(TypeTag, MPNCEnergyIndices) EnergyIndices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename FluidSystem::ParameterCache ParameterCache;
typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> FluidState;
@@ -113,24 +113,24 @@ public:
template <class TypeTag>
class MPNCVolumeVariablesEnergy<TypeTag, /*enableEnergy=*/true, /*kineticEnergyTransfer=*/false>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
- enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)) };
- enum { numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)) };
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
+ enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { temperatureIdx = Indices::temperatureIdx };
enum { numEnergyEqs = Indices::NumPrimaryEnergyVars};
enum { temperature0Idx = Indices::temperatureIdx };
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename FluidSystem::ParameterCache ParameterCache;
typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> FluidState;
diff --git a/dumux/boxmodels/MpNc/energy/MpNcvtkwriterenergy.hh b/dumux/boxmodels/MpNc/energy/MpNcvtkwriterenergy.hh
index a75c33f846..0e978d21c3 100644
--- a/dumux/boxmodels/MpNc/energy/MpNcvtkwriterenergy.hh
+++ b/dumux/boxmodels/MpNc/energy/MpNcvtkwriterenergy.hh
@@ -51,20 +51,20 @@ class MPNCVtkWriterEnergy : public MPNCVtkWriterModule<TypeTag>
typedef MPNCVtkWriterModule<TypeTag> 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(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementBoundaryTypes)) ElementBoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- 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 };
- enum { numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)) };
+ enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
typedef typename ParentType::ScalarBuffer ScalarBuffer;
typedef typename ParentType::PhaseBuffer PhaseBuffer;
@@ -138,21 +138,21 @@ class MPNCVtkWriterEnergy<TypeTag, /* enableEnergy = */ true, /* enableKineticEn
{
typedef MPNCVtkWriterModule<TypeTag> 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(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementBoundaryTypes)) ElementBoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- 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 };
- enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)) };
- enum { numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)) };
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
+ enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
typedef typename ParentType::ScalarBuffer ScalarBuffer;
typedef typename ParentType::PhaseBuffer PhaseBuffer;
diff --git a/dumux/boxmodels/MpNc/mass/MpNcindicesmass.hh b/dumux/boxmodels/MpNc/mass/MpNcindicesmass.hh
index 621f0827e3..8d5753fefc 100644
--- a/dumux/boxmodels/MpNc/mass/MpNcindicesmass.hh
+++ b/dumux/boxmodels/MpNc/mass/MpNcindicesmass.hh
@@ -44,8 +44,8 @@ class MPNCMassIndices
"No kinetic mass transfer module included, "
"but kinetic mass transfer enabled.");
- enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)) };
- enum { numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)) };
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
+ enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
public:
/*!
diff --git a/dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh b/dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh
index 6983d0cc1c..a3657e8191 100644
--- a/dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh
+++ b/dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh
@@ -40,17 +40,17 @@ template<class TypeTag>
class MPNCLocalResidualMassCommon
{
protected:
- 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(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
enum { dim = GridView::dimension };
- enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)) };
- enum { numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)) };
- enum { enableDiffusion = GET_PROP_VALUE(TypeTag, PTAG(EnableDiffusion)) };
- enum { enableEnergy = GET_PROP_VALUE(TypeTag, PTAG(EnableEnergy)) };
- enum { enableKineticEnergy = GET_PROP_VALUE(TypeTag, PTAG(EnableKineticEnergy)) };
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
+ enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
+ enum { enableDiffusion = GET_PROP_VALUE(TypeTag, EnableDiffusion) };
+ enum { enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy) };
+ enum { enableKineticEnergy = GET_PROP_VALUE(TypeTag, EnableKineticEnergy) };
typedef typename Dune::FieldVector<Scalar, dim> Vector;
typedef typename Dune::FieldVector<Scalar, numComponents> ComponentVector;
@@ -226,23 +226,23 @@ class MPNCLocalResidualMass
typedef MPNCLocalResidualMassCommon<TypeTag> MassCommon;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCIndices)) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
- 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(FluxVariables)) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)) };
- enum { numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)) };
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
+ enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { conti0EqIdx = Indices::conti0EqIdx };
enum { numEnergyEqs = Indices::NumPrimaryEnergyVars};
typedef typename Dune::FieldVector<Scalar, numComponents> ComponentVector;
- enum { enableEnergy = GET_PROP_VALUE(TypeTag, PTAG(EnableEnergy)) };
- enum { enableKineticEnergy = GET_PROP_VALUE(TypeTag, PTAG(EnableKineticEnergy)) };
+ enum { enableEnergy = GET_PROP_VALUE(TypeTag, EnableEnergy) };
+ enum { enableKineticEnergy = GET_PROP_VALUE(TypeTag, EnableKineticEnergy) };
typedef MPNCLocalResidualEnergy<TypeTag, enableEnergy, enableKineticEnergy> EnergyResid;
public:
diff --git a/dumux/boxmodels/MpNc/mass/MpNcvolumevariablesmass.hh b/dumux/boxmodels/MpNc/mass/MpNcvolumevariablesmass.hh
index 272ba9a432..a5c41ecadd 100644
--- a/dumux/boxmodels/MpNc/mass/MpNcvolumevariablesmass.hh
+++ b/dumux/boxmodels/MpNc/mass/MpNcvolumevariablesmass.hh
@@ -42,22 +42,22 @@ class MPNCVolumeVariablesMass
"No kinetic mass transfer module included, "
"but kinetic mass transfer enabled.");
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCIndices)) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(CompositionFromFugacitiesSolver)) CompositionFromFugacitiesSolver;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, CompositionFromFugacitiesSolver) CompositionFromFugacitiesSolver;
typedef typename GridView::template Codim<0>::Entity Element;
- enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)) };
- enum { numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)) };
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
+ enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
enum { fug0Idx = Indices::fug0Idx };
typedef Dune::FieldVector<Scalar, numComponents> ComponentVector;
diff --git a/dumux/boxmodels/MpNc/mass/MpNcvtkwritermass.hh b/dumux/boxmodels/MpNc/mass/MpNcvtkwritermass.hh
index 468df85e3a..dc68b0b045 100644
--- a/dumux/boxmodels/MpNc/mass/MpNcvtkwritermass.hh
+++ b/dumux/boxmodels/MpNc/mass/MpNcvtkwritermass.hh
@@ -50,20 +50,20 @@ class MPNCVtkWriterMass : public MPNCVtkWriterModule<TypeTag>
typedef MPNCVtkWriterModule<TypeTag> 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(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementBoundaryTypes)) ElementBoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- 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 };
- enum { numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)) };
+ enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
bool fugacityOutput_;
typedef typename ParentType::ScalarBuffer ScalarBuffer;
diff --git a/dumux/boxmodels/common/boxassembler.hh b/dumux/boxmodels/common/boxassembler.hh
index 1366fdadb6..f3fb1ee5e3 100644
--- a/dumux/boxmodels/common/boxassembler.hh
+++ b/dumux/boxmodels/common/boxassembler.hh
@@ -43,23 +43,23 @@ namespace Dumux {
template<class TypeTag>
class BoxAssembler
{
- 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, 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, 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;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::template Codim<dim>::EntityPointer VertexPointer;
- enum { numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)) };
+ enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
typedef Dune::FieldMatrix<Scalar, numEq, numEq> MatrixBlock;
typedef Dune::FieldVector<Scalar, numEq> VectorBlock;
diff --git a/dumux/boxmodels/common/boxelementboundarytypes.hh b/dumux/boxmodels/common/boxelementboundarytypes.hh
index 9201346f81..cb7d270518 100644
--- a/dumux/boxmodels/common/boxelementboundarytypes.hh
+++ b/dumux/boxmodels/common/boxelementboundarytypes.hh
@@ -43,14 +43,14 @@ namespace Dumux
* \brief This class stores an array of BoundaryTypes objects
*/
template<class TypeTag>
-class BoxElementBoundaryTypes : public std::vector<typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) >
+class BoxElementBoundaryTypes : public std::vector<typename GET_PROP_TYPE(TypeTag, BoundaryTypes) >
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
typedef std::vector<BoundaryTypes> ParentType;
- 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(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
enum { dim = GridView::dimension };
typedef typename GridView::template Codim<0>::Entity Element;
diff --git a/dumux/boxmodels/common/boxelementvolumevariables.hh b/dumux/boxmodels/common/boxelementvolumevariables.hh
index 4e94ab304c..e468760288 100644
--- a/dumux/boxmodels/common/boxelementvolumevariables.hh
+++ b/dumux/boxmodels/common/boxelementvolumevariables.hh
@@ -40,19 +40,19 @@ namespace Dumux
* volume variables object for each of the element's vertices
*/
template<class TypeTag>
-class BoxElementVolumeVariables : public std::vector<typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) >
+class BoxElementVolumeVariables : public std::vector<typename GET_PROP_TYPE(TypeTag, VolumeVariables) >
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- 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, 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, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
enum { dim = GridView::dimension };
- enum { numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)) };
+ enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
public:
/*!
diff --git a/dumux/boxmodels/common/boxfvelementgeometry.hh b/dumux/boxmodels/common/boxfvelementgeometry.hh
index 168f5aa6b8..a44b0642f5 100644
--- a/dumux/boxmodels/common/boxfvelementgeometry.hh
+++ b/dumux/boxmodels/common/boxfvelementgeometry.hh
@@ -301,7 +301,7 @@ public:
template<class TypeTag>
class BoxFVElementGeometry
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
enum{dim = GridView::dimension};
typedef BoxFVElementGeometry<TypeTag> ThisType;
@@ -316,7 +316,7 @@ class BoxFVElementGeometry
enum{maxNF = (dim < 3 ? 1 : 6)};
enum{maxCOS = (dim < 3 ? 2 : 4)};
enum{maxBF = (dim < 3 ? 8 : 24)};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GridView::ctype CoordScalar;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename Element::Geometry Geometry;
diff --git a/dumux/boxmodels/common/boxlocaljacobian.hh b/dumux/boxmodels/common/boxlocaljacobian.hh
index e9618466c7..2fc5243793 100644
--- a/dumux/boxmodels/common/boxlocaljacobian.hh
+++ b/dumux/boxmodels/common/boxlocaljacobian.hh
@@ -70,16 +70,16 @@ template<class TypeTag>
class BoxLocalJacobian
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(LocalJacobian)) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(LocalResidual)) LocalResidual;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Model)) Model;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, LocalJacobian) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) LocalResidual;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(JacobianAssembler)) JacobianAssembler;
+ typedef typename GET_PROP_TYPE(TypeTag, JacobianAssembler) JacobianAssembler;
enum {
- numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)),
+ numEq = GET_PROP_VALUE(TypeTag, NumEq),
dim = GridView::dimension,
Red = JacobianAssembler::Red,
@@ -87,16 +87,16 @@ private:
Green = JacobianAssembler::Green
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VertexMapper)) VertexMapper;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementSolutionVector)) ElementSolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, VertexMapper) VertexMapper;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementSolutionVector) ElementSolutionVector;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- 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(ElementBoundaryTypes)) ElementBoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldMatrix<Scalar, numEq, numEq> MatrixBlock;
typedef Dune::Matrix<MatrixBlock> LocalBlockMatrix;
diff --git a/dumux/boxmodels/common/boxlocalresidual.hh b/dumux/boxmodels/common/boxlocalresidual.hh
index e3c447116f..9e367e4ccb 100644
--- a/dumux/boxmodels/common/boxlocalresidual.hh
+++ b/dumux/boxmodels/common/boxlocalresidual.hh
@@ -48,14 +48,14 @@ template<class TypeTag>
class BoxLocalResidual
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(LocalResidual)) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- 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(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
enum {
- numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)),
+ numEq = GET_PROP_VALUE(TypeTag, NumEq),
dim = GridView::dimension
};
@@ -67,14 +67,14 @@ private:
typedef typename Dune::GenericReferenceElements<CoordScalar, dim> ReferenceElements;
typedef typename Dune::GenericReferenceElement<CoordScalar, dim> ReferenceElement;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VertexMapper)) VertexMapper;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementSolutionVector)) ElementSolutionVector;
- 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(ElementBoundaryTypes)) ElementBoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, VertexMapper) VertexMapper;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementSolutionVector) ElementSolutionVector;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
// copying the local residual class is not a good idea
BoxLocalResidual(const BoxLocalResidual &);
diff --git a/dumux/boxmodels/common/boxmodel.hh b/dumux/boxmodels/common/boxmodel.hh
index 69ebccbb5a..4c724323a3 100644
--- a/dumux/boxmodels/common/boxmodel.hh
+++ b/dumux/boxmodels/common/boxmodel.hh
@@ -50,29 +50,29 @@ namespace Dumux
template<class TypeTag>
class BoxModel
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Model)) Implementation;
- 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(ElementMapper)) ElementMapper;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VertexMapper)) VertexMapper;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(DofMapper)) DofMapper;
- 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(JacobianAssembler)) JacobianAssembler;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, Model) Implementation;
+ 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, ElementMapper) ElementMapper;
+ typedef typename GET_PROP_TYPE(TypeTag, VertexMapper) VertexMapper;
+ typedef typename GET_PROP_TYPE(TypeTag, DofMapper) DofMapper;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, JacobianAssembler) JacobianAssembler;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
enum {
- numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)),
+ numEq = GET_PROP_VALUE(TypeTag, NumEq),
dim = GridView::dimension
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(LocalJacobian)) LocalJacobian;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(LocalResidual)) LocalResidual;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(NewtonMethod)) NewtonMethod;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(NewtonController)) NewtonController;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, LocalJacobian) LocalJacobian;
+ typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) LocalResidual;
+ typedef typename GET_PROP_TYPE(TypeTag, NewtonMethod) NewtonMethod;
+ typedef typename GET_PROP_TYPE(TypeTag, NewtonController) NewtonController;
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
diff --git a/dumux/boxmodels/common/boxproblem.hh b/dumux/boxmodels/common/boxproblem.hh
index a9c47a6940..08568292ba 100644
--- a/dumux/boxmodels/common/boxproblem.hh
+++ b/dumux/boxmodels/common/boxproblem.hh
@@ -47,25 +47,25 @@ template<class TypeTag>
class BoxProblem
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef Dumux::VtkMultiWriter<GridView> VtkMultiWriter;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(NewtonMethod)) NewtonMethod;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(NewtonController)) NewtonController;
+ typedef typename GET_PROP_TYPE(TypeTag, NewtonMethod) NewtonMethod;
+ typedef typename GET_PROP_TYPE(TypeTag, NewtonController) NewtonController;
- 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(TimeManager)) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VertexMapper)) VertexMapper;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementMapper)) ElementMapper;
+ typedef typename GET_PROP_TYPE(TypeTag, VertexMapper) VertexMapper;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementMapper) ElementMapper;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
enum {
dim = GridView::dimension,
diff --git a/dumux/boxmodels/common/boxpropertydefaults.hh b/dumux/boxmodels/common/boxpropertydefaults.hh
index e95d83db3a..65ce8e3a1f 100644
--- a/dumux/boxmodels/common/boxpropertydefaults.hh
+++ b/dumux/boxmodels/common/boxpropertydefaults.hh
@@ -66,7 +66,7 @@ SET_TYPE_PROP(BoxModel, TimeManager, Dumux::TimeManager<TypeTag>);
//! Use the leaf grid view if not defined otherwise
SET_TYPE_PROP(BoxModel,
GridView,
- typename GET_PROP_TYPE(TypeTag, PTAG(Grid))::LeafGridView);
+ typename GET_PROP_TYPE(TypeTag, Grid)::LeafGridView);
//! Set the default for the FVElementGeometry
SET_TYPE_PROP(BoxModel, FVElementGeometry, Dumux::BoxFVElementGeometry<TypeTag>);
@@ -83,17 +83,17 @@ SET_TYPE_PROP(BoxModel, NewtonController, Dumux::NewtonController<TypeTag>);
//! Mapper for the grid view's vertices.
SET_TYPE_PROP(BoxModel,
VertexMapper,
- Dune::MultipleCodimMultipleGeomTypeMapper<typename GET_PROP_TYPE(TypeTag, PTAG(GridView)),
+ Dune::MultipleCodimMultipleGeomTypeMapper<typename GET_PROP_TYPE(TypeTag, GridView),
Dune::MCMGVertexLayout>);
//! Mapper for the grid view's elements.
SET_TYPE_PROP(BoxModel,
ElementMapper,
- Dune::MultipleCodimMultipleGeomTypeMapper<typename GET_PROP_TYPE(TypeTag, PTAG(GridView)),
+ Dune::MultipleCodimMultipleGeomTypeMapper<typename GET_PROP_TYPE(TypeTag, GridView),
Dune::MCMGElementLayout>);
//! Mapper for the degrees of freedoms.
-SET_TYPE_PROP(BoxModel, DofMapper, typename GET_PROP_TYPE(TypeTag, PTAG(VertexMapper)));
+SET_TYPE_PROP(BoxModel, DofMapper, typename GET_PROP_TYPE(TypeTag, VertexMapper));
//! Set the BaseLocalResidual to BoxLocalResidual
SET_TYPE_PROP(BoxModel, BaseLocalResidual, Dumux::BoxLocalResidual<TypeTag>);
@@ -106,22 +106,22 @@ SET_TYPE_PROP(BoxModel, LocalJacobian, Dumux::BoxLocalJacobian<TypeTag>);
*/
SET_TYPE_PROP(BoxModel,
SolutionVector,
- Dune::BlockVector<typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables))>);
+ Dune::BlockVector<typename GET_PROP_TYPE(TypeTag, PrimaryVariables)>);
/*!
* \brief The type of a solution for a whole element.
*/
SET_TYPE_PROP(BoxModel,
ElementSolutionVector,
- Dune::BlockVector<typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables))>);
+ Dune::BlockVector<typename GET_PROP_TYPE(TypeTag, PrimaryVariables)>);
/*!
* \brief A vector of primary variables.
*/
SET_TYPE_PROP(BoxModel,
PrimaryVariables,
- Dune::FieldVector<typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)),
- GET_PROP_VALUE(TypeTag, PTAG(NumEq))>);
+ Dune::FieldVector<typename GET_PROP_TYPE(TypeTag, Scalar),
+ GET_PROP_VALUE(TypeTag, NumEq)>);
/*!
* \brief The volume variable class.
@@ -140,7 +140,7 @@ SET_TYPE_PROP(BoxModel, ElementVolumeVariables, Dumux::BoxElementVolumeVariables
*/
SET_TYPE_PROP(BoxModel,
BoundaryTypes,
- Dumux::BoundaryTypes<GET_PROP_VALUE(TypeTag, PTAG(NumEq))>);
+ Dumux::BoundaryTypes<GET_PROP_VALUE(TypeTag, NumEq)>);
/*!
* \brief Assembler for the global jacobian matrix.
@@ -171,8 +171,8 @@ SET_BOOL_PROP(BoxModel, EnablePartialReassemble, false);
SET_PROP(BoxModel, JacobianMatrix)
{
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) };
typedef typename Dune::FieldMatrix<Scalar, numEq, numEq> MatrixBlock;
public:
typedef typename Dune::BCRSMatrix<MatrixBlock> type;
@@ -192,7 +192,7 @@ SET_SCALAR_PROP(BoxModel, LinearSolverResidualReduction, 1e-6);
SET_INT_PROP(BoxModel, LinearSolverMaxIterations, 250);
//! set number of equations of the mathematical model as default
-SET_INT_PROP(BoxModel, LinearSolverBlockSize, GET_PROP_VALUE(TypeTag, PTAG(NumEq)));
+SET_INT_PROP(BoxModel, LinearSolverBlockSize, GET_PROP_VALUE(TypeTag, NumEq));
} // namespace Properties
} // namespace Dumux
diff --git a/dumux/boxmodels/common/boxvolumevariables.hh b/dumux/boxmodels/common/boxvolumevariables.hh
index 10c43e6aa0..76de27762b 100644
--- a/dumux/boxmodels/common/boxvolumevariables.hh
+++ b/dumux/boxmodels/common/boxvolumevariables.hh
@@ -44,15 +44,15 @@ namespace Dumux
template <class TypeTag>
class BoxVolumeVariables
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
public:
// default constructor
diff --git a/dumux/boxmodels/richards/richardsfluxvariables.hh b/dumux/boxmodels/richards/richardsfluxvariables.hh
index 641db57d7e..6384a6d985 100644
--- a/dumux/boxmodels/richards/richardsfluxvariables.hh
+++ b/dumux/boxmodels/richards/richardsfluxvariables.hh
@@ -44,25 +44,25 @@ namespace Dumux
template <class TypeTag>
class RichardsFluxVariables
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(RichardsIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, RichardsIndices) 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 { dimWorld = GridView::dimensionworld};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldVector<Scalar, dimWorld> Vector;
typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> Tensor;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
public:
/*!
diff --git a/dumux/boxmodels/richards/richardslocalresidual.hh b/dumux/boxmodels/richards/richardslocalresidual.hh
index 0931d9fd04..4fdc70f551 100644
--- a/dumux/boxmodels/richards/richardslocalresidual.hh
+++ b/dumux/boxmodels/richards/richardslocalresidual.hh
@@ -44,21 +44,21 @@ namespace Dumux
template<class TypeTag>
class RichardsLocalResidual : public BoxLocalResidual<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(RichardsIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, RichardsIndices) Indices;
enum {
contiEqIdx = Indices::contiEqIdx,
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
enum { dimWorld = GridView::dimensionworld};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldVector<Scalar, dimWorld> Vector;
public:
diff --git a/dumux/boxmodels/richards/richardsmodel.hh b/dumux/boxmodels/richards/richardsmodel.hh
index 1264c4344a..42d6c4500f 100644
--- a/dumux/boxmodels/richards/richardsmodel.hh
+++ b/dumux/boxmodels/richards/richardsmodel.hh
@@ -93,18 +93,18 @@ namespace Dumux
template<class TypeTag >
class RichardsModel : public BoxModel<TypeTag>
{
- 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(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) SolutionVector;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(RichardsIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, RichardsIndices) Indices;
enum {
nPhaseIdx = Indices::nPhaseIdx,
wPhaseIdx = Indices::wPhaseIdx
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
enum { dim = GridView::dimension };
diff --git a/dumux/boxmodels/richards/richardsnewtoncontroller.hh b/dumux/boxmodels/richards/richardsnewtoncontroller.hh
index 083e909e89..d271871de6 100644
--- a/dumux/boxmodels/richards/richardsnewtoncontroller.hh
+++ b/dumux/boxmodels/richards/richardsnewtoncontroller.hh
@@ -44,18 +44,18 @@ class RichardsNewtonController : public NewtonController<TypeTag>
{
typedef NewtonController<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
- 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(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
+ 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, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(RichardsIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, RichardsIndices) Indices;
enum { pwIdx = Indices::pwIdx };
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
enum { dim = GridView::dimension };
public:
diff --git a/dumux/boxmodels/richards/richardsproblem.hh b/dumux/boxmodels/richards/richardsproblem.hh
index 4dfd54f93a..65f4ee52f9 100644
--- a/dumux/boxmodels/richards/richardsproblem.hh
+++ b/dumux/boxmodels/richards/richardsproblem.hh
@@ -44,19 +44,19 @@ class RichardsBoxProblem : public BoxProblem<TypeTag>
{
typedef BoxProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
- 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,
dimWorld = GridView::dimensionworld
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
public:
diff --git a/dumux/boxmodels/richards/richardspropertydefaults.hh b/dumux/boxmodels/richards/richardspropertydefaults.hh
index c0e04a16fb..4d7be5b515 100644
--- a/dumux/boxmodels/richards/richardspropertydefaults.hh
+++ b/dumux/boxmodels/richards/richardspropertydefaults.hh
@@ -88,7 +88,7 @@ SET_TYPE_PROP(BoxRichards, RichardsIndices, Dumux::RichardsIndices);
SET_PROP(BoxRichards, 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;
@@ -106,7 +106,7 @@ public:
*/
SET_PROP(BoxRichards, WettingPhase)
{ private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
};
@@ -121,7 +121,7 @@ public:
*/
SET_PROP(BoxRichards, NonwettingPhase)
{ private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::GasPhase<Scalar, Dumux::NullComponent<Scalar> > type;
};
@@ -137,9 +137,9 @@ public:
*/
SET_PROP(BoxRichards, FluidSystem)
{ private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(WettingPhase)) WettingPhase;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(NonwettingPhase)) NonwettingPhase;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, WettingPhase) WettingPhase;
+ typedef typename GET_PROP_TYPE(TypeTag, NonwettingPhase) NonwettingPhase;
public:
typedef Dumux::FluidSystems::TwoPImmiscible<Scalar,
diff --git a/dumux/boxmodels/richards/richardsvolumevariables.hh b/dumux/boxmodels/richards/richardsvolumevariables.hh
index ecf0f1d318..5092f62c73 100644
--- a/dumux/boxmodels/richards/richardsvolumevariables.hh
+++ b/dumux/boxmodels/richards/richardsvolumevariables.hh
@@ -49,23 +49,23 @@ class RichardsVolumeVariables : public BoxVolumeVariables<TypeTag>
{
typedef BoxVolumeVariables<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- 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(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
-
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(RichardsIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+
+ typedef typename GET_PROP_TYPE(TypeTag, RichardsIndices) Indices;
enum {
pwIdx = Indices::pwIdx,
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;
public:
diff --git a/dumux/common/parameters.hh b/dumux/common/parameters.hh
index 7ae6ae8414..740441ef2a 100644
--- a/dumux/common/parameters.hh
+++ b/dumux/common/parameters.hh
@@ -104,7 +104,7 @@ void findUnusedKeys_(std::list<std::string> &unusedParams,
const Dune::ParameterTree &tree,
const std::string prefix="")
{
- typedef typename GET_PROP(TypeTag, PTAG(ParameterTree)) Params;
+ typedef typename GET_PROP(TypeTag, ParameterTree) Params;
const Dune::ParameterTree &rt = Params::runTimeParams();
// loop over all keys of the current tree
@@ -139,7 +139,7 @@ void findUnusedKeys_(std::list<std::string> &unusedParams,
template <class TypeTag>
void print(std::ostream &os = std::cout)
{
- typedef typename GET_PROP(TypeTag, PTAG(ParameterTree)) Params;
+ typedef typename GET_PROP(TypeTag, ParameterTree) Params;
const Dune::ParameterTree &tree = Params::tree();
const Dune::ParameterTree &rt = Params::runTimeParams();
@@ -174,7 +174,7 @@ const char *getString_(const char *foo = 0)
template <class TypeTag>
class Param
{
- typedef typename GET_PROP(TypeTag, PTAG(ParameterTree)) Params;
+ typedef typename GET_PROP(TypeTag, ParameterTree) Params;
public:
template <class ParamType, class PropTag>
static const ParamType &get(const char *groupOrParamName,
@@ -318,7 +318,7 @@ private:
canonicalName.insert(0, groupName);
}
- std::string modelParamGroup(GET_PROP_VALUE(TypeTag, PTAG(ModelParameterGroup)));
+ std::string modelParamGroup(GET_PROP_VALUE(TypeTag, ModelParameterGroup));
// prefix the parameter with the parameter group of the
// model. this allows things like sub-model specific parameters like
//
@@ -364,7 +364,7 @@ private:
paramName = groupOrParamName;
}
- static std::string modelParamGroup(GET_PROP(TypeTag, PTAG(ModelParameterGroup))::value);
+ static std::string modelParamGroup(GET_PROP(TypeTag, ModelParameterGroup)::value);
std::string canonicalName(modelParamGroup);
diff --git a/dumux/common/start.hh b/dumux/common/start.hh
index 4be8536661..638dd40cfd 100644
--- a/dumux/common/start.hh
+++ b/dumux/common/start.hh
@@ -98,9 +98,9 @@ int startFromDGF(int argc, char **argv)
try {
#endif
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef Dune::GridPtr<Grid> GridPointer;
// initialize MPI, finalize is done automatically on exit
@@ -179,7 +179,7 @@ int startFromDGF(int argc, char **argv)
* \param argv The 'argv' argument of the main function
*/
template <class TypeTag>
-int startWithGrid(const typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) &grid,
+int startWithGrid(const typename GET_PROP_TYPE(TypeTag, Grid) &grid,
int argc,
char **argv)
{
@@ -187,9 +187,9 @@ int startWithGrid(const typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) &grid,
try {
#endif
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
// parse the command line arguments for the program
if (argc < 3)
@@ -255,10 +255,10 @@ int startFromInputFile(int argc, char **argv)
try {
#endif
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
- typedef typename GET_PROP(TypeTag, PTAG(ParameterTree)) Params;
+ typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
+ typedef typename GET_PROP(TypeTag, ParameterTree) Params;
typedef Dune::GridPtr<Grid> GridPointer;
// initialize MPI, finalize is done automatically on exit
diff --git a/dumux/common/timemanager.hh b/dumux/common/timemanager.hh
index 05d966240c..f828ddc6b5 100644
--- a/dumux/common/timemanager.hh
+++ b/dumux/common/timemanager.hh
@@ -59,8 +59,8 @@ NEW_PROP_TAG(Problem);
template <class TypeTag>
class TimeManager
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
TimeManager(const TimeManager&)
{}
diff --git a/dumux/decoupled/1p/1pproperties.hh b/dumux/decoupled/1p/1pproperties.hh
index d7ff54ad3b..8bc1411ff5 100644
--- a/dumux/decoupled/1p/1pproperties.hh
+++ b/dumux/decoupled/1p/1pproperties.hh
@@ -95,7 +95,7 @@ SET_TYPE_PROP(DecoupledOneP, Variables, VariableClass<TypeTag>);
SET_PROP(DecoupledOneP, PressureCoefficientMatrix)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldMatrix<Scalar, 1, 1> MB;
public:
@@ -104,7 +104,7 @@ public:
SET_PROP(DecoupledOneP, PressureRHSVector)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dune::BlockVector<Dune::FieldVector<Scalar, 1> > type;
diff --git a/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh b/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh
index 5a2decece3..0c948880e1 100644
--- a/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh
+++ b/dumux/decoupled/1p/diffusion/diffusionproblem1p.hh
@@ -45,18 +45,18 @@ namespace Dumux
template<class TypeTag>
class DiffusionProblem1P: public OneModelProblem<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
typedef OneModelProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::Grid Grid;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
// material properties
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Fluid)) Fluid;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, Fluid) Fluid;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
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 075de22af8..e43e2928a0 100644
--- a/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh
+++ b/dumux/decoupled/1p/diffusion/fv/fvpressure1p.hh
@@ -53,17 +53,17 @@ namespace Dumux
*/
template<class TypeTag> class FVPressure1P
{
- 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(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Variables)) Variables;
+ 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, Variables) Variables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Fluid)) Fluid;
+ typedef typename GET_PROP_TYPE(TypeTag, Fluid) Fluid;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
enum
@@ -85,8 +85,8 @@ template<class TypeTag> class FVPressure1P
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldMatrix<Scalar, dim, dim> FieldMatrix;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureCoefficientMatrix)) Matrix;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureRHSVector)) Vector;
+ typedef typename GET_PROP_TYPE(TypeTag, PressureCoefficientMatrix) Matrix;
+ typedef typename GET_PROP_TYPE(TypeTag, PressureRHSVector) Vector;
//initializes the matrix to store the system of equations
void initializeMatrix();
@@ -462,7 +462,7 @@ void FVPressure1P<TypeTag>::assemble(bool first)
template<class TypeTag>
void FVPressure1P<TypeTag>::solve()
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(LinearSolver)) Solver;
+ typedef typename GET_PROP_TYPE(TypeTag, LinearSolver) Solver;
int verboseLevelSolver = GET_PARAM(TypeTag, int, LinearSolver, Verbosity);
diff --git a/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh b/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
index 986f2d9a01..d0103bda52 100644
--- a/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
+++ b/dumux/decoupled/1p/diffusion/fv/fvvelocity1p.hh
@@ -50,15 +50,15 @@ class FVVelocity1P: public FVPressure1P<TypeTag>
{
typedef FVVelocity1P<TypeTag> ThisType;
typedef FVPressure1P<TypeTag> ParentType;
- 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(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Variables)) Variables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Fluid)) Fluid;
-
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ 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, Variables) Variables;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, Fluid) Fluid;
+
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
diff --git a/dumux/decoupled/2p/2pfluidstate.hh b/dumux/decoupled/2p/2pfluidstate.hh
index 97617b8f44..f88001725f 100644
--- a/dumux/decoupled/2p/2pfluidstate.hh
+++ b/dumux/decoupled/2p/2pfluidstate.hh
@@ -40,14 +40,14 @@ namespace Dumux
* 2p model.
*/
template <class TypeTag>
-class DecoupledTwoPFluidState : public FluidState<typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)),
+class DecoupledTwoPFluidState : public FluidState<typename GET_PROP_TYPE(TypeTag, Scalar),
DecoupledTwoPFluidState<TypeTag> >
{
typedef DecoupledTwoPFluidState<TypeTag> ThisType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
enum {
wPhaseIdx = Indices::wPhaseIdx,
@@ -58,7 +58,7 @@ DecoupledTwoPFluidState<TypeTag> >
};
public:
- enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)) };
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
public:
void update(Scalar Sw, Scalar pressW, Scalar pressN, Scalar temperature)
diff --git a/dumux/decoupled/2p/2pproperties.hh b/dumux/decoupled/2p/2pproperties.hh
index 8aeb07650d..d86433b78d 100644
--- a/dumux/decoupled/2p/2pproperties.hh
+++ b/dumux/decoupled/2p/2pproperties.hh
@@ -128,36 +128,36 @@ SET_INT_PROP(DecoupledTwoP,
SET_PROP(DecoupledTwoP, Indices)
{
-typedef DecoupledTwoPIndices<GET_PROP_VALUE(TypeTag, PTAG(Formulation)), 0> type;
+typedef DecoupledTwoPIndices<GET_PROP_VALUE(TypeTag, Formulation), 0> type;
};
-SET_TYPE_PROP(DecoupledTwoP, TwoPIndices, typename GET_PROP_TYPE(TypeTag, PTAG(Indices)));
+SET_TYPE_PROP(DecoupledTwoP, TwoPIndices, typename GET_PROP_TYPE(TypeTag, Indices));
//! Set the default formulation
SET_INT_PROP(DecoupledTwoP,
PressureFormulation,
- GET_PROP_TYPE(TypeTag, PTAG(Indices))::pressureType);
+ GET_PROP_TYPE(TypeTag, Indices)::pressureType);
SET_INT_PROP(DecoupledTwoP,
SaturationFormulation,
- GET_PROP_TYPE(TypeTag, PTAG(Indices))::saturationType);
+ GET_PROP_TYPE(TypeTag, Indices)::saturationType);
SET_INT_PROP(DecoupledTwoP,
VelocityFormulation,
- GET_PROP_TYPE(TypeTag, PTAG(Indices))::velocityDefault);
+ GET_PROP_TYPE(TypeTag, Indices)::velocityDefault);
SET_BOOL_PROP(DecoupledTwoP, EnableCompressibility, false);
SET_TYPE_PROP(DecoupledTwoP, Variables, VariableClass<TypeTag>);
-SET_TYPE_PROP(DecoupledTwoP, CellData, CellData2P<TypeTag, GET_PROP_VALUE(TypeTag, PTAG(EnableCompressibility))>);
+SET_TYPE_PROP(DecoupledTwoP, CellData, CellData2P<TypeTag, GET_PROP_VALUE(TypeTag, EnableCompressibility)>);
SET_TYPE_PROP(DecoupledTwoP, FluidSystem, TwoPImmiscibleFluidSystem<TypeTag>);
SET_PROP(DecoupledTwoP, FluidState)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
typedef IsothermalImmiscibleFluidState<Scalar, FluidSystem> type;
};
@@ -169,7 +169,7 @@ public:
SET_PROP(DecoupledTwoP, 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;
diff --git a/dumux/decoupled/2p/2pproperties_old.hh b/dumux/decoupled/2p/2pproperties_old.hh
index 91cc930c65..eb881dac1b 100644
--- a/dumux/decoupled/2p/2pproperties_old.hh
+++ b/dumux/decoupled/2p/2pproperties_old.hh
@@ -122,21 +122,21 @@ SET_INT_PROP(DecoupledTwoP,
SET_PROP(DecoupledTwoP, TwoPIndices)
{
-typedef DecoupledTwoPIndices<GET_PROP_VALUE(TypeTag, PTAG(Formulation)), 0> type;
+typedef DecoupledTwoPIndices<GET_PROP_VALUE(TypeTag, Formulation), 0> type;
};
//! Set the default formulation
SET_INT_PROP(DecoupledTwoP,
PressureFormulation,
- GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices))::pressureType);
+ GET_PROP_TYPE(TypeTag, TwoPIndices)::pressureType);
SET_INT_PROP(DecoupledTwoP,
SaturationFormulation,
- GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices))::saturationType);
+ GET_PROP_TYPE(TypeTag, TwoPIndices)::saturationType);
SET_INT_PROP(DecoupledTwoP,
VelocityFormulation,
- GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices))::velocityDefault);
+ GET_PROP_TYPE(TypeTag, TwoPIndices)::velocityDefault);
SET_BOOL_PROP(DecoupledTwoP, EnableCompressibility, false);
@@ -153,7 +153,7 @@ SET_TYPE_PROP(DecoupledTwoP, FluidState, DecoupledTwoPFluidState<TypeTag>);
SET_PROP(DecoupledTwoP, 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;
diff --git a/dumux/decoupled/2p/cellData2p.hh b/dumux/decoupled/2p/cellData2p.hh
index ee2156e537..ad5fe9d3b9 100644
--- a/dumux/decoupled/2p/cellData2p.hh
+++ b/dumux/decoupled/2p/cellData2p.hh
@@ -50,17 +50,17 @@ template<class TypeTag>
class CellData2P<TypeTag, false>
{
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;
typedef FluxData2P<TypeTag> FluxData;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum
{
@@ -68,7 +68,7 @@ private:
};
enum
{
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases))
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
private:
Scalar saturation_[numPhases];
@@ -227,17 +227,17 @@ template<class TypeTag>
class CellData2P<TypeTag, true>
{
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;
typedef FluxData2P<TypeTag> FluxData;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum
{
@@ -245,7 +245,7 @@ private:
};
enum
{
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases))
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
private:
Scalar mobility_[numPhases];
diff --git a/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh b/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh
index 6dd0ff5fc5..7925801bf9 100644
--- a/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh
+++ b/dumux/decoupled/2p/diffusion/diffusionproblem2p.hh
@@ -48,17 +48,17 @@ namespace Dumux
template<class TypeTag>
class DiffusionProblem2P: public OneModelProblem<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
typedef OneModelProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GridView::Grid Grid;typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GridView::Grid Grid;typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
// material properties
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
diff --git a/dumux/decoupled/2p/diffusion/diffusionproblem2p_old.hh b/dumux/decoupled/2p/diffusion/diffusionproblem2p_old.hh
index c4447d4207..3783f21030 100644
--- a/dumux/decoupled/2p/diffusion/diffusionproblem2p_old.hh
+++ b/dumux/decoupled/2p/diffusion/diffusionproblem2p_old.hh
@@ -46,17 +46,17 @@ namespace Dumux
template<class TypeTag>
class DiffusionProblem2POLD: public OneModelProblem<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
typedef OneModelProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GridView::Grid Grid;typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GridView::Grid Grid;typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
// material properties
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
index 8499aa87c7..314d145cd9 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2p.hh
@@ -56,25 +56,25 @@ namespace Dumux
*/
template<class TypeTag> class FVPressure2P
{
- 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(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Variables)) Variables;
+ 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, Variables) Variables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(WettingPhase)) WettingPhase;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(NonwettingPhase)) NonwettingPhase;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, WettingPhase) WettingPhase;
+ typedef typename GET_PROP_TYPE(TypeTag, NonwettingPhase) NonwettingPhase;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ 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, PTAG(CellData)) CellData;
+ typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
enum
{
@@ -96,7 +96,7 @@ template<class TypeTag> class FVPressure2P
{
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx,
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases))
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
typedef typename GridView::Traits::template Codim<0>::Entity Element;
@@ -108,8 +108,8 @@ template<class TypeTag> class FVPressure2P
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldMatrix<Scalar, dim, dim> FieldMatrix;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureCoefficientMatrix)) Matrix;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureRHSVector)) Vector;
+ typedef typename GET_PROP_TYPE(TypeTag, PressureCoefficientMatrix) Matrix;
+ typedef typename GET_PROP_TYPE(TypeTag, PressureRHSVector) Vector;
//initializes the matrix to store the system of equations
void initializeMatrix();
@@ -349,9 +349,9 @@ private:
Matrix A_;
Dune::BlockVector<Dune::FieldVector<Scalar, 1> > f_;
- static const bool compressibility_ = GET_PROP_VALUE(TypeTag, PTAG(EnableCompressibility));
- static const int pressureType_ = GET_PROP_VALUE(TypeTag, PTAG(PressureFormulation)); //!< gives kind of pressure used (\f$p_w\f$, \f$p_n\f$, \f$p_{global}\f$)
- static const int saturationType_ = GET_PROP_VALUE(TypeTag, PTAG(SaturationFormulation)); //!< gives kind of saturation used (\f$S_w\f$, \f$S_n\f$)
+ static const bool compressibility_ = GET_PROP_VALUE(TypeTag, EnableCompressibility);
+ static const int pressureType_ = GET_PROP_VALUE(TypeTag, PressureFormulation); //!< gives kind of pressure used (\f$p_w\f$, \f$p_n\f$, \f$p_{global}\f$)
+ static const int saturationType_ = GET_PROP_VALUE(TypeTag, SaturationFormulation); //!< gives kind of saturation used (\f$S_w\f$, \f$S_n\f$)
protected:
const GlobalPosition& gravity; //!< vector including the gravity constant
};
@@ -897,7 +897,7 @@ void FVPressure2P<TypeTag>::assemble(bool first)
template<class TypeTag>
void FVPressure2P<TypeTag>::solve()
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(LinearSolver)) Solver;
+ typedef typename GET_PROP_TYPE(TypeTag, LinearSolver) Solver;
int verboseLevelSolver = GET_PARAM(TypeTag, int, LinearSolver, Verbosity);
diff --git a/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
index d0f9b832e8..177cd76520 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvpressure2padaptive.hh
@@ -57,21 +57,21 @@ namespace Dumux
*/
template<class TypeTag> class FVPressure2Padaptive
{
- 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(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Variables)) Variables;
+ 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, Variables) Variables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
enum
@@ -104,8 +104,8 @@ template<class TypeTag> class FVPressure2Padaptive
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldMatrix<Scalar, dim, dim> FieldMatrix;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureCoefficientMatrix)) Matrix;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureRHSVector)) Vector;
+ typedef typename GET_PROP_TYPE(TypeTag, PressureCoefficientMatrix) Matrix;
+ typedef typename GET_PROP_TYPE(TypeTag, PressureRHSVector) Vector;
//initializes the matrix to store the system of equations
void initializeMatrix();
@@ -284,9 +284,9 @@ private:
Dune::BlockVector<Dune::FieldVector<Scalar, 1> > f_;
protected:
const GlobalPosition& gravity; //!< vector including the gravity constant
- static const bool compressibility = GET_PROP_VALUE(TypeTag, PTAG(EnableCompressibility));
- static const int pressureType = GET_PROP_VALUE(TypeTag, PTAG(PressureFormulation)); //!< gives kind of pressure used (\f$p_w\f$, \f$p_n\f$, \f$p_{global}\f$)
- static const int saturationType = GET_PROP_VALUE(TypeTag, PTAG(SaturationFormulation)); //!< gives kind of saturation used (\f$S_w\f$, \f$S_n\f$)
+ static const bool compressibility = GET_PROP_VALUE(TypeTag, EnableCompressibility);
+ static const int pressureType = GET_PROP_VALUE(TypeTag, PressureFormulation); //!< gives kind of pressure used (\f$p_w\f$, \f$p_n\f$, \f$p_{global}\f$)
+ static const int saturationType = GET_PROP_VALUE(TypeTag, SaturationFormulation); //!< gives kind of saturation used (\f$S_w\f$, \f$S_n\f$)
};
//initializes the matrix to store the system of equations
@@ -1087,7 +1087,7 @@ void FVPressure2Padaptive<TypeTag>::assemble(bool first)
template<class TypeTag>
void FVPressure2Padaptive<TypeTag>::solve()
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(LinearSolver)) Solver;
+ typedef typename GET_PROP_TYPE(TypeTag, LinearSolver) Solver;
int verboseLevelSolver = GET_PARAM(TypeTag, int, LinearSolver, Verbosity);
diff --git a/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh b/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
index 27c486b16f..efab2b2a0c 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh
@@ -54,25 +54,25 @@ class FVVelocity2P: public FVPressure2P<TypeTag>
{
typedef FVVelocity2P<TypeTag> ThisType;
typedef FVPressure2P<TypeTag> ParentType;
- 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(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Variables)) Variables;
+ 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, Variables) Variables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(WettingPhase)) WettingPhase;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(NonwettingPhase)) NonwettingPhase;
+ 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, NonwettingPhase) NonwettingPhase;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ 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, PTAG(CellData)) CellData;
+ typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::Grid Grid;
@@ -121,7 +121,7 @@ public:
FVVelocity2P(Problem& problem) :
FVPressure2P<TypeTag>(problem), problem_(problem)
{
- if (GET_PROP_VALUE(TypeTag, PTAG(EnableCompressibility)) && velocityType_ == vt)
+ if (GET_PROP_VALUE(TypeTag, EnableCompressibility) && velocityType_ == vt)
{
DUNE_THROW(Dune::NotImplemented,
"Total velocity - global pressure - model cannot be used with compressible fluids!");
@@ -244,10 +244,10 @@ public:
private:
Problem& problem_;
- static const int velocityType_ = GET_PROP_VALUE(TypeTag, PTAG(VelocityFormulation)); //!< gives kind of velocity used (\f$ 0 = v_w\f$, \f$ 1 = v_n\f$, \f$ 2 = v_t\f$)
- static const bool compressibility_ = GET_PROP_VALUE(TypeTag, PTAG(EnableCompressibility));
- static const int pressureType_ = GET_PROP_VALUE(TypeTag, PTAG(PressureFormulation)); //!< gives kind of pressure used (\f$p_w\f$, \f$p_n\f$, \f$p_{global}\f$)
- static const int saturationType_ = GET_PROP_VALUE(TypeTag, PTAG(SaturationFormulation)); //!< gives kind of saturation used (\f$S_w\f$, \f$S_n\f$)
+ static const int velocityType_ = GET_PROP_VALUE(TypeTag, VelocityFormulation); //!< gives kind of velocity used (\f$ 0 = v_w\f$, \f$ 1 = v_n\f$, \f$ 2 = v_t\f$)
+ static const bool compressibility_ = GET_PROP_VALUE(TypeTag, EnableCompressibility);
+ static const int pressureType_ = GET_PROP_VALUE(TypeTag, PressureFormulation); //!< gives kind of pressure used (\f$p_w\f$, \f$p_n\f$, \f$p_{global}\f$)
+ static const int saturationType_ = GET_PROP_VALUE(TypeTag, SaturationFormulation); //!< gives kind of saturation used (\f$S_w\f$, \f$S_n\f$)
};
template<class TypeTag>
diff --git a/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh b/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
index e281ac5d85..5c2aaf14c7 100644
--- a/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
+++ b/dumux/decoupled/2p/diffusion/fv/fvvelocity2padaptive.hh
@@ -54,21 +54,21 @@ class FVVelocity2Padaptive: public FVPressure2Padaptive<TypeTag>
{
typedef FVVelocity2Padaptive<TypeTag> ThisType;
typedef FVPressure2Padaptive<TypeTag> ParentType;
- 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(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Variables)) Variables;
+ 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, Variables) Variables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
@@ -119,7 +119,7 @@ public:
: FVPressure2Padaptive<TypeTag>(problem)
{
// todo: kompatibilität prüfen
- if (GET_PROP_VALUE(TypeTag, PTAG(EnableCompressibility)) && velocityType_ == vt)
+ if (GET_PROP_VALUE(TypeTag, EnableCompressibility) && velocityType_ == vt)
{
DUNE_THROW(Dune::NotImplemented, "Total velocity - global pressure - model cannot be used with compressible fluids!");
}
@@ -239,7 +239,7 @@ public:
}
private:
- static const int velocityType_ = GET_PROP_VALUE(TypeTag, PTAG(VelocityFormulation)); //!< gives kind of velocity used (\f$ 0 = v_w\f$, \f$ 1 = v_n\f$, \f$ 2 = v_t\f$)
+ static const int velocityType_ = GET_PROP_VALUE(TypeTag, VelocityFormulation); //!< gives kind of velocity used (\f$ 0 = v_w\f$, \f$ 1 = v_n\f$, \f$ 2 = v_t\f$)
};
template<class TypeTag>
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh
index be94985002..4153cdad4b 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaopressure2p.hh
@@ -64,24 +64,24 @@ namespace Dumux
template<class TypeTag>
class FVMPFAOPressure2P
{
- 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(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Variables)) Variables;
+ 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, Variables) Variables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ 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, PTAG(GridTypeIndices)) GridTypeIndices;
+ typedef typename GET_PROP_TYPE(TypeTag, GridTypeIndices) GridTypeIndices;
enum
{
@@ -112,8 +112,8 @@ class FVMPFAOPressure2P
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldMatrix<Scalar, dim, dim> FieldMatrix;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureCoefficientMatrix)) Matrix;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureRHSVector)) Vector;
+ typedef typename GET_PROP_TYPE(TypeTag, PressureCoefficientMatrix) Matrix;
+ typedef typename GET_PROP_TYPE(TypeTag, PressureRHSVector) Vector;
typedef Dune::FieldVector<Scalar, dim> FieldVector;
//initializes the matrix to store the system of equations
@@ -226,7 +226,7 @@ private:
Matrix A_;
Vector f_;
protected:
- static const int saturationType = GET_PROP_VALUE(TypeTag, PTAG(SaturationFormulation)); //!< gives kind of saturation used (\f$S_w\f$, \f$S_n\f$)
+ static const int saturationType = GET_PROP_VALUE(TypeTag, SaturationFormulation); //!< gives kind of saturation used (\f$S_w\f$, \f$S_n\f$)
};
template<class TypeTag>
@@ -255,7 +255,7 @@ void FVMPFAOPressure2P<TypeTag>::initializeMatrix()
IntersectionIterator nextisIt = ++tempisIt;
// get 'nextisIt'
- switch (GET_PROP_VALUE(TypeTag, PTAG(GridImplementation)))
+ switch (GET_PROP_VALUE(TypeTag, GridImplementation))
{
// for SGrid
case GridTypeIndices::sGrid:
@@ -345,7 +345,7 @@ void FVMPFAOPressure2P<TypeTag>::initializeMatrix()
IntersectionIterator nextisIt = ++tempisIt;
// get 'nextisIt'
- switch (GET_PROP_VALUE(TypeTag, PTAG(GridImplementation)))
+ switch (GET_PROP_VALUE(TypeTag, GridImplementation))
{
// for SGrid
case GridTypeIndices::sGrid:
@@ -520,7 +520,7 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
IntersectionIterator nextisIt = ++tempisIt;
//get nextisIt
- switch (GET_PROP_VALUE(TypeTag, PTAG(GridImplementation)))
+ switch (GET_PROP_VALUE(TypeTag, GridImplementation))
{
// for SGrid
case GridTypeIndices::sGrid:
@@ -2321,7 +2321,7 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
// IntersectionIterator nextisIt = ++tempisIt;
//
// // get 'nextisIt'
-// switch (GET_PROP_VALUE(TypeTag, PTAG(GridImplementation)))
+// switch (GET_PROP_VALUE(TypeTag, GridImplementation))
// {
// // for SGrid
// case GridTypeIndices::sGrid:
@@ -2425,7 +2425,7 @@ void FVMPFAOPressure2P<TypeTag>::assemble()
template<class TypeTag>
void FVMPFAOPressure2P<TypeTag>::solve()
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(LinearSolver)) Solver;
+ typedef typename GET_PROP_TYPE(TypeTag, LinearSolver) Solver;
int verboseLevelSolver = GET_PARAM(TypeTag, int, LinearSolver, Verbosity);
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh b/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh
index 9d795b0f7e..3ab9bc8045 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/fvmpfaovelocity2p.hh
@@ -41,20 +41,20 @@ namespace Dumux
template<class TypeTag> class FVMPFAOVelocity2P: public FVMPFAOPressure2P<TypeTag>
{
typedef FVMPFAOVelocity2P<TypeTag> ThisType;
- typedef FVMPFAOPressure2P<TypeTag> ParentType;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(Problem)) Problem;
+ typedef FVMPFAOPressure2P<TypeTag> ParentType;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, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
@@ -64,7 +64,7 @@ template<class TypeTag> class FVMPFAOVelocity2P: public FVMPFAOPressure2P<TypeTa
typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename Grid::template Codim<0>::EntityPointer ElementPointer;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridTypeIndices)) GridTypeIndices;
+ typedef typename GET_PROP_TYPE(TypeTag, GridTypeIndices) GridTypeIndices;
enum
{
@@ -183,7 +183,7 @@ void FVMPFAOVelocity2P<TypeTag>::calculateVelocity()
IntersectionIterator nextisIt = ++tempisIt;
//get nextisIt
- switch (GET_PROP_VALUE(TypeTag, PTAG(GridImplementation)))
+ switch (GET_PROP_VALUE(TypeTag, GridImplementation))
{
// for SGrid
case GridTypeIndices::sGrid:
@@ -2059,7 +2059,7 @@ void FVMPFAOVelocity2P<TypeTag>::calculateVelocity()
}
// check if local mass conservative
- if (dim == 2 && GET_PROP_VALUE(TypeTag, PTAG(VelocityFormulation)) == vt)
+ if (dim == 2 && GET_PROP_VALUE(TypeTag, VelocityFormulation) == vt)
{
Scalar diff = fabs(this->problem().variables().velocity()[globalIdx1][0] * unitOuterNormal[0] * facevol[0]
+ this->problem().variables().velocity()[globalIdx1][1] * unitOuterNormal[1] * facevol[1]
diff --git a/dumux/decoupled/2p/diffusion/fvmpfa/mpfaproperties.hh b/dumux/decoupled/2p/diffusion/fvmpfa/mpfaproperties.hh
index 29b5ee9b22..80eb79d8dd 100644
--- a/dumux/decoupled/2p/diffusion/fvmpfa/mpfaproperties.hh
+++ b/dumux/decoupled/2p/diffusion/fvmpfa/mpfaproperties.hh
@@ -99,7 +99,7 @@ NEW_PROP_TAG( Grid );
SET_PROP(MPFAProperties, GridImplementation)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
+ typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
public:
static const int value = GridImp<Grid, Grid::dimension>::imp;
};
diff --git a/dumux/decoupled/2p/diffusion/mimetic/croperator.hh b/dumux/decoupled/2p/diffusion/mimetic/croperator.hh
index 020d1eed4b..95afbff723 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/croperator.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/croperator.hh
@@ -116,7 +116,7 @@ class CROperatorAssembler
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView,CRLayout> EM;
typedef Dune::MultipleCodimMultipleGeomTypeMapper<GridView,AllLayout> AM;
-// typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
+// typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
enum
{
diff --git a/dumux/decoupled/2p/diffusion/mimetic/localstiffness.hh b/dumux/decoupled/2p/diffusion/mimetic/localstiffness.hh
index 9a675d137b..f95a7c3c45 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/localstiffness.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/localstiffness.hh
@@ -67,8 +67,8 @@ namespace Dumux
template<class TypeTag, int m>
class LocalStiffness
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
// grid types
typedef typename GridView::template Codim<0>::Entity Entity;
enum {n=GridView::dimension};
@@ -78,7 +78,7 @@ namespace Dumux
typedef Dune::FieldMatrix<Scalar,m,m> MBlockType; // one entry in the stiffness matrix
typedef Dune::FieldVector<Scalar,m> VBlockType; // one entry in the global vectors
typedef Dune::array<Dumux::BoundaryConditions::Flags,m> BCBlockType; // componentwise boundary conditions
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
virtual ~LocalStiffness ()
{
@@ -247,8 +247,8 @@ namespace Dumux
template<class TypeTag, int m>
class LinearLocalStiffness : public LocalStiffness<TypeTag,m>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
// grid types
typedef typename GridView::template Codim<0>::Entity Entity;
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
index ef86d59da7..b477429bff 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticgroundwater.hh
@@ -69,12 +69,12 @@ class MimeticGroundwaterEquationLocalStiffness
:
public LocalStiffness<TypeTag, 1>
{
- 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(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Variables)) Variables;
+ 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, Variables) Variables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
// grid types
enum
@@ -93,8 +93,8 @@ public LocalStiffness<TypeTag, 1>
typedef typename GridView::Grid Grid;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
public:
diff --git a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
index cadb112f9b..ebf605af13 100644
--- a/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
+++ b/dumux/decoupled/2p/diffusion/mimetic/mimeticpressure2p.hh
@@ -73,18 +73,18 @@ public:
*/
template<class TypeTag> class MimeticPressure2P
{
- 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(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Variables)) Variables;
+ 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, Variables) Variables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
enum
{
@@ -113,13 +113,13 @@ template<class TypeTag> class MimeticPressure2P
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldMatrix<Scalar, dim, dim> FieldMatrix;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(LocalStiffness)) LocalStiffness;
+ 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;
typedef MimeticOperatorAssembler<Scalar,GridView> OperatorAssembler;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureCoefficientMatrix)) Matrix;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureRHSVector)) Vector;
+ typedef typename GET_PROP_TYPE(TypeTag, PressureCoefficientMatrix) Matrix;
+ typedef typename GET_PROP_TYPE(TypeTag, PressureRHSVector) Vector;
//initializes the matrix to store the system of equations
void initializeMatrix();
@@ -234,15 +234,15 @@ private:
TraceType f_;
OperatorAssembler A_;
protected:
- static const int pressureType = GET_PROP_VALUE(TypeTag, PTAG(PressureFormulation)); //!< gives kind of pressure used (\f$ 0 = p_w\f$, \f$ 1 = p_n\f$, \f$ 2 = p_{global}\f$)
- static const int saturationType = GET_PROP_VALUE(TypeTag, PTAG(SaturationFormulation)); //!< gives kind of saturation used (\f$ 0 = S_w\f$, \f$ 1 = S_n\f$)
+ static const 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$)
+ static const int saturationType = GET_PROP_VALUE(TypeTag, SaturationFormulation); //!< gives kind of saturation used (\f$ 0 = S_w\f$, \f$ 1 = S_n\f$)
};
//solves the system of equations to get the spatial distribution of the pressure
template<class TypeTag>
void MimeticPressure2P<TypeTag>::solve()
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(LinearSolver)) Solver;
+ typedef typename GET_PROP_TYPE(TypeTag, LinearSolver) Solver;
int verboseLevelSolver = GET_PARAM(TypeTag, int, LinearSolver, Verbosity);
diff --git a/dumux/decoupled/2p/fluxData2p.hh b/dumux/decoupled/2p/fluxData2p.hh
index a3ea9682b1..3f49a2fc2b 100644
--- a/dumux/decoupled/2p/fluxData2p.hh
+++ b/dumux/decoupled/2p/fluxData2p.hh
@@ -44,8 +44,8 @@ template<class TypeTag>
class FluxData2P
{
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;
typedef typename GridView::IntersectionIterator IntersectionIterator;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
@@ -54,7 +54,7 @@ private:
dim = GridView::dimension, dimWorld = GridView::dimensionworld
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum
{
@@ -63,7 +63,7 @@ private:
enum
{
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases))
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
typedef Dune::FieldVector<Scalar, dim> FieldVector;
diff --git a/dumux/decoupled/2p/impes/impesproblem2p.hh b/dumux/decoupled/2p/impes/impesproblem2p.hh
index 08a30cf981..fe299ed2ff 100644
--- a/dumux/decoupled/2p/impes/impesproblem2p.hh
+++ b/dumux/decoupled/2p/impes/impesproblem2p.hh
@@ -50,18 +50,18 @@ namespace Dumux
template<class TypeTag>
class IMPESProblem2P : public IMPETProblem<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
typedef IMPETProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::Grid Grid;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
// material properties
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
enum {
diff --git a/dumux/decoupled/2p/impes/impesproblem2p_old.hh b/dumux/decoupled/2p/impes/impesproblem2p_old.hh
index b9e4c9bd36..fb849f0db0 100644
--- a/dumux/decoupled/2p/impes/impesproblem2p_old.hh
+++ b/dumux/decoupled/2p/impes/impesproblem2p_old.hh
@@ -48,18 +48,18 @@ namespace Dumux
template<class TypeTag>
class IMPESProblem2P : public IMPETProblem<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
typedef IMPETProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::Grid Grid;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
// material properties
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
enum {
diff --git a/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh b/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh
index e91accc2aa..c712d7ebbb 100644
--- a/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh
+++ b/dumux/decoupled/2p/transport/fv/capillarydiffusion.hh
@@ -48,18 +48,18 @@ template<class TypeTag>
class CapillaryDiffusion: public DiffusivePart<TypeTag>
{
private:
- 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(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
+ 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, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(CellData)) CellData;
+ typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
enum
diff --git a/dumux/decoupled/2p/transport/fv/convectivepart.hh b/dumux/decoupled/2p/transport/fv/convectivepart.hh
index fef99fc0d2..16a667b05c 100644
--- a/dumux/decoupled/2p/transport/fv/convectivepart.hh
+++ b/dumux/decoupled/2p/transport/fv/convectivepart.hh
@@ -41,9 +41,9 @@ template<class TypeTag>
class ConvectivePart
{
private:
- 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(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
enum{dim = GridView::dimension, dimWorld = GridView::dimensionworld};
typedef typename GridView::Traits::template Codim<0>::Entity Element;
diff --git a/dumux/decoupled/2p/transport/fv/diffusivepart.hh b/dumux/decoupled/2p/transport/fv/diffusivepart.hh
index bc837626de..84be54e116 100644
--- a/dumux/decoupled/2p/transport/fv/diffusivepart.hh
+++ b/dumux/decoupled/2p/transport/fv/diffusivepart.hh
@@ -39,9 +39,9 @@ template<class TypeTag>
class DiffusivePart
{
private:
- 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(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
enum{dim = GridView::dimension};
typedef typename GridView::Traits::template Codim<0>::Entity Element;
diff --git a/dumux/decoupled/2p/transport/fv/evalcflflux.hh b/dumux/decoupled/2p/transport/fv/evalcflflux.hh
index 1409259999..99415b793d 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflflux.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflflux.hh
@@ -50,8 +50,8 @@ template<class TypeTag>
class EvalCflFlux
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GridView::Intersection Intersection;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
diff --git a/dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh b/dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh
index fe0dfec96f..20b738c0ea 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflflux_coats.hh
@@ -44,21 +44,21 @@ template<class TypeTag>
class EvalCflFluxCoats: public EvalCflFluxDefault<TypeTag>
{
private:
- typedef EvalCflFluxDefault<TypeTag> ParentType;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(Problem)) Problem;
+ typedef EvalCflFluxDefault<TypeTag> ParentType;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, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ 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, PTAG(CellData)) CellData;
+ typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
enum
{
@@ -471,9 +471,9 @@ private:
Problem& problem_;//problem data
Scalar cflFluxFunction_;
bool hasHangingNode_;
- static const int pressureType_ = GET_PROP_VALUE(TypeTag, PTAG(PressureFormulation));
- static const int velocityType_ = GET_PROP_VALUE(TypeTag, PTAG(VelocityFormulation));
- static const int saturationType_ = GET_PROP_VALUE(TypeTag, PTAG(SaturationFormulation));
+ static const int pressureType_ = GET_PROP_VALUE(TypeTag, PressureFormulation);
+ static const int velocityType_ = GET_PROP_VALUE(TypeTag, VelocityFormulation);
+ static const int saturationType_ = GET_PROP_VALUE(TypeTag, SaturationFormulation);
static constexpr Scalar eps_ = 5e-3;
};
diff --git a/dumux/decoupled/2p/transport/fv/evalcflflux_default.hh b/dumux/decoupled/2p/transport/fv/evalcflflux_default.hh
index 8e8b72e8a7..0ca084acf7 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflflux_default.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflflux_default.hh
@@ -45,11 +45,11 @@ template<class TypeTag>
class EvalCflFluxDefault: public EvalCflFlux<TypeTag>
{
private:
- 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(Problem)) Problem;
+ 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, PTAG(Indices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum
{
@@ -204,8 +204,8 @@ private:
Scalar fluxNonwettingOut_;
Scalar fluxOut_;
Scalar fluxIn_;
- static const int velocityType_ = GET_PROP_VALUE(TypeTag, PTAG(VelocityFormulation));
- static const int saturationType_ = GET_PROP_VALUE(TypeTag, PTAG(SaturationFormulation));
+ static const int velocityType_ = GET_PROP_VALUE(TypeTag, VelocityFormulation);
+ static const int saturationType_ = GET_PROP_VALUE(TypeTag, SaturationFormulation);
};
template<class TypeTag>
diff --git a/dumux/decoupled/2p/transport/fv/evalcflflux_default_old.hh b/dumux/decoupled/2p/transport/fv/evalcflflux_default_old.hh
index 8c429e2647..009ef36130 100644
--- a/dumux/decoupled/2p/transport/fv/evalcflflux_default_old.hh
+++ b/dumux/decoupled/2p/transport/fv/evalcflflux_default_old.hh
@@ -45,11 +45,11 @@ template<class TypeTag>
class EvalCflFluxDefault: public EvalCflFlux<TypeTag>
{
private:
- 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(Problem)) Problem;
+ 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, PTAG(TwoPIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
enum
{
@@ -204,8 +204,8 @@ private:
Scalar fluxNonwettingOut_;
Scalar fluxOut_;
Scalar fluxIn_;
- static const int velocityType_ = GET_PROP_VALUE(TypeTag, PTAG(VelocityFormulation));
- static const int saturationType_ = GET_PROP_VALUE(TypeTag, PTAG(SaturationFormulation));
+ static const int velocityType_ = GET_PROP_VALUE(TypeTag, VelocityFormulation);
+ static const int saturationType_ = GET_PROP_VALUE(TypeTag, SaturationFormulation);
};
template<class TypeTag>
diff --git a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
index f43fb75b04..36ff6bf63a 100644
--- a/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
+++ b/dumux/decoupled/2p/transport/fv/fvsaturation2p.hh
@@ -58,40 +58,40 @@ namespace Dumux
template<class TypeTag>
class FVSaturation2P
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Variables)) Variables;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Variables) Variables;
typedef Dune::GenericReferenceElements<Scalar, dim> ReferenceElementContainer;
typedef Dune::GenericReferenceElements<Scalar, dim - 1> ReferenceElementFaceContainer;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(DiffusivePart)) DiffusivePart;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ConvectivePart)) ConvectivePart;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(EvalCflFluxFunction)) EvalCflFluxFunction;
+ typedef typename GET_PROP_TYPE(TypeTag, DiffusivePart) DiffusivePart;
+ typedef typename GET_PROP_TYPE(TypeTag, ConvectivePart) ConvectivePart;
+ typedef typename GET_PROP_TYPE(TypeTag, EvalCflFluxFunction) EvalCflFluxFunction;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(WettingPhase)) WettingPhase;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(NonwettingPhase)) NonwettingPhase;
+ 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, NonwettingPhase) NonwettingPhase;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(CellData)) CellData;
+ typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
enum
{
@@ -313,10 +313,10 @@ private:
ConvectivePart* convectivePart_;
EvalCflFluxFunction* evalCflFluxFunction_;
- static const bool compressibility_ = GET_PROP_VALUE(TypeTag, PTAG(EnableCompressibility));
- static const int saturationType_ = GET_PROP_VALUE(TypeTag, PTAG(SaturationFormulation));
- static const int velocityType_ = GET_PROP_VALUE(TypeTag, PTAG(VelocityFormulation));
- static const int pressureType_ = GET_PROP_VALUE(TypeTag, PTAG(PressureFormulation));
+ static const bool compressibility_ = GET_PROP_VALUE(TypeTag, EnableCompressibility);
+ static const int saturationType_ = GET_PROP_VALUE(TypeTag, SaturationFormulation);
+ static const int velocityType_ = GET_PROP_VALUE(TypeTag, VelocityFormulation);
+ static const int pressureType_ = GET_PROP_VALUE(TypeTag, PressureFormulation);
bool switchNormals_;
const Scalar threshold_;
diff --git a/dumux/decoupled/2p/transport/fv/gravitypart.hh b/dumux/decoupled/2p/transport/fv/gravitypart.hh
index 655a0f1bb1..ff4c0d998d 100644
--- a/dumux/decoupled/2p/transport/fv/gravitypart.hh
+++ b/dumux/decoupled/2p/transport/fv/gravitypart.hh
@@ -49,20 +49,20 @@ template<class TypeTag>
class GravityPart: public ConvectivePart<TypeTag>
{
private:
- 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(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
+ 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, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(WettingPhase)) WettingPhase;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(NonwettingPhase)) NonwettingPhase;
+ 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, NonwettingPhase) NonwettingPhase;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(CellData)) CellData;
+ typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
enum
{
diff --git a/dumux/decoupled/2p/transport/transportproblem2p.hh b/dumux/decoupled/2p/transport/transportproblem2p.hh
index 53c4f0bb96..e26231381f 100644
--- a/dumux/decoupled/2p/transport/transportproblem2p.hh
+++ b/dumux/decoupled/2p/transport/transportproblem2p.hh
@@ -49,25 +49,25 @@ namespace Dumux
template<class TypeTag>
class TransportProblem2P : public OneModelProblem<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
typedef OneModelProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::Grid Grid;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
// material properties
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::ScalarSolution Solution;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum {
dim = Grid::dimension,
diff --git a/dumux/decoupled/2p/variableclass2p.hh b/dumux/decoupled/2p/variableclass2p.hh
index 04d2b87939..f4efa47999 100644
--- a/dumux/decoupled/2p/variableclass2p.hh
+++ b/dumux/decoupled/2p/variableclass2p.hh
@@ -48,11 +48,11 @@ template<class TypeTag>
class VariableClass2P: public VariableClass<TypeTag>
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ 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, PTAG(TwoPIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
typedef VariableClass<TypeTag> ParentType;
@@ -71,8 +71,8 @@ private:
wPhaseIdx = Indices::wPhaseIdx, nPhaseIdx = Indices::nPhaseIdx
};
- static const int pressureType_ = GET_PROP_VALUE(TypeTag, PTAG(PressureFormulation));
- static const int saturationType_ = GET_PROP_VALUE(TypeTag, PTAG(SaturationFormulation));
+ static const int pressureType_ = GET_PROP_VALUE(TypeTag, PressureFormulation);
+ static const int saturationType_ = GET_PROP_VALUE(TypeTag, SaturationFormulation);
typedef typename SolutionTypes::ElementMapper ElementMapper;
diff --git a/dumux/decoupled/2p/variableclass2p_gridadapt.hh b/dumux/decoupled/2p/variableclass2p_gridadapt.hh
index b879c857f0..7c6dca8b79 100644
--- a/dumux/decoupled/2p/variableclass2p_gridadapt.hh
+++ b/dumux/decoupled/2p/variableclass2p_gridadapt.hh
@@ -46,17 +46,17 @@ class VariableClass2PGridAdapt: public VariableClass2P<TypeTag>
{
private:
typedef VariableClass2P<TypeTag> ParentType;
- 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;
typedef typename GridView::Grid Grid;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TransportSolutionType)) TransportSolutionType;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, TransportSolutionType) TransportSolutionType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw)) MaterialLaw;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
enum
{
@@ -71,7 +71,7 @@ private:
wPhaseIdx = Indices::wPhaseIdx, nPhaseIdx = Indices::nPhaseIdx
};
- static const int pressureType_ = GET_PROP_VALUE(TypeTag, PTAG(PressureFormulation));
+ static const int pressureType_ = GET_PROP_VALUE(TypeTag, PressureFormulation);
typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename Grid::template Codim<0>::EntityPointer ElementPointer;
diff --git a/dumux/decoupled/2p2c/2p2cproblem.hh b/dumux/decoupled/2p2c/2p2cproblem.hh
index e1444424e9..dfa4010297 100644
--- a/dumux/decoupled/2p2c/2p2cproblem.hh
+++ b/dumux/decoupled/2p2c/2p2cproblem.hh
@@ -49,18 +49,18 @@ template<class TypeTag>
class IMPETProblem2P2C : public IMPESProblem2P<TypeTag>
{
typedef IMPESProblem2P<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::Grid Grid;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
// material properties
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
enum {
@@ -197,7 +197,7 @@ private:
protected:
//! Sets entries of the primary variable vector to zero
//
- void setZero(typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) &values, const int equation = -1) const
+ void setZero(typename GET_PROP_TYPE(TypeTag, PrimaryVariables) &values, const int equation = -1) const
{
if (equation == Indices::pressureEqIdx)
{
diff --git a/dumux/decoupled/2p2c/2p2cproperties.hh b/dumux/decoupled/2p2c/2p2cproperties.hh
index 5cafec2289..33a80cb99a 100644
--- a/dumux/decoupled/2p2c/2p2cproperties.hh
+++ b/dumux/decoupled/2p2c/2p2cproperties.hh
@@ -97,7 +97,7 @@ SET_PROP(DecoupledTwoPTwoC, NumPhases) //!< The number of phases in the 2p model
{
// the property is created in decoupledproperties.hh
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
static const int value = FluidSystem::numPhases;
@@ -108,7 +108,7 @@ public:
SET_PROP(DecoupledTwoPTwoC, NumComponents) //!< The number of components in the 2p2c model is 2
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
static const int value = FluidSystem::numComponents;
@@ -119,19 +119,19 @@ public:
//! Set the default formulation
SET_INT_PROP(DecoupledTwoPTwoC,
PressureFormulation,
- GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices))::pressureW);
+ GET_PROP_TYPE(TypeTag, TwoPTwoCIndices)::pressureW);
SET_INT_PROP(DecoupledTwoPTwoC,
SaturationFormulation,
- GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices))::saturationW);
+ GET_PROP_TYPE(TypeTag, TwoPTwoCIndices)::saturationW);
SET_INT_PROP(DecoupledTwoPTwoC,
VelocityFormulation,
- GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices))::velocityW);
+ GET_PROP_TYPE(TypeTag, TwoPTwoCIndices)::velocityW);
SET_PROP(DecoupledTwoPTwoC, TransportSolutionType)
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename Dune::BlockVector<Dune::BlockVector<Dune::FieldVector<Scalar,1> > > type;//!<type for vector of vector (of scalars)
};
@@ -171,7 +171,7 @@ template <class TypeTag>
struct DecoupledTwoPTwoCIndices : DecoupledTwoPCommonIndices
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
// Component indices
diff --git a/dumux/decoupled/2p2c/dec2p2cfluidstate.hh b/dumux/decoupled/2p2c/dec2p2cfluidstate.hh
index c70097c648..15dac05db7 100644
--- a/dumux/decoupled/2p2c/dec2p2cfluidstate.hh
+++ b/dumux/decoupled/2p2c/dec2p2cfluidstate.hh
@@ -44,11 +44,11 @@ template <class TypeTag>
class DecoupledTwoPTwoCFluidState
{
typedef DecoupledTwoPTwoCFluidState<TypeTag> ThisType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
- static const int pressureType = GET_PROP_VALUE(TypeTag, PTAG(PressureFormulation)); //!< gives kind of pressure used (\f$ 0 = p_w\f$, \f$ 1 = p_n\f$, \f$ 2 = p_{global}\f$)
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
+ static const 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$)
enum {
@@ -60,8 +60,8 @@ class DecoupledTwoPTwoCFluidState
};
public:
- enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
- numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents))};
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
+ numComponents = GET_PROP_VALUE(TypeTag, NumComponents)};
public:
/*!
diff --git a/dumux/decoupled/2p2c/fvpressure2p2c.hh b/dumux/decoupled/2p2c/fvpressure2p2c.hh
index 3cdc024a85..dec3c82232 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2c.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2c.hh
@@ -66,19 +66,19 @@ namespace Dumux
*/
template<class TypeTag> class FVPressure2P2C
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ 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, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
enum
{
@@ -110,11 +110,11 @@ template<class TypeTag> class FVPressure2P2C
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldMatrix<Scalar, dim, dim> FieldMatrix;
typedef Dune::FieldVector<Scalar, 2> PhaseVector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
// the typenames used for the stiffness matrix and solution vector
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureCoefficientMatrix)) Matrix;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureRHSVector)) RHSVector;
+ typedef typename GET_PROP_TYPE(TypeTag, PressureCoefficientMatrix) Matrix;
+ typedef typename GET_PROP_TYPE(TypeTag, PressureRHSVector) RHSVector;
//initializes the matrix to store the system of equations
void initializeMatrix();
@@ -299,7 +299,7 @@ protected:
Scalar ErrorTermFactor_; //!< Handling of error term: relaxation factor
Scalar ErrorTermLowerBound_; //!< Handling of error term: lower bound for error dampening
Scalar ErrorTermUpperBound_; //!< Handling of error term: upper bound for error dampening
- static constexpr int pressureType = GET_PROP_VALUE(TypeTag, PTAG(PressureFormulation)); //!< gives kind of pressure used (\f$ 0 = p_w \f$, \f$ 1 = p_n \f$, \f$ 2 = p_{global} \f$)
+ 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$)
};
//! initializes the matrix to store the system of equations
@@ -823,7 +823,7 @@ void FVPressure2P2C<TypeTag>::assemble(bool first)
FluidSystem::viscosity(BCfluidState, nPhaseIdx);
// mobility at the boundary
- switch (GET_PROP_VALUE(TypeTag, PTAG(BoundaryMobility)))
+ switch (GET_PROP_VALUE(TypeTag, BoundaryMobility))
{
case Indices::satDependent:
{
@@ -1002,7 +1002,7 @@ void FVPressure2P2C<TypeTag>::assemble(bool first)
if (isnan(compress_term) || isinf(compress_term))
DUNE_THROW(Dune::MathError, "Compressibility term leads to NAN matrix entry at index " << globalIdxI);
- if(!GET_PROP_VALUE(TypeTag, PTAG(EnableCompressibility)))
+ if(!GET_PROP_VALUE(TypeTag, EnableCompressibility))
DUNE_THROW(Dune::NotImplemented, "Compressibility is switched off???");
}
@@ -1041,7 +1041,7 @@ void FVPressure2P2C<TypeTag>::assemble(bool first)
template<class TypeTag>
void FVPressure2P2C<TypeTag>::solve()
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(LinearSolver)) Solver;
+ typedef typename GET_PROP_TYPE(TypeTag, LinearSolver) Solver;
int verboseLevelSolver = GET_PARAM(TypeTag, int, LinearSolver, Verbosity);
@@ -1119,7 +1119,7 @@ void FVPressure2P2C<TypeTag>::initialMaterialLaws(bool compositional)
{
//get saturation, determine pc
sat_0 = problem().initSat(*eIt);
- if(GET_PROP_VALUE(TypeTag, PTAG(EnableCapillarity)))
+ if(GET_PROP_VALUE(TypeTag, EnableCapillarity))
{
problem().variables().capillaryPressure(globalIdx)
= MaterialLaw::pC(problem().spatialParameters().materialLawParams(globalPos, *eIt),
@@ -1154,7 +1154,7 @@ void FVPressure2P2C<TypeTag>::initialMaterialLaws(bool compositional)
// This may affect pc and hence p_alpha and hence again saturation -> iteration.
// iterations in case of enabled capillary pressure
- if(GET_PROP_VALUE(TypeTag, PTAG(EnableCapillarity)))
+ if(GET_PROP_VALUE(TypeTag, EnableCapillarity))
{
//start with pc from last TS
Scalar pc(problem().variables().capillaryPressure(globalIdx));
@@ -1323,7 +1323,7 @@ void FVPressure2P2C<TypeTag>::updateMaterialLaws()
// iterations part in case of enabled capillary pressure
Scalar pc(0.), oldPc(0.);
- if(GET_PROP_VALUE(TypeTag, PTAG(EnableCapillarity)))
+ if(GET_PROP_VALUE(TypeTag, EnableCapillarity))
{
pc = MaterialLaw::pC(problem().spatialParameters().materialLawParams(globalPos, *eIt),
fluidState.saturation(wPhaseIdx));
diff --git a/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
index f21b79e642..ad3ab7974a 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
@@ -67,18 +67,18 @@ namespace Dumux
template<class TypeTag>
class FVPressure2P2CMultiPhysics : public FVPressure2P2C<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ 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, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
enum
{
@@ -110,7 +110,7 @@ class FVPressure2P2CMultiPhysics : public FVPressure2P2C<TypeTag>
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldMatrix<Scalar, dim, dim> FieldMatrix;
typedef Dune::FieldVector<Scalar, 2> PhaseVector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
//! Access functions to the current problem object
@@ -195,7 +195,7 @@ private:
protected:
const GlobalPosition& gravity; //!< vector including the gravity constant
- static constexpr int pressureType = GET_PROP_VALUE(TypeTag, PTAG(PressureFormulation)); //!< gives kind of pressure used (\f$ 0 = p_w \f$, \f$ 1 = p_n \f$, \f$ 2 = p_{global} \f$)
+ 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$)
Dune::Timer timer_;
};
@@ -586,7 +586,7 @@ void FVPressure2P2CMultiPhysics<TypeTag>::assemble(bool first)
unitDistVec /= dist;
//get boundary condition for boundary face center
- typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) bcType;
+ typename GET_PROP_TYPE(TypeTag, BoundaryTypes) bcType;
problem().boundaryTypes(bcType, *isIt);
// prepare pressure boundary condition
@@ -642,7 +642,7 @@ void FVPressure2P2CMultiPhysics<TypeTag>::assemble(bool first)
FluidSystem::viscosity(BCfluidState, nPhaseIdx);
// mobility at the boundary
- switch (GET_PROP_VALUE(TypeTag, PTAG(BoundaryMobility)))
+ switch (GET_PROP_VALUE(TypeTag, BoundaryMobility))
{
case Indices::satDependent:
{
@@ -898,7 +898,7 @@ void FVPressure2P2CMultiPhysics<TypeTag>::assemble(bool first)
if (isnan(compress_term) || isinf(compress_term))
DUNE_THROW(Dune::MathError, "Compressibility term leads to NAN matrix entry at index " << globalIdxI);
- if(!GET_PROP_VALUE(TypeTag, PTAG(EnableCompressibility)))
+ if(!GET_PROP_VALUE(TypeTag, EnableCompressibility))
DUNE_THROW(Dune::NotImplemented, "Compressibility is switched off???");
}
@@ -1041,7 +1041,7 @@ void FVPressure2P2CMultiPhysics<TypeTag>::updateMaterialLaws()
// iterations part in case of enabled capillary pressure
Scalar pc(0.), oldPc(0.);
- if(GET_PROP_VALUE(TypeTag, PTAG(EnableCapillarity)))
+ if(GET_PROP_VALUE(TypeTag, EnableCapillarity))
{
pc = MaterialLaw::pC(problem().spatialParameters().materialLawParams(globalPos, *eIt),
fluidState.saturation(wPhaseIdx));
diff --git a/dumux/decoupled/2p2c/fvtransport2p2c.hh b/dumux/decoupled/2p2c/fvtransport2p2c.hh
index 01ed676762..1cab0b1096 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2c.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2c.hh
@@ -49,20 +49,20 @@ namespace Dumux
template<class TypeTag>
class FVTransport2P2C
{
- 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(Problem)) Problem;
+ 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, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TransportSolutionType)) TransportSolutionType;
+ typedef typename GET_PROP_TYPE(TypeTag, TransportSolutionType) TransportSolutionType;
enum
{
@@ -93,7 +93,7 @@ class FVTransport2P2C
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldVector<Scalar, 2> PhaseVector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
//! Acess function for the current problem
Problem& problem()
@@ -138,7 +138,7 @@ public:
protected:
Problem& problem_;
- static const int pressureType = GET_PROP_VALUE(TypeTag, PTAG(PressureFormulation)); //!< gives kind of pressure used (\f$ 0 = p_w \f$, \f$ 1 = p_n \f$, \f$ 2 = p_{global} \f$)
+ static const 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$)
bool switchNormals;
};
@@ -213,7 +213,7 @@ void FVTransport2P2C<TypeTag>::update(const Scalar t, Scalar& dt, TransportSolut
double Xn1_I = problem().variables().nonwet_X1(globalIdxI);
Scalar densityWI (0.), densityNWI(0.);
- if (GET_PROP_VALUE(TypeTag, PTAG(NumDensityTransport)))
+ if (GET_PROP_VALUE(TypeTag, NumDensityTransport))
{
densityWI= problem().variables().numericalDensity(globalIdxI, wPhaseIdx);
densityNWI = problem().variables().numericalDensity(globalIdxI, nPhaseIdx);
@@ -271,7 +271,7 @@ void FVTransport2P2C<TypeTag>::update(const Scalar t, Scalar& dt, TransportSolut
// phase densities in neighbor
Scalar densityWJ (0.), densityNWJ(0.);
- if (GET_PROP_VALUE(TypeTag, PTAG(NumDensityTransport)))
+ if (GET_PROP_VALUE(TypeTag, NumDensityTransport))
{
densityWJ = problem().variables().numericalDensity(globalIdxJ, wPhaseIdx);
densityNWJ = problem().variables().numericalDensity(globalIdxJ, nPhaseIdx);
@@ -403,7 +403,7 @@ void FVTransport2P2C<TypeTag>::update(const Scalar t, Scalar& dt, TransportSolut
Scalar densityNWBound = BCfluidState.density(nPhaseIdx);
Scalar viscosityWBound = FluidSystem::viscosity(BCfluidState, wPhaseIdx);
Scalar viscosityNWBound = FluidSystem::viscosity(BCfluidState, nPhaseIdx);
- if(GET_PROP_VALUE(TypeTag, PTAG(EnableCapillarity)))
+ if(GET_PROP_VALUE(TypeTag, EnableCapillarity))
pcBound = BCfluidState.capillaryPressure();
// average
double densityW_mean = (densityWI + densityWBound) / 2;
@@ -444,7 +444,7 @@ void FVTransport2P2C<TypeTag>::update(const Scalar t, Scalar& dt, TransportSolut
lambdaW = problem().variables().mobilityWetting(globalIdxI);
else
{
- if(GET_PROP_VALUE(TypeTag, PTAG(BoundaryMobility))==Indices::satDependent)
+ if(GET_PROP_VALUE(TypeTag, BoundaryMobility)==Indices::satDependent)
lambdaW = BCfluidState.saturation(wPhaseIdx) / viscosityWBound;
else
lambdaW = MaterialLaw::krw(
@@ -455,7 +455,7 @@ void FVTransport2P2C<TypeTag>::update(const Scalar t, Scalar& dt, TransportSolut
lambdaNW = problem().variables().mobilityNonwetting(globalIdxI);
else
{
- if(GET_PROP_VALUE(TypeTag, PTAG(BoundaryMobility))==Indices::satDependent)
+ if(GET_PROP_VALUE(TypeTag, BoundaryMobility)==Indices::satDependent)
lambdaNW = BCfluidState.saturation(nPhaseIdx) / viscosityNWBound;
else
lambdaNW = MaterialLaw::krn(
@@ -582,7 +582,7 @@ void FVTransport2P2C<TypeTag>::evalBoundary(GlobalPosition globalPosFace,
if (bcType == Indices::saturation)
{
Scalar satBound = primaryVariablesOnBoundary[Indices::contiWEqIdx];
- if(GET_PROP_VALUE(TypeTag, PTAG(EnableCapillarity)))
+ if(GET_PROP_VALUE(TypeTag, EnableCapillarity))
{
Scalar pcBound = MaterialLaw::pC(problem().spatialParameters().materialLawParams(globalPosFace, *eIt),
satBound);
@@ -618,7 +618,7 @@ void FVTransport2P2C<TypeTag>::evalBoundary(GlobalPosition globalPosFace,
BCfluidState.update(Z1Bound, pressBound, problem().spatialParameters().porosity(globalPosFace, *eIt),
problem().temperatureAtPos(globalPosFace));
- if(GET_PROP_VALUE(TypeTag, PTAG(EnableCapillarity)))
+ if(GET_PROP_VALUE(TypeTag, EnableCapillarity))
{
Scalar pcBound = MaterialLaw::pC(problem().spatialParameters().materialLawParams(globalPosFace, *eIt),
BCfluidState.saturation(wPhaseIdx));
diff --git a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
index f3ea80c40a..b8c8f55a45 100644
--- a/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/fvtransport2p2cmultiphysics.hh
@@ -54,19 +54,19 @@ namespace Dumux
template<class TypeTag>
class FVTransport2P2CMultiPhysics : public FVTransport2P2C<TypeTag>
{
- 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(Problem)) Problem;
+ 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, PTAG(SpatialParameters)) SpatialParameters;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) SpatialParameters;
typedef typename SpatialParameters::MaterialLaw MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TransportSolutionType)) TransportSolutionType;
+ typedef typename GET_PROP_TYPE(TypeTag, TransportSolutionType) TransportSolutionType;
enum
{
@@ -97,7 +97,7 @@ class FVTransport2P2CMultiPhysics : public FVTransport2P2C<TypeTag>
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldVector<Scalar, 2> PhaseVector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
public:
virtual void update(const Scalar t, Scalar& dt, TransportSolutionType& updateVec, bool impes);
@@ -117,7 +117,7 @@ public:
protected:
Problem& problem_;
- static const int pressureType = GET_PROP_VALUE(TypeTag, PTAG(PressureFormulation)); //!< gives kind of pressure used (\f$ 0 = p_w \f$, \f$ 1 = p_n \f$, \f$ 2 = p_{global} \f$)
+ static const 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$)
bool switchNormals;
};
@@ -348,7 +348,7 @@ void FVTransport2P2CMultiPhysics<TypeTag>::update(const Scalar t, Scalar& dt, Tr
FluidState BCfluidState;
//get boundary type
- typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) bcTypes;
+ typename GET_PROP_TYPE(TypeTag, BoundaryTypes) bcTypes;
problem_.boundaryTypes(bcTypes, *isIt);
if (bcTypes.isDirichlet(Indices::contiWEqIdx)) // if contiWEq is Dirichlet, so is contiNEq
@@ -371,7 +371,7 @@ void FVTransport2P2CMultiPhysics<TypeTag>::update(const Scalar t, Scalar& dt, Tr
Scalar densityNWBound = BCfluidState.density(nPhaseIdx);
Scalar viscosityWBound = FluidSystem::viscosity(BCfluidState, wPhaseIdx);
Scalar viscosityNWBound = FluidSystem::viscosity(BCfluidState, nPhaseIdx);
- if(GET_PROP_VALUE(TypeTag, PTAG(EnableCapillarity)))
+ if(GET_PROP_VALUE(TypeTag, EnableCapillarity))
pcBound = BCfluidState.capillaryPressure();
// average
@@ -413,7 +413,7 @@ void FVTransport2P2CMultiPhysics<TypeTag>::update(const Scalar t, Scalar& dt, Tr
lambdaW = problem_.variables().mobilityWetting(globalIdxI);
else
{
- if(GET_PROP_VALUE(TypeTag, PTAG(BoundaryMobility))==Indices::satDependent)
+ if(GET_PROP_VALUE(TypeTag, BoundaryMobility)==Indices::satDependent)
lambdaW = BCfluidState.saturation(wPhaseIdx) / viscosityWBound;
else
lambdaW = MaterialLaw::krw(
@@ -424,7 +424,7 @@ void FVTransport2P2CMultiPhysics<TypeTag>::update(const Scalar t, Scalar& dt, Tr
lambdaNW = problem_.variables().mobilityNonwetting(globalIdxI);
else
{
- if(GET_PROP_VALUE(TypeTag, PTAG(BoundaryMobility))==Indices::satDependent)
+ if(GET_PROP_VALUE(TypeTag, BoundaryMobility)==Indices::satDependent)
lambdaNW = BCfluidState.saturation(nPhaseIdx) / viscosityNWBound;
else
lambdaNW = MaterialLaw::krn(
diff --git a/dumux/decoupled/2p2c/pseudo1p2cfluidstate.hh b/dumux/decoupled/2p2c/pseudo1p2cfluidstate.hh
index 41c187612d..e21d5e55d3 100644
--- a/dumux/decoupled/2p2c/pseudo1p2cfluidstate.hh
+++ b/dumux/decoupled/2p2c/pseudo1p2cfluidstate.hh
@@ -41,16 +41,16 @@ namespace Dumux
* \tparam TypeTag The property Type Tag
*/
template <class TypeTag>
-class PseudoOnePTwoCFluidState : public FluidState<typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)),
+class PseudoOnePTwoCFluidState : public FluidState<typename GET_PROP_TYPE(TypeTag, Scalar),
PseudoOnePTwoCFluidState<TypeTag> >
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
public:
- enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
- numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents))};
+ enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
+ numComponents = GET_PROP_VALUE(TypeTag, NumComponents)};
enum {
wPhaseIdx = Indices::wPhaseIdx,
nPhaseIdx = Indices::nPhaseIdx,
diff --git a/dumux/decoupled/2p2c/variableclass2p2c.hh b/dumux/decoupled/2p2c/variableclass2p2c.hh
index dbc93aa278..c1c05ddf4b 100644
--- a/dumux/decoupled/2p2c/variableclass2p2c.hh
+++ b/dumux/decoupled/2p2c/variableclass2p2c.hh
@@ -45,12 +45,12 @@ template<class TypeTag>
class VariableClass2P2C: public VariableClass<TypeTag>
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TransportSolutionType)) TransportSolutionType;
+ 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, TransportSolutionType) TransportSolutionType;
typedef typename SolutionTypes::ElementMapper ElementMapper;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
typedef VariableClass<TypeTag> ParentClass;
@@ -68,7 +68,7 @@ private:
wCompIdx = Indices::wPhaseIdx, nCompIdx = Indices::nPhaseIdx
};
- static const int pressureType_ = GET_PROP_VALUE(TypeTag, PTAG(PressureFormulation));
+ static const int pressureType_ = GET_PROP_VALUE(TypeTag, PressureFormulation);
typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef Dune::FieldVector<Scalar, dim> LocalPosition;
@@ -232,12 +232,12 @@ public:
ScalarSolutionType *saturation = writer.allocateManagedBuffer (size_);
*pressure = this->pressure();
*saturation = saturation_;
- if (GET_PROP_VALUE(TypeTag, PTAG(PressureFormulation)) == GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices))::pressureW)
+ if (GET_PROP_VALUE(TypeTag, PressureFormulation) == GET_PROP_TYPE(TypeTag, TwoPTwoCIndices)::pressureW)
writer.attachCellData(*pressure, "pressure w_phase");
else
writer.attachCellData(*pressure, "pressure nw_phase");
writer.attachCellData(*saturation, "water saturation");
- if(GET_PROP_VALUE(TypeTag, PTAG(EnableCapillarity)))
+ if(GET_PROP_VALUE(TypeTag, EnableCapillarity))
{
ScalarSolutionType *pc = writer.allocateManagedBuffer (size_);
*pc = capillaryPressure_;
diff --git a/dumux/decoupled/common/decoupledproperties.hh b/dumux/decoupled/common/decoupledproperties.hh
index 1a26a23d7d..b7462d417e 100644
--- a/dumux/decoupled/common/decoupledproperties.hh
+++ b/dumux/decoupled/common/decoupledproperties.hh
@@ -93,7 +93,7 @@ namespace Properties
SET_PROP(DecoupledModel, GridView)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
+ typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
public:
typedef typename Grid::LeafGridView type;
@@ -106,7 +106,7 @@ NEW_PROP_TAG(MaxIntersections); //!< maximum number of intersections per eleme
SET_PROP(DecoupledModel, MaxIntersections)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
+ typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
static const int dim = Grid::dimension;
public:
typedef int type;
@@ -120,19 +120,19 @@ public:
*/
SET_PROP(DecoupledModel, SolutionTypes)
{
- 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;
typedef typename GridView::Grid Grid;
typedef typename Grid::ctype CoordScalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Variables)) Variables;
+ typedef typename GET_PROP_TYPE(TypeTag, Variables) Variables;
enum
{
dim = GridView::dimension,
- numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)),
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
- numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)),
- maxIntersections = GET_PROP_VALUE(TypeTag, PTAG(MaxIntersections))
+ numEq = GET_PROP_VALUE(TypeTag, NumEq),
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
+ numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
+ maxIntersections = GET_PROP_VALUE(TypeTag, MaxIntersections)
};
template<int dim>
@@ -174,7 +174,7 @@ public:
typedef Dune::BlockVector<Dune::FieldVector<Dune::FieldVector<Scalar, dim>, maxIntersections > > DimVecElemFace;//!<type for vector of vectors (of size 2 x dimension) of vector (of size dimension) of scalars
};
-SET_TYPE_PROP(DecoupledModel, PrimaryVariables, typename GET_PROP(TypeTag, PTAG(SolutionTypes))::PrimaryVariables);
+SET_TYPE_PROP(DecoupledModel, PrimaryVariables, typename GET_PROP(TypeTag, SolutionTypes)::PrimaryVariables);
/*!
* \brief Default implementation for the Vector of the transportet quantity
@@ -186,7 +186,7 @@ SET_TYPE_PROP(DecoupledModel, PrimaryVariables, typename GET_PROP(TypeTag, PTAG
SET_PROP(DecoupledModel, TransportSolutionType)
{
private:
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionType;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionType;
public:
typedef typename SolutionType::ScalarSolution type;//!<type for vector of scalar properties
@@ -200,7 +200,7 @@ SET_TYPE_PROP(DecoupledModel, TimeManager, Dumux::TimeManager<TypeTag>);
*/
SET_PROP(DecoupledModel, BoundaryTypes)
{ private:
- enum { numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)) };
+ enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
public:
typedef Dumux::BoundaryTypes<numEq> type;
};
diff --git a/dumux/decoupled/common/decoupledproperties_old.hh b/dumux/decoupled/common/decoupledproperties_old.hh
index d244af1364..b979e7d480 100644
--- a/dumux/decoupled/common/decoupledproperties_old.hh
+++ b/dumux/decoupled/common/decoupledproperties_old.hh
@@ -94,7 +94,7 @@ namespace Properties
SET_PROP(DecoupledModel, GridView)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
+ typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
public:
typedef typename Grid::LeafGridView type;
@@ -110,7 +110,7 @@ NEW_PROP_TAG(MaxIntersections); //!< maximum number of intersections per eleme
SET_PROP(DecoupledModel, MaxIntersections)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
+ typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
static const int dim = Grid::dimension;
public:
typedef int type;
@@ -124,19 +124,19 @@ public:
*/
SET_PROP(DecoupledModel, SolutionTypes)
{
- 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;
typedef typename GridView::Grid Grid;
typedef typename Grid::ctype CoordScalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Variables)) Variables;
+ typedef typename GET_PROP_TYPE(TypeTag, Variables) Variables;
enum
{
dim = GridView::dimension,
- numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)),
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
- numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)),
- maxIntersections = GET_PROP_VALUE(TypeTag, PTAG(MaxIntersections))
+ numEq = GET_PROP_VALUE(TypeTag, NumEq),
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
+ numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
+ maxIntersections = GET_PROP_VALUE(TypeTag, MaxIntersections)
};
template<int dim>
@@ -178,7 +178,7 @@ public:
typedef Dune::BlockVector<Dune::FieldVector<Dune::FieldVector<Scalar, dim>, maxIntersections > > DimVecElemFace;//!<type for vector of vectors (of size 2 x dimension) of vector (of size dimension) of scalars
};
-SET_TYPE_PROP(DecoupledModel, PrimaryVariables, typename GET_PROP(TypeTag, PTAG(SolutionTypes))::PrimaryVariables);
+SET_TYPE_PROP(DecoupledModel, PrimaryVariables, typename GET_PROP(TypeTag, SolutionTypes)::PrimaryVariables);
/*!
* \brief Default implementation for the Vector of the transportet quantity
@@ -190,7 +190,7 @@ SET_TYPE_PROP(DecoupledModel, PrimaryVariables, typename GET_PROP(TypeTag, PTAG
SET_PROP(DecoupledModel, TransportSolutionType)
{
private:
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionType;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionType;
public:
typedef typename SolutionType::ScalarSolution type;//!<type for vector of scalar properties
@@ -204,7 +204,7 @@ SET_TYPE_PROP(DecoupledModel, TimeManager, Dumux::TimeManager<TypeTag>);
*/
SET_PROP(DecoupledModel, BoundaryTypes)
{ private:
- enum { numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)) };
+ enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
public:
typedef Dumux::BoundaryTypes<numEq> type;
};
diff --git a/dumux/decoupled/common/gridadapt.hh b/dumux/decoupled/common/gridadapt.hh
index b92acde902..8a66a1945b 100644
--- a/dumux/decoupled/common/gridadapt.hh
+++ b/dumux/decoupled/common/gridadapt.hh
@@ -43,18 +43,18 @@ namespace Dumux
template<class TypeTag, bool adaptive>
class GridAdapt
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
//*******************************
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::Grid Grid;
typedef typename Grid::LeafGridView LeafGridView;
typedef typename LeafGridView::template Codim<0>::Iterator LeafIterator;
typedef typename GridView::IntersectionIterator LeafIntersectionIterator;
typedef typename Grid::template Codim<0>::Entity Entity;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::ScalarSolution ScalarSolutionType;
public:
@@ -406,9 +406,9 @@ private:
template<class TypeTag>
class GridAdapt<TypeTag, false>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::ScalarSolution ScalarSolutionType;
public:
diff --git a/dumux/decoupled/common/impet.hh b/dumux/decoupled/common/impet.hh
index d0b442b06c..42a8895bfd 100644
--- a/dumux/decoupled/common/impet.hh
+++ b/dumux/decoupled/common/impet.hh
@@ -53,17 +53,17 @@ namespace Dumux
template<class TypeTag> class IMPET
{
typedef IMPET<TypeTag> ThisType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP(TypeTag, PTAG(ParameterTree)) Parameters;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP(TypeTag, ParameterTree) Parameters;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TransportSolutionType)) TransportSolutionType;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, TransportSolutionType) TransportSolutionType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum
{
diff --git a/dumux/decoupled/common/impet_old.hh b/dumux/decoupled/common/impet_old.hh
index d51803c5c2..b9669188ae 100644
--- a/dumux/decoupled/common/impet_old.hh
+++ b/dumux/decoupled/common/impet_old.hh
@@ -53,15 +53,15 @@ namespace Dumux
template<class TypeTag> class IMPET
{
typedef IMPET<TypeTag> ThisType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP(TypeTag, PTAG(ParameterTree)) Parameters;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP(TypeTag, ParameterTree) Parameters;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TransportSolutionType)) TransportSolutionType;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, TransportSolutionType) TransportSolutionType;
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
diff --git a/dumux/decoupled/common/impetproblem.hh b/dumux/decoupled/common/impetproblem.hh
index 4d7ad4d219..ced5428394 100644
--- a/dumux/decoupled/common/impetproblem.hh
+++ b/dumux/decoupled/common/impetproblem.hh
@@ -47,28 +47,28 @@ template<class TypeTag>
class IMPETProblem
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef Dumux::VtkMultiWriter<GridView> VtkMultiWriter;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Variables)) Variables;
+ typedef typename GET_PROP_TYPE(TypeTag, Variables) Variables;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::VertexMapper VertexMapper;
typedef typename SolutionTypes::ElementMapper ElementMapper;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Model)) IMPETModel;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TransportSolutionType)) TransportSolutionType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureModel)) PressureModel;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TransportModel)) TransportModel;
+ typedef typename GET_PROP_TYPE(TypeTag, Model) IMPETModel;
+ typedef typename GET_PROP_TYPE(TypeTag, TransportSolutionType) TransportSolutionType;
+ typedef typename GET_PROP_TYPE(TypeTag, PressureModel) PressureModel;
+ typedef typename GET_PROP_TYPE(TypeTag, TransportModel) TransportModel;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ 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
{
@@ -77,7 +77,7 @@ private:
};
enum
{
- adaptiveGrid = GET_PROP_VALUE(TypeTag, PTAG(AdaptiveGrid)),
+ adaptiveGrid = GET_PROP_VALUE(TypeTag, AdaptiveGrid),
transportEqIdx = Indices::transportEqIdx
};
@@ -89,7 +89,7 @@ private:
typedef GridAdapt<TypeTag, adaptiveGrid> GridAdaptModel;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
//private!! copy constructor
IMPETProblem(const IMPETProblem&)
diff --git a/dumux/decoupled/common/impetproblem_old.hh b/dumux/decoupled/common/impetproblem_old.hh
index ea22115d11..7a75302b2c 100644
--- a/dumux/decoupled/common/impetproblem_old.hh
+++ b/dumux/decoupled/common/impetproblem_old.hh
@@ -47,26 +47,26 @@ template<class TypeTag>
class IMPETProblem
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef Dumux::VtkMultiWriter<GridView> VtkMultiWriter;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Variables)) Variables;
+ typedef typename GET_PROP_TYPE(TypeTag, Variables) Variables;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::VertexMapper VertexMapper;
typedef typename SolutionTypes::ElementMapper ElementMapper;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Model)) IMPETModel;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TransportSolutionType)) TransportSolutionType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureModel)) PressureModel;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TransportModel)) TransportModel;
+ typedef typename GET_PROP_TYPE(TypeTag, Model) IMPETModel;
+ typedef typename GET_PROP_TYPE(TypeTag, TransportSolutionType) TransportSolutionType;
+ typedef typename GET_PROP_TYPE(TypeTag, PressureModel) PressureModel;
+ typedef typename GET_PROP_TYPE(TypeTag, TransportModel) TransportModel;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
enum
{
@@ -76,7 +76,7 @@ private:
enum
{
wetting = 0, nonwetting = 1,
- adaptiveGrid = GET_PROP_VALUE(TypeTag, PTAG(AdaptiveGrid))
+ adaptiveGrid = GET_PROP_VALUE(TypeTag, AdaptiveGrid)
};
typedef Dune::FieldVector<Scalar,dimWorld> GlobalPosition;
@@ -87,7 +87,7 @@ private:
typedef GridAdapt<TypeTag, adaptiveGrid> GridAdaptModel;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
//private!! copy constructor
IMPETProblem(const IMPETProblem&)
diff --git a/dumux/decoupled/common/impetproperties.hh b/dumux/decoupled/common/impetproperties.hh
index 22dc72b661..a528bbaf74 100644
--- a/dumux/decoupled/common/impetproperties.hh
+++ b/dumux/decoupled/common/impetproperties.hh
@@ -89,7 +89,7 @@ SET_SCALAR_PROP(IMPET, RelaxationFactor, 1);//!< 1 = new solution is new solutio
SET_PROP(IMPET, PressureCoefficientMatrix)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldMatrix<Scalar, 1, 1> MB;
public:
@@ -98,7 +98,7 @@ public:
SET_PROP(IMPET, PressureRHSVector)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dune::BlockVector<Dune::FieldVector<Scalar, 1> > type;
diff --git a/dumux/decoupled/common/onemodelproblem.hh b/dumux/decoupled/common/onemodelproblem.hh
index bd96e301b4..ff4893e1f5 100644
--- a/dumux/decoupled/common/onemodelproblem.hh
+++ b/dumux/decoupled/common/onemodelproblem.hh
@@ -48,20 +48,20 @@ template<class TypeTag>
class OneModelProblem
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef Dumux::VtkMultiWriter<GridView> VtkMultiWriter;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Variables)) Variables;
+ typedef typename GET_PROP_TYPE(TypeTag, Variables) Variables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Model)) Model;
+ typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::VertexMapper VertexMapper;
typedef typename SolutionTypes::ElementMapper ElementMapper;
typedef typename SolutionTypes::ScalarSolution Solution;
@@ -82,7 +82,7 @@ private:
typedef typename GridView::Intersection Intersection;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
// private!! copy constructor
OneModelProblem(const OneModelProblem&)
diff --git a/dumux/decoupled/common/onemodelproblem_old.hh b/dumux/decoupled/common/onemodelproblem_old.hh
index 47e3ba6507..449bf6f935 100644
--- a/dumux/decoupled/common/onemodelproblem_old.hh
+++ b/dumux/decoupled/common/onemodelproblem_old.hh
@@ -48,20 +48,20 @@ template<class TypeTag>
class OneModelProblem
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef Dumux::VtkMultiWriter<GridView> VtkMultiWriter;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Variables)) Variables;
+ typedef typename GET_PROP_TYPE(TypeTag, Variables) Variables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Model)) Model;
+ typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::VertexMapper VertexMapper;
typedef typename SolutionTypes::ElementMapper ElementMapper;
typedef typename SolutionTypes::ScalarSolution Solution;
@@ -82,7 +82,7 @@ private:
typedef typename GridView::Intersection Intersection;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
// private!! copy constructor
OneModelProblem(const OneModelProblem&)
diff --git a/dumux/decoupled/common/variableclass.hh b/dumux/decoupled/common/variableclass.hh
index 2a1bd13fd2..d1262c8b0a 100644
--- a/dumux/decoupled/common/variableclass.hh
+++ b/dumux/decoupled/common/variableclass.hh
@@ -50,17 +50,17 @@ template<class TypeTag>
class VariableClass
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(CellData)) CellData;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
+ 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
{
dim = GridView::dimension,
dimWorld = GridView::dimensionworld,
- numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq))
+ numEq = GET_PROP_VALUE(TypeTag, NumEq)
};
typedef typename GridView::Grid Grid;
diff --git a/dumux/decoupled/common/variableclass_old.hh b/dumux/decoupled/common/variableclass_old.hh
index 754691db6e..90d3f46381 100644
--- a/dumux/decoupled/common/variableclass_old.hh
+++ b/dumux/decoupled/common/variableclass_old.hh
@@ -54,9 +54,9 @@ template<class TypeTag>
class VariableClass
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
enum
{
diff --git a/dumux/linear/boxlinearsolver.hh b/dumux/linear/boxlinearsolver.hh
index 3497e0ff3c..c484d9e90d 100644
--- a/dumux/linear/boxlinearsolver.hh
+++ b/dumux/linear/boxlinearsolver.hh
@@ -56,11 +56,11 @@ namespace Dumux
template <class TypeTag>
class BoxLinearSolver
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(JacobianMatrix)) Matrix;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) Vector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VertexMapper)) VertexMapper;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) Matrix;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) Vector;
+ typedef typename GET_PROP_TYPE(TypeTag, VertexMapper) VertexMapper;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef Dumux::OverlappingBCRSMatrix<Matrix> OverlappingMatrix;
typedef typename OverlappingMatrix::Overlap Overlap;
@@ -241,7 +241,7 @@ class StandardSolverBackend
{
public:
typedef Imp Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
template <class Operator, class ScalarProduct, class Prec>
StandardSolverBackend(Operator& A, ScalarProduct& sp, Prec& prec,
@@ -265,10 +265,10 @@ template <class TypeTag>
class BoxBiCGStabILU0Solver : public BoxLinearSolver<TypeTag>
{
typedef BoxLinearSolver<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(JacobianMatrix)) Matrix;
+ typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) Matrix;
typedef Dumux::OverlappingBCRSMatrix<Matrix> OverlappingMatrix;
typedef typename OverlappingMatrix::Overlap Overlap;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) Vector;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) Vector;
typedef Dumux::OverlappingBlockVector<typename Vector::block_type, Overlap> OverlappingVector;
typedef Dune::SeqILU0<OverlappingMatrix, OverlappingVector, OverlappingVector> SeqPreconditioner;
typedef PrecNoIterBackend<TypeTag, SeqPreconditioner> PrecBackend;
@@ -296,10 +296,10 @@ template <class TypeTag>
class BoxBiCGStabSORSolver : public BoxLinearSolver<TypeTag>
{
typedef BoxLinearSolver<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(JacobianMatrix)) Matrix;
+ typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) Matrix;
typedef Dumux::OverlappingBCRSMatrix<Matrix> OverlappingMatrix;
typedef typename OverlappingMatrix::Overlap Overlap;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) Vector;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) Vector;
typedef Dumux::OverlappingBlockVector<typename Vector::block_type, Overlap> OverlappingVector;
typedef Dune::SeqSOR<OverlappingMatrix, OverlappingVector, OverlappingVector> SeqPreconditioner;
typedef PrecIterBackend<TypeTag, SeqPreconditioner> PrecBackend;
@@ -327,10 +327,10 @@ template <class TypeTag>
class BoxBiCGStabSSORSolver : public BoxLinearSolver<TypeTag>
{
typedef BoxLinearSolver<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(JacobianMatrix)) Matrix;
+ typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) Matrix;
typedef Dumux::OverlappingBCRSMatrix<Matrix> OverlappingMatrix;
typedef typename OverlappingMatrix::Overlap Overlap;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) Vector;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) Vector;
typedef Dumux::OverlappingBlockVector<typename Vector::block_type, Overlap> OverlappingVector;
typedef Dune::SeqSSOR<OverlappingMatrix, OverlappingVector, OverlappingVector> SeqPreconditioner;
typedef PrecIterBackend<TypeTag, SeqPreconditioner> PrecBackend;
@@ -358,10 +358,10 @@ template <class TypeTag>
class BoxBiCGStabJacSolver : public BoxLinearSolver<TypeTag>
{
typedef BoxLinearSolver<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(JacobianMatrix)) Matrix;
+ typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) Matrix;
typedef Dumux::OverlappingBCRSMatrix<Matrix> OverlappingMatrix;
typedef typename OverlappingMatrix::Overlap Overlap;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) Vector;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) Vector;
typedef Dumux::OverlappingBlockVector<typename Vector::block_type, Overlap> OverlappingVector;
typedef Dune::SeqJac<OverlappingMatrix, OverlappingVector, OverlappingVector> SeqPreconditioner;
typedef PrecIterBackend<TypeTag, SeqPreconditioner> PrecBackend;
@@ -389,10 +389,10 @@ template <class TypeTag>
class BoxBiCGStabGSSolver : public BoxLinearSolver<TypeTag>
{
typedef BoxLinearSolver<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(JacobianMatrix)) Matrix;
+ typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) Matrix;
typedef Dumux::OverlappingBCRSMatrix<Matrix> OverlappingMatrix;
typedef typename OverlappingMatrix::Overlap Overlap;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) Vector;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) Vector;
typedef Dumux::OverlappingBlockVector<typename Vector::block_type, Overlap> OverlappingVector;
typedef Dune::SeqGS<OverlappingMatrix, OverlappingVector, OverlappingVector> SeqPreconditioner;
typedef PrecIterBackend<TypeTag, SeqPreconditioner> PrecBackend;
@@ -420,10 +420,10 @@ template <class TypeTag>
class BoxCGILU0Solver : public BoxLinearSolver<TypeTag>
{
typedef BoxLinearSolver<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(JacobianMatrix)) Matrix;
+ typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) Matrix;
typedef Dumux::OverlappingBCRSMatrix<Matrix> OverlappingMatrix;
typedef typename OverlappingMatrix::Overlap Overlap;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) Vector;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) Vector;
typedef Dumux::OverlappingBlockVector<typename Vector::block_type, Overlap> OverlappingVector;
typedef Dune::SeqILU0<OverlappingMatrix, OverlappingVector, OverlappingVector> SeqPreconditioner;
typedef PrecNoIterBackend<TypeTag, SeqPreconditioner> PrecBackend;
@@ -451,10 +451,10 @@ template <class TypeTag>
class BoxCGSORSolver : public BoxLinearSolver<TypeTag>
{
typedef BoxLinearSolver<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(JacobianMatrix)) Matrix;
+ typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) Matrix;
typedef Dumux::OverlappingBCRSMatrix<Matrix> OverlappingMatrix;
typedef typename OverlappingMatrix::Overlap Overlap;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) Vector;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) Vector;
typedef Dumux::OverlappingBlockVector<typename Vector::block_type, Overlap> OverlappingVector;
typedef Dune::SeqSOR<OverlappingMatrix, OverlappingVector, OverlappingVector> SeqPreconditioner;
typedef PrecIterBackend<TypeTag, SeqPreconditioner> PrecBackend;
@@ -482,10 +482,10 @@ template <class TypeTag>
class BoxCGSSORSolver : public BoxLinearSolver<TypeTag>
{
typedef BoxLinearSolver<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(JacobianMatrix)) Matrix;
+ typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) Matrix;
typedef Dumux::OverlappingBCRSMatrix<Matrix> OverlappingMatrix;
typedef typename OverlappingMatrix::Overlap Overlap;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) Vector;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) Vector;
typedef Dumux::OverlappingBlockVector<typename Vector::block_type, Overlap> OverlappingVector;
typedef Dune::SeqSSOR<OverlappingMatrix, OverlappingVector, OverlappingVector> SeqPreconditioner;
typedef PrecIterBackend<TypeTag, SeqPreconditioner> PrecBackend;
@@ -513,10 +513,10 @@ template <class TypeTag>
class BoxCGJacSolver : public BoxLinearSolver<TypeTag>
{
typedef BoxLinearSolver<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(JacobianMatrix)) Matrix;
+ typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) Matrix;
typedef Dumux::OverlappingBCRSMatrix<Matrix> OverlappingMatrix;
typedef typename OverlappingMatrix::Overlap Overlap;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) Vector;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) Vector;
typedef Dumux::OverlappingBlockVector<typename Vector::block_type, Overlap> OverlappingVector;
typedef Dune::SeqJac<OverlappingMatrix, OverlappingVector, OverlappingVector> SeqPreconditioner;
typedef PrecIterBackend<TypeTag, SeqPreconditioner> PrecBackend;
@@ -544,10 +544,10 @@ template <class TypeTag>
class BoxCGGSSolver : public BoxLinearSolver<TypeTag>
{
typedef BoxLinearSolver<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(JacobianMatrix)) Matrix;
+ typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) Matrix;
typedef Dumux::OverlappingBCRSMatrix<Matrix> OverlappingMatrix;
typedef typename OverlappingMatrix::Overlap Overlap;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) Vector;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) Vector;
typedef Dumux::OverlappingBlockVector<typename Vector::block_type, Overlap> OverlappingVector;
typedef Dune::SeqGS<OverlappingMatrix, OverlappingVector, OverlappingVector> SeqPreconditioner;
typedef PrecIterBackend<TypeTag, SeqPreconditioner> PrecBackend;
diff --git a/dumux/linear/impetbicgstabilu0solver.hh b/dumux/linear/impetbicgstabilu0solver.hh
index 874c4df43f..3cc5d33a8a 100644
--- a/dumux/linear/impetbicgstabilu0solver.hh
+++ b/dumux/linear/impetbicgstabilu0solver.hh
@@ -64,12 +64,12 @@ NEW_PROP_TAG(PreconditionerRelaxation);
template <class TypeTag>
class IMPETBiCGStabILU0Solver
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureCoefficientMatrix)) Matrix;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PressureRHSVector)) Vector;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, PressureCoefficientMatrix) Matrix;
+ typedef typename GET_PROP_TYPE(TypeTag, PressureRHSVector) Vector;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::ElementMapper ElementMapper;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef Dumux::OverlappingBCRSMatrix<Matrix> OverlappingMatrix;
typedef typename OverlappingMatrix::Overlap Overlap;
diff --git a/dumux/linear/seqsolverbackend.hh b/dumux/linear/seqsolverbackend.hh
index 74e3367cf5..87514c1db2 100644
--- a/dumux/linear/seqsolverbackend.hh
+++ b/dumux/linear/seqsolverbackend.hh
@@ -114,7 +114,7 @@ private:
template <class TypeTag>
class ILUnBiCGSTABBackend: public IterativePrecondSolverBackend<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef IterativePrecondSolverBackend<TypeTag> ParentType;
public:
@@ -138,7 +138,7 @@ public:
template <class TypeTag>
class SORBiCGSTABBackend: public IterativePrecondSolverBackend<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef IterativePrecondSolverBackend<TypeTag> ParentType;
public:
@@ -162,7 +162,7 @@ public:
template <class TypeTag>
class SSORBiCGSTABBackend: public IterativePrecondSolverBackend<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef IterativePrecondSolverBackend<TypeTag> ParentType;
public:
@@ -186,7 +186,7 @@ public:
template <class TypeTag>
class GSBiCGSTABBackend: public IterativePrecondSolverBackend<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef IterativePrecondSolverBackend<TypeTag> ParentType;
public:
@@ -210,7 +210,7 @@ public:
template <class TypeTag>
class JacBiCGSTABBackend: public IterativePrecondSolverBackend<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef IterativePrecondSolverBackend<TypeTag> ParentType;
public:
@@ -234,7 +234,7 @@ public:
template <class TypeTag>
class ILUnCGBackend: public IterativePrecondSolverBackend<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef IterativePrecondSolverBackend<TypeTag> ParentType;
public:
@@ -258,7 +258,7 @@ public:
template <class TypeTag>
class SORCGBackend: public IterativePrecondSolverBackend<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef IterativePrecondSolverBackend<TypeTag> ParentType;
public:
@@ -282,7 +282,7 @@ public:
template <class TypeTag>
class SSORCGBackend: public IterativePrecondSolverBackend<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef IterativePrecondSolverBackend<TypeTag> ParentType;
public:
@@ -306,7 +306,7 @@ public:
template <class TypeTag>
class GSCGBackend: public IterativePrecondSolverBackend<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef IterativePrecondSolverBackend<TypeTag> ParentType;
public:
@@ -330,7 +330,7 @@ public:
template <class TypeTag>
class JacCGBackend: public IterativePrecondSolverBackend<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef IterativePrecondSolverBackend<TypeTag> ParentType;
public:
@@ -354,7 +354,7 @@ public:
template <class TypeTag>
class SSORRestartedGMResBackend: public IterativePrecondSolverBackend<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef IterativePrecondSolverBackend<TypeTag> ParentType;
public:
@@ -448,7 +448,7 @@ private:
template <class TypeTag>
class ILU0BiCGSTABBackend : public ILU0SolverBackend<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef ILU0SolverBackend<TypeTag> ParentType;
public:
@@ -472,7 +472,7 @@ class ILU0BiCGSTABBackend : public ILU0SolverBackend<TypeTag>
template <class TypeTag>
class ILU0CGBackend : public ILU0SolverBackend<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef ILU0SolverBackend<TypeTag> ParentType;
public:
@@ -496,7 +496,7 @@ public:
template <class TypeTag>
class ILU0RestartedGMResBackend : public ILU0SolverBackend<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef ILU0SolverBackend<TypeTag> ParentType;
public:
@@ -518,7 +518,7 @@ public:
template <class TypeTag>
class SuperLUBackend
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
public:
@@ -531,8 +531,8 @@ public:
{
Vector bTmp(b);
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- enum {blockSize = GET_PROP_VALUE(TypeTag, PTAG(LinearSolverBlockSize))};
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ enum {blockSize = GET_PROP_VALUE(TypeTag, LinearSolverBlockSize)};
typedef typename Dune::FieldMatrix<Scalar, blockSize, blockSize> MatrixBlock;
typedef typename Dune::BCRSMatrix<MatrixBlock> ISTLMatrix;
diff --git a/dumux/material/fluidsystems/1pfluidsystem.hh b/dumux/material/fluidsystems/1pfluidsystem.hh
index c09c8b21fa..ecdf9ef31d 100644
--- a/dumux/material/fluidsystems/1pfluidsystem.hh
+++ b/dumux/material/fluidsystems/1pfluidsystem.hh
@@ -409,8 +409,8 @@ NEW_PROP_TAG(Fluid);
*/
template<class TypeTag>
class OnePFluidSystem
-: public FluidSystems::OneP<typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)),
- typename GET_PROP_TYPE(TypeTag, PTAG(Fluid))>
+: public FluidSystems::OneP<typename GET_PROP_TYPE(TypeTag, Scalar),
+ typename GET_PROP_TYPE(TypeTag, Fluid)>
{};
#endif
} // end namepace
diff --git a/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh b/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh
index 8fbb9f2f7d..ec0f80b09d 100644
--- a/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh
+++ b/dumux/material/fluidsystems/2pimmisciblefluidsystem.hh
@@ -430,9 +430,9 @@ NEW_PROP_TAG(NonwettingPhase);
*/
template<class TypeTag>
class TwoPImmiscibleFluidSystem
-: public FluidSystems::TwoPImmiscible<typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)),
- typename GET_PROP_TYPE(TypeTag, PTAG(WettingPhase)),
- typename GET_PROP_TYPE(TypeTag, PTAG(NonwettingPhase))>
+: public FluidSystems::TwoPImmiscible<typename GET_PROP_TYPE(TypeTag, Scalar),
+ typename GET_PROP_TYPE(TypeTag, WettingPhase),
+ typename GET_PROP_TYPE(TypeTag, NonwettingPhase)>
{};
#endif
diff --git a/dumux/material/fluidsystems/defaultcomponents.hh b/dumux/material/fluidsystems/defaultcomponents.hh
index 9dd25a97c1..c5a2cb6f4e 100644
--- a/dumux/material/fluidsystems/defaultcomponents.hh
+++ b/dumux/material/fluidsystems/defaultcomponents.hh
@@ -63,7 +63,7 @@ NEW_PROP_TAG(Scalar);
SET_PROP(NumericModel, DefaultComponents)
{ private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dumux::H2O<Scalar> H2O_IAPWS;
public:
@@ -88,7 +88,7 @@ public:
};
SET_PROP(NumericModel, Components)
- : public GET_PROP(TypeTag, PTAG(DefaultComponents))
+ : public GET_PROP(TypeTag, DefaultComponents)
{};
//! Enables detailed description of fluidsystems
diff --git a/dumux/material/fluidsystems/h2on2fluidsystem.hh b/dumux/material/fluidsystems/h2on2fluidsystem.hh
index b39bb66a2c..afc0db8b21 100644
--- a/dumux/material/fluidsystems/h2on2fluidsystem.hh
+++ b/dumux/material/fluidsystems/h2on2fluidsystem.hh
@@ -719,8 +719,8 @@ public:
*/
template<class TypeTag>
class H2ON2FluidSystem
-: public FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)),
- GET_PROP_VALUE(TypeTag, PTAG(EnableComplicatedFluidSystem))>
+: public FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar),
+ GET_PROP_VALUE(TypeTag, EnableComplicatedFluidSystem)>
{};
#endif
diff --git a/dumux/material/old_fluidsystems/2p_system.hh b/dumux/material/old_fluidsystems/2p_system.hh
index 917f1f4462..8733f65465 100644
--- a/dumux/material/old_fluidsystems/2p_system.hh
+++ b/dumux/material/old_fluidsystems/2p_system.hh
@@ -58,9 +58,9 @@ template <class TypeTag>
class FluidSystem2P
{
typedef FluidSystem2P<TypeTag> ThisType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(WettingPhase)) WettingPhase;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(NonwettingPhase)) NonwettingPhase;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, WettingPhase) WettingPhase;
+ typedef typename GET_PROP_TYPE(TypeTag, NonwettingPhase) NonwettingPhase;
public:
diff --git a/dumux/material/old_fluidsystems/h2o_n2_system.hh b/dumux/material/old_fluidsystems/h2o_n2_system.hh
index 2a48c13fb5..7831ae45da 100644
--- a/dumux/material/old_fluidsystems/h2o_n2_system.hh
+++ b/dumux/material/old_fluidsystems/h2o_n2_system.hh
@@ -56,12 +56,12 @@ template <class TypeTag>
class H2O_N2_System
{
typedef H2O_N2_System<TypeTag> ThisType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dumux::IdealGas<Scalar> IdealGas;
typedef Dumux::SettablePhase<Scalar, ThisType> SettablePhase;
- typedef typename GET_PROP(TypeTag, PTAG(Components)) Components;
+ typedef typename GET_PROP(TypeTag, Components) Components;
public:
typedef typename Components::H2O H2O;
@@ -79,7 +79,7 @@ public:
static const int H2OIdx = 0;
static const int N2Idx = 1;
- static const bool complicatedFluidSystem_ = GET_PROP_VALUE(TypeTag, PTAG(EnableComplicatedFluidSystem));
+ static const bool complicatedFluidSystem_ = GET_PROP_VALUE(TypeTag, EnableComplicatedFluidSystem);
static void init()
{
diff --git a/dumux/material/spatialparameters/boxspatialparameters.hh b/dumux/material/spatialparameters/boxspatialparameters.hh
index ad3da63c34..676112b170 100644
--- a/dumux/material/spatialparameters/boxspatialparameters.hh
+++ b/dumux/material/spatialparameters/boxspatialparameters.hh
@@ -49,18 +49,18 @@ NEW_PROP_TAG(SpatialParameters);
template<class TypeTag>
class BoxSpatialParameters: public BoxSpatialParametersOneP<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLawParams)) MaterialLawParams;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
enum {
dimWorld = GridView::dimensionworld
};
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::ctype CoordScalar;
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
diff --git a/dumux/material/spatialparameters/boxspatialparameters1p.hh b/dumux/material/spatialparameters/boxspatialparameters1p.hh
index 2f2c2d0522..301e2e6ea3 100644
--- a/dumux/material/spatialparameters/boxspatialparameters1p.hh
+++ b/dumux/material/spatialparameters/boxspatialparameters1p.hh
@@ -54,16 +54,16 @@ NEW_PROP_TAG(SpatialParameters);
template<class TypeTag>
class BoxSpatialParametersOneP
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) Implementation;
enum {
dimWorld = GridView::dimensionworld
};
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::ctype CoordScalar;
typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> Tensor;
diff --git a/dumux/material/spatialparameters/fvspatialparameters.hh b/dumux/material/spatialparameters/fvspatialparameters.hh
index ab4a537c0f..0baff8cb25 100644
--- a/dumux/material/spatialparameters/fvspatialparameters.hh
+++ b/dumux/material/spatialparameters/fvspatialparameters.hh
@@ -45,9 +45,9 @@ namespace Dumux
template<class TypeTag>
class FVSpatialParameters: public FVSpatialParametersOneP<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) Implementation;
enum
{
@@ -56,7 +56,7 @@ class FVSpatialParameters: public FVSpatialParametersOneP<TypeTag>
typedef typename GridView::template Codim<0>::Entity Element;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw))::Params MaterialLawParams;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params MaterialLawParams;
public:
FVSpatialParameters(const GridView &gv)
diff --git a/dumux/material/spatialparameters/fvspatialparameters1p.hh b/dumux/material/spatialparameters/fvspatialparameters1p.hh
index 1a2d7afd1d..defaf0b896 100644
--- a/dumux/material/spatialparameters/fvspatialparameters1p.hh
+++ b/dumux/material/spatialparameters/fvspatialparameters1p.hh
@@ -56,9 +56,9 @@ NEW_PROP_TAG( SpatialParameters);
template<class TypeTag>
class FVSpatialParametersOneP
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, SpatialParameters) Implementation;
enum
{
diff --git a/dumux/nonlinear/newtoncontroller.hh b/dumux/nonlinear/newtoncontroller.hh
index f69503409b..58802429dd 100644
--- a/dumux/nonlinear/newtoncontroller.hh
+++ b/dumux/nonlinear/newtoncontroller.hh
@@ -138,23 +138,23 @@ SET_INT_PROP(NewtonMethod, NewtonMaxSteps, 18);
template <class TypeTag>
class NewtonController
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(NewtonController)) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, NewtonController) Implementation;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Model)) Model;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(NewtonMethod)) NewtonMethod;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(JacobianMatrix)) JacobianMatrix;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VertexMapper)) VertexMapper;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
+ typedef typename GET_PROP_TYPE(TypeTag, NewtonMethod) NewtonMethod;
+ typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) JacobianMatrix;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, VertexMapper) VertexMapper;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef NewtonConvergenceWriter<TypeTag> ConvergenceWriter;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(LinearSolver)) LinearSolver;
+ typedef typename GET_PROP_TYPE(TypeTag, LinearSolver) LinearSolver;
public:
/*!
diff --git a/dumux/nonlinear/newtonconvergencewriter.hh b/dumux/nonlinear/newtonconvergencewriter.hh
index 5fa4c7fabf..9e3ef11040 100644
--- a/dumux/nonlinear/newtonconvergencewriter.hh
+++ b/dumux/nonlinear/newtonconvergencewriter.hh
@@ -38,11 +38,11 @@ namespace Dumux
template <class TypeTag>
struct NewtonConvergenceWriter
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(NewtonController)) NewtonController;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, NewtonController) NewtonController;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(JacobianMatrix)) JacobianMatrix;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
+ typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) JacobianMatrix;
typedef Dumux::VtkMultiWriter<GridView> VtkMultiWriter;
diff --git a/dumux/nonlinear/newtonmethod.hh b/dumux/nonlinear/newtonmethod.hh
index 5cbb371d67..778e168d40 100644
--- a/dumux/nonlinear/newtonmethod.hh
+++ b/dumux/nonlinear/newtonmethod.hh
@@ -62,13 +62,13 @@ NEW_PROP_TAG(JacobianAssembler);
template <class TypeTag>
class NewtonMethod
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Model)) Model;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(NewtonController)) NewtonController;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
+ typedef typename GET_PROP_TYPE(TypeTag, NewtonController) NewtonController;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(JacobianAssembler)) JacobianAssembler;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
+ typedef typename GET_PROP_TYPE(TypeTag, JacobianAssembler) JacobianAssembler;
public:
NewtonMethod(Problem &problem)
: problem_(problem)
diff --git a/test/boxmodels/1p/1ptestproblem.hh b/test/boxmodels/1p/1ptestproblem.hh
index 1212ab84e0..b3ed88b532 100644
--- a/test/boxmodels/1p/1ptestproblem.hh
+++ b/test/boxmodels/1p/1ptestproblem.hh
@@ -56,7 +56,7 @@ NEW_TYPE_TAG(OnePTestProblem, INHERITS_FROM(BoxOneP));
SET_PROP(OnePTestProblem, Fluid)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
};
@@ -111,11 +111,11 @@ class OnePTestProblem : public OnePBoxProblem<TypeTag>
typedef OnePTestProblem<TypeTag> ThisType;
typedef OnePBoxProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
// copy some indices for convenience
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(OnePIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, OnePIndices) Indices;
enum {
// Grid and world dimension
dim = GridView::dimension,
@@ -126,15 +126,15 @@ class OnePTestProblem : public OnePBoxProblem<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 GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef Dune::FieldVector<Scalar, dim> LocalPosition;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
diff --git a/test/boxmodels/1p/1ptestspatialparameters.hh b/test/boxmodels/1p/1ptestspatialparameters.hh
index ebe54ca0bd..819498755b 100644
--- a/test/boxmodels/1p/1ptestspatialparameters.hh
+++ b/test/boxmodels/1p/1ptestspatialparameters.hh
@@ -45,9 +45,9 @@ class OnePTestSpatialParameters : public BoxSpatialParametersOneP<TypeTag>
{
typedef BoxSpatialParametersOneP<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::template Codim<0>::Entity Element;
diff --git a/test/boxmodels/1p2c/interstitialfluidtrailfluidsystem.hh b/test/boxmodels/1p2c/interstitialfluidtrailfluidsystem.hh
index f7415e855f..11afa681cb 100644
--- a/test/boxmodels/1p2c/interstitialfluidtrailfluidsystem.hh
+++ b/test/boxmodels/1p2c/interstitialfluidtrailfluidsystem.hh
@@ -375,7 +375,7 @@ public:
*/
template<class TypeTag>
class InterstitialFluidTrailFluidSystem
-: public FluidSystems::InterstitialFluidTrail<typename GET_PROP_TYPE(TypeTag, PTAG(Scalar))>
+: public FluidSystems::InterstitialFluidTrail<typename GET_PROP_TYPE(TypeTag, Scalar)>
{};
#endif
} // end namepace
diff --git a/test/boxmodels/1p2c/tissue_tumor_problem.hh b/test/boxmodels/1p2c/tissue_tumor_problem.hh
index 69a405d72a..3f99531376 100644
--- a/test/boxmodels/1p2c/tissue_tumor_problem.hh
+++ b/test/boxmodels/1p2c/tissue_tumor_problem.hh
@@ -71,7 +71,7 @@ SET_PROP(TissueTumorProblem, Problem)
// Set fluid configuration
SET_PROP(TissueTumorProblem, FluidSystem)
{ private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::FluidSystems::InterstitialFluidTrail<Scalar> type;
};
@@ -126,15 +126,15 @@ class TissueTumorProblem : public OnePTwoCBoxProblem<TypeTag>
typedef TissueTumorProblem<TypeTag> ThisType;
typedef OnePTwoCBoxProblem<TypeTag> ParentType;
- 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(FVElementGeometry)) FVElementGeometry;
- 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, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
// copy some indices for convenience
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(OnePTwoCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, OnePTwoCIndices) Indices;
enum {
// Grid and world dimension
dim = GridView::dimension,
diff --git a/test/boxmodels/1p2c/tissue_tumor_spatialparameters.hh b/test/boxmodels/1p2c/tissue_tumor_spatialparameters.hh
index b178b88847..ce3ac02ced 100644
--- a/test/boxmodels/1p2c/tissue_tumor_spatialparameters.hh
+++ b/test/boxmodels/1p2c/tissue_tumor_spatialparameters.hh
@@ -48,9 +48,9 @@ template<class TypeTag>
class TissueTumorSpatialParameters : public BoxSpatialParametersOneP<TypeTag>
{
typedef BoxSpatialParametersOneP<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,
@@ -62,13 +62,13 @@ class TissueTumorSpatialParameters : public BoxSpatialParametersOneP<TypeTag>
typedef Dune::FieldVector<CoordScalar,dimWorld> Vector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) SolutionVector;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
+ 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, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::template Codim<0>::Entity Element;
typedef RegularizedBrooksCorey<Scalar> EffMaterialLaw;
diff --git a/test/boxmodels/2p/lensproblem.hh b/test/boxmodels/2p/lensproblem.hh
index 10db15f0cc..8131dcd0a9 100644
--- a/test/boxmodels/2p/lensproblem.hh
+++ b/test/boxmodels/2p/lensproblem.hh
@@ -74,7 +74,7 @@ SET_TYPE_PROP(LensProblem, Problem, Dumux::LensProblem<TypeTag>);
SET_PROP(LensProblem, WettingPhase)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
};
@@ -83,7 +83,7 @@ public:
SET_PROP(LensProblem, NonwettingPhase)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleDNAPL<Scalar> > type;
};
@@ -154,16 +154,16 @@ class LensProblem : public TwoPProblem<TypeTag>
{
typedef LensProblem<TypeTag> ThisType;
typedef TwoPProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(WettingPhase)) WettingPhase;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(NonwettingPhase)) NonwettingPhase;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, WettingPhase) WettingPhase;
+ typedef typename GET_PROP_TYPE(TypeTag, NonwettingPhase) NonwettingPhase;
enum {
- numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)),
+ numEq = GET_PROP_VALUE(TypeTag, NumEq),
// primary variable indices
pressureIdx = Indices::pressureIdx,
@@ -186,18 +186,18 @@ class LensProblem : public TwoPProblem<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 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 Dune::FieldVector<Scalar, dim> LocalPosition;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
@@ -301,7 +301,7 @@ public:
void dirichletAtPos(PrimaryVariables &values,
const GlobalPosition &globalPos) const
{
- typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) fluidState;
+ typename GET_PROP_TYPE(TypeTag, FluidState) fluidState;
fluidState.setTemperature(temperature_);
fluidState.setPressure(FluidSystem::wPhaseIdx, /*pressure=*/1e5);
fluidState.setPressure(FluidSystem::nPhaseIdx, /*pressure=*/1e5);
@@ -370,7 +370,7 @@ public:
{
Scalar depth = this->bboxMax()[1] - globalPos[1];
- typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) fluidState;
+ typename GET_PROP_TYPE(TypeTag, FluidState) fluidState;
fluidState.setTemperature(temperature_);
fluidState.setPressure(FluidSystem::wPhaseIdx, /*pressure=*/1e5);
fluidState.setPressure(FluidSystem::nPhaseIdx, /*pressure=*/1e5);
diff --git a/test/boxmodels/2p/lensspatialparameters.hh b/test/boxmodels/2p/lensspatialparameters.hh
index ab6a72e15f..79f5eca9ba 100644
--- a/test/boxmodels/2p/lensspatialparameters.hh
+++ b/test/boxmodels/2p/lensspatialparameters.hh
@@ -59,7 +59,7 @@ SET_PROP(LensSpatialParameters, MaterialLaw)
private:
// define the material law which is parameterized by effective
// saturations
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef RegularizedVanGenuchten<Scalar> EffectiveLaw;
public:
// define the material law parameterized by absolute saturations
@@ -76,12 +76,12 @@ template<class TypeTag>
class LensSpatialParameters : public BoxSpatialParameters<TypeTag>
{
typedef BoxSpatialParameters<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;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
enum {
dim=GridView::dimension,
@@ -94,11 +94,11 @@ class LensSpatialParameters : public BoxSpatialParameters<TypeTag>
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
public:
//get the material law from the property system
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw)) MaterialLaw;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename MaterialLaw::Params MaterialLawParams;
LensSpatialParameters(const GridView& gridView)
diff --git a/test/boxmodels/2p/test_2p.cc b/test/boxmodels/2p/test_2p.cc
index 44c8d3cdaf..49b19114b6 100644
--- a/test/boxmodels/2p/test_2p.cc
+++ b/test/boxmodels/2p/test_2p.cc
@@ -153,10 +153,10 @@ int main(int argc, char** argv)
try {
#endif
typedef TTAG(LensProblem) TypeTag;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef GET_PROP_TYPE(TypeTag, Grid) Grid;
+ typedef GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef Dune::FieldVector<Scalar, Grid::dimensionworld> GlobalPosition;
static const int dim = Grid::dimension;
diff --git a/test/boxmodels/2p2c/injectionproblem.hh b/test/boxmodels/2p2c/injectionproblem.hh
index a712447bde..46626f5381 100644
--- a/test/boxmodels/2p2c/injectionproblem.hh
+++ b/test/boxmodels/2p2c/injectionproblem.hh
@@ -61,7 +61,7 @@ SET_PROP(InjectionProblem, Problem)
// Set fluid configuration
SET_PROP(InjectionProblem, FluidSystem)
{ private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
static const bool useComplexRelations = false;
public:
typedef Dumux::FluidSystems::H2ON2<Scalar, useComplexRelations> type;
@@ -99,9 +99,9 @@ class InjectionProblem : public TwoPTwoCProblem<TypeTag>
typedef InjectionProblem<TypeTag> ThisType;
typedef TwoPTwoCProblem<TypeTag> ParentType;
- 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(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
enum {
// Grid and world dimension
@@ -110,7 +110,7 @@ class InjectionProblem : public TwoPTwoCProblem<TypeTag>
};
// copy some indices for convenience
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
enum {
lPhaseIdx = Indices::lPhaseIdx,
gPhaseIdx = Indices::gPhaseIdx,
@@ -127,15 +127,15 @@ class InjectionProblem : public TwoPTwoCProblem<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 GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
diff --git a/test/boxmodels/2p2c/injectionspatialparameters.hh b/test/boxmodels/2p2c/injectionspatialparameters.hh
index 6eaf923812..bb1a73d101 100644
--- a/test/boxmodels/2p2c/injectionspatialparameters.hh
+++ b/test/boxmodels/2p2c/injectionspatialparameters.hh
@@ -56,7 +56,7 @@ SET_PROP(InjectionSpatialParameters, MaterialLaw)
private:
// define the material law which is parameterized by effective
// saturations
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef RegularizedBrooksCorey<Scalar> EffMaterialLaw;
public:
// define the material law parameterized by absolute saturations
@@ -74,11 +74,11 @@ template<class TypeTag>
class InjectionSpatialParameters : public BoxSpatialParameters<TypeTag>
{
typedef BoxSpatialParameters<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;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
enum {
dim=GridView::dimension,
@@ -93,17 +93,17 @@ class InjectionSpatialParameters : public BoxSpatialParameters<TypeTag>
typedef Dune::FieldVector<CoordScalar,dimWorld> Vector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) SolutionVector;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
+ 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, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::template Codim<0>::Entity Element;
public:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw)) MaterialLaw;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename MaterialLaw::Params MaterialLawParams;
/*!
diff --git a/test/boxmodels/2p2cni/waterairproblem.hh b/test/boxmodels/2p2cni/waterairproblem.hh
index 2aaf97a91c..cda85c1b20 100644
--- a/test/boxmodels/2p2cni/waterairproblem.hh
+++ b/test/boxmodels/2p2cni/waterairproblem.hh
@@ -63,7 +63,7 @@ SET_PROP(WaterAirProblem, Problem)
};
// Set the wetting phase
-SET_TYPE_PROP(WaterAirProblem, FluidSystem, Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)), false>);
+SET_TYPE_PROP(WaterAirProblem, FluidSystem, Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
// Enable gravity
SET_BOOL_PROP(WaterAirProblem, EnableGravity, true);
@@ -112,18 +112,18 @@ SET_BOOL_PROP(WaterAirProblem, NewtonWriteConvergence, false);
template <class TypeTag >
class WaterAirProblem : public TwoPTwoCNIProblem<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Model)) Model;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
typedef typename GridView::Grid Grid;
typedef WaterAirProblem<TypeTag> ThisType;
typedef TwoPTwoCNIProblem<TypeTag> ParentType;
// copy some indices for convenience
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
enum {
- numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)),
+ numEq = GET_PROP_VALUE(TypeTag, NumEq),
pressureIdx = Indices::pressureIdx,
switchIdx = Indices::switchIdx,
@@ -143,16 +143,16 @@ class WaterAirProblem : public TwoPTwoCNIProblem<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 GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef Dune::FieldVector<Scalar, dim> LocalPosition;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
diff --git a/test/boxmodels/2p2cni/waterairspatialparameters.hh b/test/boxmodels/2p2cni/waterairspatialparameters.hh
index 14a8b6a89e..4224f2f034 100644
--- a/test/boxmodels/2p2cni/waterairspatialparameters.hh
+++ b/test/boxmodels/2p2cni/waterairspatialparameters.hh
@@ -54,7 +54,7 @@ SET_PROP(WaterAirSpatialParameters, MaterialLaw)
private:
// define the material law which is parameterized by effective
// saturations
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef RegularizedBrooksCorey<Scalar> EffMaterialLaw;
public:
// define the material law parameterized by absolute saturations
@@ -72,16 +72,16 @@ class WaterAirSpatialParameters : public BoxSpatialParameters<TypeTag>
{
typedef BoxSpatialParameters<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,
dimWorld=GridView::dimensionworld
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
enum {
lPhaseIdx = Indices::lPhaseIdx,
gPhaseIdx = Indices::gPhaseIdx
@@ -92,19 +92,19 @@ class WaterAirSpatialParameters : public BoxSpatialParameters<TypeTag>
typedef Dune::FieldVector<CoordScalar,dimWorld> Vector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SolutionVector)) SolutionVector;
+ typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(VolumeVariables)) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
+ 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, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
public:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw)) MaterialLaw;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename MaterialLaw::Params MaterialLawParams;
/*!
diff --git a/test/boxmodels/2pni/injectionproblem2pni.hh b/test/boxmodels/2pni/injectionproblem2pni.hh
index cf147375af..cc3fb3b217 100644
--- a/test/boxmodels/2pni/injectionproblem2pni.hh
+++ b/test/boxmodels/2pni/injectionproblem2pni.hh
@@ -77,13 +77,13 @@ SET_PROP(InjectionProblem2PNI, Problem)
#if 1
// Use the same fluid system as the 2p2c injection problem
-SET_TYPE_PROP(InjectionProblem2PNI, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)), false>);
+SET_TYPE_PROP(InjectionProblem2PNI, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
#else
// Set the wetting phase
SET_PROP(InjectionProblem2PNI, WettingPhase)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
};
@@ -92,7 +92,7 @@ public:
SET_PROP(InjectionProblem2PNI, NonwettingPhase)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::GasPhase<Scalar, Dumux::N2<Scalar> > type;
};
@@ -146,16 +146,16 @@ class InjectionProblem2PNI
{
typedef InjectionProblem2PNI<TypeTag> ThisType;
typedef TwoPNIProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
#if ISOTHERMAL
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
#else
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPNIIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPNIIndices) Indices;
#endif
enum {
- numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)),
+ numEq = GET_PROP_VALUE(TypeTag, NumEq),
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
@@ -173,16 +173,16 @@ class InjectionProblem2PNI
};
- 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 GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef Dune::FieldVector<Scalar, dim> LocalPosition;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
diff --git a/test/boxmodels/MpNc/obstacleproblem.hh b/test/boxmodels/MpNc/obstacleproblem.hh
index 54b9d27f16..1a4968eb0d 100644
--- a/test/boxmodels/MpNc/obstacleproblem.hh
+++ b/test/boxmodels/MpNc/obstacleproblem.hh
@@ -67,7 +67,7 @@ SET_TYPE_PROP(ObstacleProblem,
// Set fluid configuration
SET_PROP(ObstacleProblem, FluidSystem)
{ private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::FluidSystems::H2ON2<Scalar, /*useComplexRelations=*/false> type;
};
@@ -131,22 +131,22 @@ class ObstacleProblem
typedef ObstacleProblem<TypeTag> ThisType;
typedef MPNCProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- 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(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw)) MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLawParams)) MaterialLawParams;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
enum {
// Grid and world dimension
dim = GridView::dimension,
dimWorld = GridView::dimensionworld,
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
- numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)),
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases),
+ numComponents = GET_PROP_VALUE(TypeTag, NumComponents),
gPhaseIdx = FluidSystem::gPhaseIdx,
lPhaseIdx = FluidSystem::lPhaseIdx,
@@ -159,15 +159,15 @@ class ObstacleProblem
typedef typename GridView::template Codim<dim>::Entity Vertex;
typedef typename GridView::Intersection Intersection;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef Dune::FieldVector<typename GridView::Grid::ctype, dimWorld> GlobalPosition;
typedef Dune::FieldVector<Scalar, numPhases> PhaseVector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
// copy some indices for convenience
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MPNCIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, MPNCIndices) Indices;
enum {
fug0Idx = Indices::fug0Idx,
S0Idx = Indices::S0Idx,
diff --git a/test/boxmodels/MpNc/obstaclespatialparameters.hh b/test/boxmodels/MpNc/obstaclespatialparameters.hh
index 0013266165..760b4bfdbf 100644
--- a/test/boxmodels/MpNc/obstaclespatialparameters.hh
+++ b/test/boxmodels/MpNc/obstaclespatialparameters.hh
@@ -52,13 +52,13 @@ SET_TYPE_PROP(ObstacleSpatialParameters, SpatialParameters, Dumux::ObstacleSpati
SET_PROP(ObstacleSpatialParameters, MaterialLaw)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
enum {
lPhaseIdx = FluidSystem::lPhaseIdx,
gPhaseIdx = FluidSystem::gPhaseIdx
};
// define the material law
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
// typedef RegularizedBrooksCorey<Scalar> EffMaterialLaw;
typedef RegularizedLinearMaterial<Scalar> EffMaterialLaw;
typedef EffToAbsLaw<EffMaterialLaw> TwoPMaterialLaw;
@@ -77,20 +77,20 @@ template<class TypeTag>
class ObstacleSpatialParameters : public BoxSpatialParameters<TypeTag>
{
typedef BoxSpatialParameters<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, PTAG(SolutionVector)) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ElementVolumeVariables)) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluxVariables)) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+ 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 GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
+ typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
typedef typename Grid::ctype CoordScalar;
enum {
dim=GridView::dimension,
dimWorld=GridView::dimensionworld,
- numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases))
+ numPhases = GET_PROP_VALUE(TypeTag, NumPhases)
};
enum {
@@ -103,7 +103,7 @@ class ObstacleSpatialParameters : public BoxSpatialParameters<TypeTag>
typedef Dune::FieldVector<Scalar,dimWorld> Vector;
public:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw)) MaterialLaw;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename MaterialLaw::Params MaterialLawParams;
ObstacleSpatialParameters(const GridView &gv)
diff --git a/test/boxmodels/richards/richardslensproblem.hh b/test/boxmodels/richards/richardslensproblem.hh
index cc8703cfe4..da3ccdd63a 100644
--- a/test/boxmodels/richards/richardslensproblem.hh
+++ b/test/boxmodels/richards/richardslensproblem.hh
@@ -69,7 +69,7 @@ SET_PROP(RichardsLensProblem, Problem)
SET_PROP(RichardsLensProblem, WettingPhase)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
};
@@ -126,15 +126,15 @@ class RichardsLensProblem : public RichardsBoxProblem<TypeTag>
typedef RichardsLensProblem<TypeTag> ThisType;
typedef RichardsBoxProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw)) MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(RichardsIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, RichardsIndices) Indices;
enum {
// copy some indices for convenience
pwIdx = Indices::pwIdx,
diff --git a/test/boxmodels/richards/richardslensspatialparameters.hh b/test/boxmodels/richards/richardslensspatialparameters.hh
index 6aec1d493c..60a76be407 100644
--- a/test/boxmodels/richards/richardslensspatialparameters.hh
+++ b/test/boxmodels/richards/richardslensspatialparameters.hh
@@ -56,7 +56,7 @@ SET_PROP(RichardsLensSpatialParameters, MaterialLaw)
private:
// define the material law which is parameterized by effective
// saturations
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef RegularizedVanGenuchten<Scalar> EffectiveLaw;
public:
// define the material law parameterized by absolute saturations
@@ -73,9 +73,9 @@ template<class TypeTag>
class RichardsLensSpatialParameters : public BoxSpatialParameters<TypeTag>
{
typedef BoxSpatialParameters<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 {
@@ -86,11 +86,11 @@ class RichardsLensSpatialParameters : public BoxSpatialParameters<TypeTag>
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
public:
//get the material law from the property system
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw)) MaterialLaw;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
//! The parameters of the material law to be used
typedef typename MaterialLaw::Params MaterialLawParams;
diff --git a/test/common/generalproblem/generallensproblem.hh b/test/common/generalproblem/generallensproblem.hh
index 422222afa2..1a3d65ea08 100644
--- a/test/common/generalproblem/generallensproblem.hh
+++ b/test/common/generalproblem/generallensproblem.hh
@@ -87,7 +87,7 @@ SET_PROP(GeneralLensProblem, Problem)
SET_PROP(GeneralLensProblem, WettingPhase)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
};
@@ -96,7 +96,7 @@ public:
SET_PROP(GeneralLensProblem, NonwettingPhase)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleDNAPL<Scalar> > type;
};
@@ -196,20 +196,20 @@ SET_SCALAR_PROP(DecoupledGeneralLensProblem, CFLFactor, 1.0);
* <tt>./test_2p 20000 250</tt>
*/
template <class TypeTag >
-class GeneralLensProblem : public GET_PROP_TYPE(TypeTag, PTAG(ProblemBaseClass))
+class GeneralLensProblem : public GET_PROP_TYPE(TypeTag, ProblemBaseClass)
{
typedef GeneralLensProblem<TypeTag> ThisType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(ProblemBaseClass)) ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, ProblemBaseClass) ParentType;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(WettingPhase)) WettingPhase;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(NonwettingPhase)) NonwettingPhase;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, WettingPhase) WettingPhase;
+ typedef typename GET_PROP_TYPE(TypeTag, NonwettingPhase) NonwettingPhase;
enum {
- numEq = GET_PROP_VALUE(TypeTag, PTAG(NumEq)),
+ numEq = GET_PROP_VALUE(TypeTag, NumEq),
// primary variable indices
pressureIdx = Indices::pressureIdx,
@@ -232,15 +232,15 @@ class GeneralLensProblem : public GET_PROP_TYPE(TypeTag, PTAG(ProblemBaseClass))
};
- 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 GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef Dune::FieldVector<Scalar, dim> LocalPosition;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
diff --git a/test/common/generalproblem/generallensspatialparameters.hh b/test/common/generalproblem/generallensspatialparameters.hh
index d02fafe02e..fd6ac853f3 100644
--- a/test/common/generalproblem/generallensspatialparameters.hh
+++ b/test/common/generalproblem/generallensspatialparameters.hh
@@ -57,7 +57,7 @@ SET_TYPE_PROP(GeneralLensSpatialParameters, SpatialParameters, Dumux::GeneralLen
SET_PROP(GeneralLensSpatialParameters, MaterialLaw)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef RegularizedVanGenuchten<Scalar> EffectiveLaw;
public:
typedef EffToAbsLaw<EffectiveLaw> type;
@@ -72,15 +72,15 @@ public:
* twophase box model or twophase decoupled model
*/
template<class TypeTag>
-class GeneralLensSpatialParameters : public GET_PROP_TYPE(TypeTag, PTAG(SpatialParamsBaseClass))
+class GeneralLensSpatialParameters : public GET_PROP_TYPE(TypeTag, SpatialParamsBaseClass)
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParamsBaseClass)) 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, SpatialParamsBaseClass) ParentType;
+ 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;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
enum {
dim=GridView::dimension,
@@ -97,7 +97,7 @@ class GeneralLensSpatialParameters : public GET_PROP_TYPE(TypeTag, PTAG(SpatialP
public:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw)) MaterialLaw;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename MaterialLaw::Params MaterialLawParams;
GeneralLensSpatialParameters(const GridView& gridView)
diff --git a/test/common/generalproblem/test_generalproblem_2p.cc b/test/common/generalproblem/test_generalproblem_2p.cc
index 2b01f0d9f3..6137b6cb4a 100644
--- a/test/common/generalproblem/test_generalproblem_2p.cc
+++ b/test/common/generalproblem/test_generalproblem_2p.cc
@@ -57,11 +57,11 @@ int main(int argc, char** argv)
typedef TTAG(BoxGeneralLensProblem) BoxTypeTag;
//TypeTag which chooses the decoupled model
typedef TTAG(DecoupledGeneralLensProblem) DecoupledTypeTag;
- typedef GET_PROP_TYPE(BoxTypeTag, PTAG(Scalar)) Scalar;
- typedef GET_PROP_TYPE(BoxTypeTag, PTAG(Grid)) Grid;
-// typedef GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef GET_PROP_TYPE(BoxTypeTag, PTAG(TimeManager)) BoxTimeManager;
- typedef GET_PROP_TYPE(DecoupledTypeTag, PTAG(TimeManager)) DecoupledTimeManager;
+ typedef GET_PROP_TYPE(BoxTypeTag, Scalar) Scalar;
+ typedef GET_PROP_TYPE(BoxTypeTag, Grid) Grid;
+// typedef GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef GET_PROP_TYPE(BoxTypeTag, TimeManager) BoxTimeManager;
+ typedef GET_PROP_TYPE(DecoupledTypeTag, TimeManager) DecoupledTimeManager;
typedef Dune::FieldVector<Scalar, Grid::dimensionworld> GlobalPosition;
static const int dim = Grid::dimension;
diff --git a/test/common/propertysystem/test_propertysystem.cc b/test/common/propertysystem/test_propertysystem.cc
index 0159a61824..21479415c3 100644
--- a/test/common/propertysystem/test_propertysystem.cc
+++ b/test/common/propertysystem/test_propertysystem.cc
@@ -99,7 +99,7 @@ SET_BOOL_PROP(Vehicle, AutomaticTransmission, false);
// (HummmerH1, TopSpeed) = (Pickup, TopSpeed)
///////////////////
-SET_INT_PROP(CompactCar, TopSpeed, GET_PROP_VALUE(TypeTag, PTAG(GasUsage)) * 30);
+SET_INT_PROP(CompactCar, TopSpeed, GET_PROP_VALUE(TypeTag, GasUsage) * 30);
SET_INT_PROP(CompactCar, NumSeats, 5);
SET_INT_PROP(CompactCar, GasUsage, 4);
@@ -118,7 +118,7 @@ SET_BOOL_PROP(Sedan, AutomaticTransmission, true);
SET_INT_PROP(Pickup, TopSpeed, 120);
SET_INT_PROP(Pickup, Payload, 5);
-SET_INT_PROP(HummerH1, TopSpeed, GET_PROP_VALUE(TTAG(Pickup), PTAG(TopSpeed)));
+SET_INT_PROP(HummerH1, TopSpeed, GET_PROP_VALUE(TTAG(Pickup), TopSpeed));
///////////////////
// Unmount the canon from the Hummer
@@ -137,48 +137,48 @@ int main()
std::cout << "---------- Values for CompactCar ----------\n";
- std::cout << "(CompactCar, TopSpeed) = " << GET_PROP_VALUE(TTAG(CompactCar), PTAG(TopSpeed)) << "\n";
- std::cout << "(CompactCar, NumSeats) = " << GET_PROP_VALUE(TTAG(CompactCar), PTAG(NumSeats)) << "\n";
- std::cout << "(CompactCar, GasUsage) = " << GET_PROP_VALUE(TTAG(CompactCar), PTAG(GasUsage)) << "\n";
- std::cout << "(CompactCar, AutomaticTransmission) = " << GET_PROP_VALUE(TTAG(CompactCar), PTAG(AutomaticTransmission)) << "\n";
+ std::cout << "(CompactCar, TopSpeed) = " << GET_PROP_VALUE(TTAG(CompactCar), TopSpeed) << "\n";
+ std::cout << "(CompactCar, NumSeats) = " << GET_PROP_VALUE(TTAG(CompactCar), NumSeats) << "\n";
+ std::cout << "(CompactCar, GasUsage) = " << GET_PROP_VALUE(TTAG(CompactCar), GasUsage) << "\n";
+ std::cout << "(CompactCar, AutomaticTransmission) = " << GET_PROP_VALUE(TTAG(CompactCar), AutomaticTransmission) << "\n";
std::cout << "---------- Values for Truck ----------\n";
- std::cout << "(Truck, TopSpeed) = " << GET_PROP_VALUE(TTAG(Truck), PTAG(TopSpeed)) << "\n";
- std::cout << "(Truck, NumSeats) = " << GET_PROP_VALUE(TTAG(Truck), PTAG(NumSeats)) << "\n";
- std::cout << "(Truck, GasUsage) = " << GET_PROP_VALUE(TTAG(Truck), PTAG(GasUsage)) << "\n";
- std::cout << "(Truck, Payload) = " << GET_PROP_VALUE(TTAG(Truck), PTAG(Payload)) << "\n";
- std::cout << "(Truck, AutomaticTransmission) = " << GET_PROP_VALUE(TTAG(Truck), PTAG(AutomaticTransmission)) << "\n";
+ std::cout << "(Truck, TopSpeed) = " << GET_PROP_VALUE(TTAG(Truck), TopSpeed) << "\n";
+ std::cout << "(Truck, NumSeats) = " << GET_PROP_VALUE(TTAG(Truck), NumSeats) << "\n";
+ std::cout << "(Truck, GasUsage) = " << GET_PROP_VALUE(TTAG(Truck), GasUsage) << "\n";
+ std::cout << "(Truck, Payload) = " << GET_PROP_VALUE(TTAG(Truck), Payload) << "\n";
+ std::cout << "(Truck, AutomaticTransmission) = " << GET_PROP_VALUE(TTAG(Truck), AutomaticTransmission) << "\n";
std::cout << "---------- Values for Tank ----------\n";
- std::cout << "(Tank, TopSpeed) = " << GET_PROP_VALUE(TTAG(Tank), PTAG(TopSpeed)) << "\n";
- std::cout << "(Tank, GasUsage) = " << GET_PROP_VALUE(TTAG(Tank), PTAG(GasUsage)) << "\n";
- std::cout << "(Tank, AutomaticTransmission) = " << GET_PROP_VALUE(TTAG(Tank), PTAG(AutomaticTransmission)) << "\n";
- std::cout << "(Tank, CanonCaliber) = " << GET_PROP_VALUE(TTAG(Tank), PTAG(CanonCaliber)) << "\n";
+ std::cout << "(Tank, TopSpeed) = " << GET_PROP_VALUE(TTAG(Tank), TopSpeed) << "\n";
+ std::cout << "(Tank, GasUsage) = " << GET_PROP_VALUE(TTAG(Tank), GasUsage) << "\n";
+ std::cout << "(Tank, AutomaticTransmission) = " << GET_PROP_VALUE(TTAG(Tank), AutomaticTransmission) << "\n";
+ std::cout << "(Tank, CanonCaliber) = " << GET_PROP_VALUE(TTAG(Tank), CanonCaliber) << "\n";
std::cout << "---------- Values for Sedan ----------\n";
- std::cout << "(Sedan, TopSpeed) = " << GET_PROP_VALUE(TTAG(Sedan), PTAG(TopSpeed)) << "\n";
- std::cout << "(Sedan, NumSeats) = " << GET_PROP_VALUE(TTAG(Sedan), PTAG(NumSeats)) << "\n";
- std::cout << "(Sedan, GasUsage) = " << GET_PROP_VALUE(TTAG(Sedan), PTAG(GasUsage)) << "\n";
- std::cout << "(Sedan, AutomaticTransmission) = " << GET_PROP_VALUE(TTAG(Sedan), PTAG(AutomaticTransmission)) << "\n";
+ std::cout << "(Sedan, TopSpeed) = " << GET_PROP_VALUE(TTAG(Sedan), TopSpeed) << "\n";
+ std::cout << "(Sedan, NumSeats) = " << GET_PROP_VALUE(TTAG(Sedan), NumSeats) << "\n";
+ std::cout << "(Sedan, GasUsage) = " << GET_PROP_VALUE(TTAG(Sedan), GasUsage) << "\n";
+ std::cout << "(Sedan, AutomaticTransmission) = " << GET_PROP_VALUE(TTAG(Sedan), AutomaticTransmission) << "\n";
std::cout << "---------- Values for Pickup ----------\n";
- std::cout << "(Pickup, TopSpeed) = " << GET_PROP_VALUE(TTAG(Pickup), PTAG(TopSpeed)) << "\n";
- std::cout << "(Pickup, NumSeats) = " << GET_PROP_VALUE(TTAG(Pickup), PTAG(NumSeats)) << "\n";
- std::cout << "(Pickup, GasUsage) = " << GET_PROP_VALUE(TTAG(Pickup), PTAG(GasUsage)) << "\n";
- std::cout << "(Pickup, Payload) = " << GET_PROP_VALUE(TTAG(Pickup), PTAG(Payload)) << "\n";
- std::cout << "(Pickup, AutomaticTransmission) = " << GET_PROP_VALUE(TTAG(Pickup), PTAG(AutomaticTransmission)) << "\n";
+ std::cout << "(Pickup, TopSpeed) = " << GET_PROP_VALUE(TTAG(Pickup), TopSpeed) << "\n";
+ std::cout << "(Pickup, NumSeats) = " << GET_PROP_VALUE(TTAG(Pickup), NumSeats) << "\n";
+ std::cout << "(Pickup, GasUsage) = " << GET_PROP_VALUE(TTAG(Pickup), GasUsage) << "\n";
+ std::cout << "(Pickup, Payload) = " << GET_PROP_VALUE(TTAG(Pickup), Payload) << "\n";
+ std::cout << "(Pickup, AutomaticTransmission) = " << GET_PROP_VALUE(TTAG(Pickup), AutomaticTransmission) << "\n";
std::cout << "---------- Values for HummerH1 ----------\n";
- std::cout << "(HummerH1, TopSpeed) = " << GET_PROP_VALUE(TTAG(HummerH1), PTAG(TopSpeed)) << "\n";
- std::cout << "(HummerH1, NumSeats) = " << GET_PROP_VALUE(TTAG(HummerH1), PTAG(NumSeats)) << "\n";
- std::cout << "(HummerH1, GasUsage) = " << GET_PROP_VALUE(TTAG(HummerH1), PTAG(GasUsage)) << "\n";
- std::cout << "(HummerH1, Payload) = " << GET_PROP_VALUE(TTAG(HummerH1), PTAG(Payload)) << "\n";
- std::cout << "(HummerH1, AutomaticTransmission) = " << GET_PROP_VALUE(TTAG(HummerH1), PTAG(AutomaticTransmission)) << "\n";
+ std::cout << "(HummerH1, TopSpeed) = " << GET_PROP_VALUE(TTAG(HummerH1), TopSpeed) << "\n";
+ std::cout << "(HummerH1, NumSeats) = " << GET_PROP_VALUE(TTAG(HummerH1), NumSeats) << "\n";
+ std::cout << "(HummerH1, GasUsage) = " << GET_PROP_VALUE(TTAG(HummerH1), GasUsage) << "\n";
+ std::cout << "(HummerH1, Payload) = " << GET_PROP_VALUE(TTAG(HummerH1), Payload) << "\n";
+ std::cout << "(HummerH1, AutomaticTransmission) = " << GET_PROP_VALUE(TTAG(HummerH1), AutomaticTransmission) << "\n";
// CanonCaliber is explcitly unset for the Hummer -> this would not compile:
- // std::cout << "(HummerH1, CanonCaliber) = " << GET_PROP_VALUE(TTAG(HummerH1), PTAG(CanonCaliber)) << "\n";
+ // std::cout << "(HummerH1, CanonCaliber) = " << GET_PROP_VALUE(TTAG(HummerH1), CanonCaliber) << "\n";
std::cout << "\n";
std::cout << "---------------------------------------\n";
@@ -189,11 +189,11 @@ int main()
Dumux::Properties::print<TTAG(Sedan)>();
std::cout << "---- Message for (HummerH1, CanonCaliber) ---\n"
- << PROP_DIAGNOSTIC(TTAG(HummerH1), PTAG(CanonCaliber));
+ << PROP_DIAGNOSTIC(TTAG(HummerH1), CanonCaliber);
std::cout << "---- Message for (HummerH1, GasUsage) ---\n"
- << PROP_DIAGNOSTIC(TTAG(HummerH1), PTAG(GasUsage));
+ << PROP_DIAGNOSTIC(TTAG(HummerH1), GasUsage);
std::cout << "---- Message for (HummerH1, AutomaticTransmission) ---\n"
- << PROP_DIAGNOSTIC(TTAG(HummerH1), PTAG(AutomaticTransmission));
+ << PROP_DIAGNOSTIC(TTAG(HummerH1), AutomaticTransmission);
return 0;
}
diff --git a/test/decoupled/1p/test_1p.cc b/test/decoupled/1p/test_1p.cc
index 67ff5c0c2a..4bf35d223f 100644
--- a/test/decoupled/1p/test_1p.cc
+++ b/test/decoupled/1p/test_1p.cc
@@ -50,8 +50,8 @@ int main(int argc, char** argv)
{
try {
typedef TTAG(TestProblemOneP) TypeTag;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
+ typedef GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef GET_PROP_TYPE(TypeTag, Grid) Grid;
static const int dim = Grid::dimension;
typedef Dune::FieldVector<Scalar, dim> GlobalPosition;
@@ -83,7 +83,7 @@ int main(int argc, char** argv)
////////////////////////////////////////////////////////////
// instantiate and run the concrete problem
////////////////////////////////////////////////////////////
- typedef GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
+ typedef GET_PROP_TYPE(TypeTag, Problem) Problem;
Problem problem(grid.leafView(), delta);
problem.init();
problem.writeOutput();
diff --git a/test/decoupled/1p/test_1p_problem.hh b/test/decoupled/1p/test_1p_problem.hh
index c06b6dfa78..64783ccebc 100644
--- a/test/decoupled/1p/test_1p_problem.hh
+++ b/test/decoupled/1p/test_1p_problem.hh
@@ -66,7 +66,7 @@ SET_PROP(TestProblemOneP, Grid)
SET_PROP(TestProblemOneP, Fluid)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::Unit<Scalar> > type;
};
@@ -75,8 +75,8 @@ public:
SET_PROP(TestProblemOneP, SpatialParameters)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::TestOnePSpatialParams<TypeTag> type;
@@ -104,19 +104,19 @@ template<class TypeTag = TTAG(TestProblemOneP)>
class TestProblemOneP: public DiffusionProblem1P<TypeTag >
{
typedef DiffusionProblem1P<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Fluid)) Fluid;
+ typedef typename GET_PROP_TYPE(TypeTag, Fluid) Fluid;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
enum
{
dim = GridView::dimension, dimWorld = GridView::dimensionworld
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::Intersection Intersection;
diff --git a/test/decoupled/1p/test_1p_spatialparams.hh b/test/decoupled/1p/test_1p_spatialparams.hh
index de3967c518..9024d01650 100644
--- a/test/decoupled/1p/test_1p_spatialparams.hh
+++ b/test/decoupled/1p/test_1p_spatialparams.hh
@@ -40,9 +40,9 @@ template<class TypeTag>
class TestOnePSpatialParams: public FVSpatialParametersOneP<TypeTag>
{
typedef FVSpatialParametersOneP<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
diff --git a/test/decoupled/1p/test_diffusion.cc b/test/decoupled/1p/test_diffusion.cc
index 9504ba9da6..500aec13b8 100644
--- a/test/decoupled/1p/test_diffusion.cc
+++ b/test/decoupled/1p/test_diffusion.cc
@@ -50,8 +50,8 @@ int main(int argc, char** argv)
{
try {
typedef TTAG(DiffusionTestProblem) TypeTag;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
+ typedef GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef GET_PROP_TYPE(TypeTag, Grid) Grid;
static const int dim = Grid::dimension;
typedef Dune::FieldVector<Scalar, dim> GlobalPosition;
@@ -86,7 +86,7 @@ int main(int argc, char** argv)
Dune::Timer timer;
bool consecutiveNumbering = true;
- typedef GET_PROP_TYPE(TTAG(FVVelocity2PTestProblem), PTAG(Problem)) FVProblem;
+ typedef GET_PROP_TYPE(TTAG(FVVelocity2PTestProblem), Problem) FVProblem;
FVProblem fvProblem(grid.leafView(), delta);
fvProblem.setName("fvdiffusion");
timer.reset();
@@ -97,7 +97,7 @@ int main(int argc, char** argv)
// Dumux::ResultEvaluation fvResult;
// fvResult.evaluate(grid.leafView(), fvProblem, fvProblem.variables().pressure(), fvProblem.variables().velocity(), consecutiveNumbering);
-// typedef GET_PROP_TYPE(TTAG(FVMPFAOVelocity2PTestProblem), PTAG(Problem)) MPFAOProblem;
+// typedef GET_PROP_TYPE(TTAG(FVMPFAOVelocity2PTestProblem), Problem) MPFAOProblem;
// MPFAOProblem mpfaProblem(grid.leafView(), delta);
// mpfaProblem.setName("fvmpfaodiffusion");
// timer.reset();
@@ -108,7 +108,7 @@ int main(int argc, char** argv)
// Dumux::ResultEvaluation mpfaResult;
// mpfaResult.evaluate(grid.leafView(), mpfaProblem, mpfaProblem.variables().pressure(), mpfaProblem.variables().velocity(), consecutiveNumbering);
//
-// typedef GET_PROP_TYPE(TTAG(MimeticPressure2PTestProblem), PTAG(Problem)) MimeticProblem;
+// typedef GET_PROP_TYPE(TTAG(MimeticPressure2PTestProblem), Problem) MimeticProblem;
// MimeticProblem mimeticProblem(grid.leafView(), delta);
// mimeticProblem.setName("mimeticdiffusion");
// timer.reset();
diff --git a/test/decoupled/1p/test_diffusion_problem.hh b/test/decoupled/1p/test_diffusion_problem.hh
index d1ad3e4cd9..2e1e064aa0 100644
--- a/test/decoupled/1p/test_diffusion_problem.hh
+++ b/test/decoupled/1p/test_diffusion_problem.hh
@@ -74,7 +74,7 @@ SET_INT_PROP(DiffusionTestProblem, Formulation,
SET_PROP(DiffusionTestProblem, WettingPhase)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::Unit<Scalar> > type;
};
@@ -83,7 +83,7 @@ public:
SET_PROP(DiffusionTestProblem, NonwettingPhase)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::Unit<Scalar> > type;
};
@@ -118,14 +118,14 @@ template<class TypeTag = TTAG(DiffusionTestProblem)>
class TestDiffusionProblem: public DiffusionProblem2P<TypeTag>
{
typedef DiffusionProblem2P<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
enum
{
@@ -141,14 +141,14 @@ class TestDiffusionProblem: public DiffusionProblem2P<TypeTag>
pressEqIdx = Indices::pressEqIdx
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ 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:
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
TestDiffusionProblem(const GridView &gridView, const double delta = 1.0) :
diff --git a/test/decoupled/1p/test_diffusion_spatialparams.hh b/test/decoupled/1p/test_diffusion_spatialparams.hh
index 91c5b8a9d4..b5494eca9f 100644
--- a/test/decoupled/1p/test_diffusion_spatialparams.hh
+++ b/test/decoupled/1p/test_diffusion_spatialparams.hh
@@ -50,7 +50,7 @@ SET_TYPE_PROP(TestDiffusionSpatialParams, SpatialParameters, Dumux::TestDiffusio
SET_PROP(TestDiffusionSpatialParams, MaterialLaw)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef LinearMaterial<Scalar> RawMaterialLaw;
public:
typedef EffToAbsLaw<RawMaterialLaw> type;
@@ -65,9 +65,9 @@ template<class TypeTag>
class TestDiffusionSpatialParams: public FVSpatialParameters<TypeTag>
{
typedef FVSpatialParameters<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
@@ -78,7 +78,7 @@ class TestDiffusionSpatialParams: public FVSpatialParameters<TypeTag>
typedef Dune::FieldMatrix<Scalar,dim,dim> FieldMatrix;
public:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw)) MaterialLaw;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename MaterialLaw::Params MaterialLawParams;
const FieldMatrix& intrinsicPermeabilityAtPos (const GlobalPosition& globalPos) const
diff --git a/test/decoupled/2p/test_impes.cc b/test/decoupled/2p/test_impes.cc
index 09ea720539..69c2bcc5dc 100644
--- a/test/decoupled/2p/test_impes.cc
+++ b/test/decoupled/2p/test_impes.cc
@@ -52,10 +52,10 @@ int main(int argc, char** argv)
{
try {
typedef TTAG(IMPESTestProblem) TypeTag;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef GET_PROP_TYPE(TypeTag, Grid) Grid;
+ typedef GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef Dune::FieldVector<Scalar, Grid::dimensionworld> GlobalPosition;
static const int dim = Grid::dimension;
diff --git a/test/decoupled/2p/test_impes_problem.hh b/test/decoupled/2p/test_impes_problem.hh
index 888d454408..bbe715cca9 100644
--- a/test/decoupled/2p/test_impes_problem.hh
+++ b/test/decoupled/2p/test_impes_problem.hh
@@ -92,7 +92,7 @@ SET_PROP(IMPESTestProblem, PressureModel)
SET_PROP(IMPESTestProblem, WettingPhase)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
};
@@ -101,7 +101,7 @@ public:
SET_PROP(IMPESTestProblem, NonwettingPhase)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
};
@@ -131,16 +131,16 @@ template<class TypeTag = TTAG(IMPESTestProblem)>
class TestIMPESProblem: public IMPESProblem2P<TypeTag>
{
typedef IMPESProblem2P<TypeTag> ParentType;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
+typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
+typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(WettingPhase)) WettingPhase;
+typedef typename GET_PROP_TYPE(TypeTag, WettingPhase) WettingPhase;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
enum
{
@@ -156,14 +156,14 @@ enum
eqIdxSat = Indices::satEqIdx
};
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+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, PTAG(BoundaryTypes)) BoundaryTypes;
-typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
+typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
public:
diff --git a/test/decoupled/2p/test_impes_spatialparams.hh b/test/decoupled/2p/test_impes_spatialparams.hh
index fa17ffa70f..dde630e1b7 100644
--- a/test/decoupled/2p/test_impes_spatialparams.hh
+++ b/test/decoupled/2p/test_impes_spatialparams.hh
@@ -51,7 +51,7 @@ SET_TYPE_PROP(TestIMPESSpatialParams, SpatialParameters, Dumux::TestIMPESSpatial
SET_PROP(TestIMPESSpatialParams, MaterialLaw)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef RegularizedBrooksCorey<Scalar> RawMaterialLaw;
public:
typedef EffToAbsLaw<RawMaterialLaw> type;
@@ -66,9 +66,9 @@ public:
template<class TypeTag>
class TestIMPESSpatialParams: public FVSpatialParameters<TypeTag>
{
- 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 FVSpatialParameters<TypeTag> ParentType;
typedef typename Grid::ctype CoordScalar;
@@ -80,7 +80,7 @@ class TestIMPESSpatialParams: public FVSpatialParameters<TypeTag>
typedef Dune::FieldMatrix<Scalar,dim,dim> FieldMatrix;
public:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw)) MaterialLaw;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename MaterialLaw::Params MaterialLawParams;
diff --git a/test/decoupled/2p/test_transport.cc b/test/decoupled/2p/test_transport.cc
index a0eaaa929a..13db09f86b 100644
--- a/test/decoupled/2p/test_transport.cc
+++ b/test/decoupled/2p/test_transport.cc
@@ -52,9 +52,9 @@ int main(int argc, char** argv)
{
try {
typedef TTAG(TransportTestProblem) TypeTag;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef GET_PROP_TYPE(TypeTag, Grid) Grid;
+ typedef GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
// initialize MPI, finalize is done automatically on exit
Dune::MPIHelper::instance(argc, argv);
diff --git a/test/decoupled/2p/test_transport_problem.hh b/test/decoupled/2p/test_transport_problem.hh
index 35861dd643..926d0188fe 100644
--- a/test/decoupled/2p/test_transport_problem.hh
+++ b/test/decoupled/2p/test_transport_problem.hh
@@ -77,7 +77,7 @@ SET_PROP(TransportTestProblem, Model)
SET_PROP(TransportTestProblem, WettingPhase)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::Unit<Scalar> > type;
};
@@ -86,7 +86,7 @@ public:
SET_PROP(TransportTestProblem, NonwettingPhase)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::Unit<Scalar> > type;
};
@@ -120,21 +120,21 @@ template<class TypeTag = TTAG(TransportTestProblem)>
class TestTransportProblem: public TransportProblem2P<TypeTag>
{
typedef TransportProblem2P<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ 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 GridView::template Codim<0>::Iterator ElementIterator;
typedef typename GridView::IntersectionIterator IntersectionIterator;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(CellData)) CellData;
+ typedef typename GET_PROP_TYPE(TypeTag, CellData) CellData;
enum
{
@@ -147,7 +147,7 @@ class TestTransportProblem: public TransportProblem2P<TypeTag>
satEqIdx = Indices::satEqIdx
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::Intersection Intersection;
diff --git a/test/decoupled/2p/test_transport_spatialparams.hh b/test/decoupled/2p/test_transport_spatialparams.hh
index bc31794c4c..80067563ae 100644
--- a/test/decoupled/2p/test_transport_spatialparams.hh
+++ b/test/decoupled/2p/test_transport_spatialparams.hh
@@ -51,7 +51,7 @@ SET_TYPE_PROP(TestTransportSpatialParams, SpatialParameters, Dumux::TestTranspor
SET_PROP(TestTransportSpatialParams, MaterialLaw)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef LinearMaterial<Scalar> RawMaterialLaw;
public:
typedef EffToAbsLaw<RawMaterialLaw> type;
@@ -66,9 +66,9 @@ template<class TypeTag>
class TestTransportSpatialParams: public FVSpatialParameters<TypeTag>
{
typedef FVSpatialParameters<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
@@ -76,7 +76,7 @@ class TestTransportSpatialParams: public FVSpatialParameters<TypeTag>
typedef typename Grid::Traits::template Codim<0>::Entity Element;
public:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw)) MaterialLaw;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename MaterialLaw::Params MaterialLawParams;
Scalar intrinsicPermeability (const Element& element) const
diff --git a/test/decoupled/2p2c/test_dec2p2c.cc b/test/decoupled/2p2c/test_dec2p2c.cc
index 26c87d8675..0f40d2d496 100644
--- a/test/decoupled/2p2c/test_dec2p2c.cc
+++ b/test/decoupled/2p2c/test_dec2p2c.cc
@@ -51,10 +51,10 @@ int main(int argc, char** argv)
{
try {
typedef TTAG(TestDecTwoPTwoCProblem) TypeTag;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef GET_PROP_TYPE(TypeTag, Grid) Grid;
+ typedef GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef Dune::FieldVector<Scalar, Grid::dimensionworld> GlobalPosition;
static const int dim = Grid::dimension;
diff --git a/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh b/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
index 28a66fb3f5..17a9345843 100644
--- a/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
+++ b/test/decoupled/2p2c/test_dec2p2c_spatialparams.hh
@@ -42,9 +42,9 @@ namespace Dumux
template<class TypeTag>
class Test2P2CSpatialParams
{
- 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
diff --git a/test/decoupled/2p2c/test_dec2p2cproblem.hh b/test/decoupled/2p2c/test_dec2p2cproblem.hh
index 824cd40d12..279c78ade2 100644
--- a/test/decoupled/2p2c/test_dec2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_dec2p2cproblem.hh
@@ -82,7 +82,7 @@ SET_PROP(TestDecTwoPTwoCProblem, PressureModel)
};
SET_INT_PROP(TestDecTwoPTwoCProblem, PressureFormulation,
- GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices))::pressureNW);
+ GET_PROP_TYPE(TypeTag, TwoPTwoCIndices)::pressureNW);
// Select fluid system
SET_PROP(TestDecTwoPTwoCProblem, FluidSystem)
@@ -94,9 +94,9 @@ SET_BOOL_PROP(TestDecTwoPTwoCProblem, EnableComplicatedFluidSystem, true);
// Select water formulation
-SET_PROP(TestDecTwoPTwoCProblem, Components) : public GET_PROP(TypeTag, PTAG(DefaultComponents))
+SET_PROP(TestDecTwoPTwoCProblem, Components) : public GET_PROP(TypeTag, DefaultComponents)
{
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
// typedef Dumux::TabulatedComponent<Scalar, typename Dumux::H2O<Scalar> > H20;
typedef Dumux::SimpleH2O<Scalar> H2O;
};
@@ -105,8 +105,8 @@ SET_PROP(TestDecTwoPTwoCProblem, Components) : public GET_PROP(TypeTag, PTAG(Def
SET_PROP(TestDecTwoPTwoCProblem, SpatialParameters)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::Test2P2CSpatialParams<TypeTag> type;
@@ -119,7 +119,7 @@ SET_BOOL_PROP(TestDecTwoPTwoCProblem, EnableGravity, true);
SET_BOOL_PROP(TestDecTwoPTwoCProblem, EnableCapillarity, true);
SET_INT_PROP(TestDecTwoPTwoCProblem,
BoundaryMobility,
- GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices))::satDependent);
+ GET_PROP_TYPE(TypeTag, TwoPTwoCIndices)::satDependent);
SET_SCALAR_PROP(TestDecTwoPTwoCProblem, CFLFactor, 0.8);
}
@@ -141,15 +141,15 @@ template<class TypeTag = TTAG(TestDecTwoPTwoCProblem)>
class TestDecTwoPTwoCProblem: public IMPETProblem2P2C<TypeTag>
{
typedef IMPETProblem2P2C<TypeTag> ParentType;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
+typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
+typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
// boundary typedefs
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
+typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
+typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
enum
{
@@ -161,7 +161,7 @@ enum
wPhaseIdx = Indices::wPhaseIdx, nPhaseIdx = Indices::nPhaseIdx
};
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::Intersection Intersection;
diff --git a/test/decoupled/2p2c/test_multiphysics2p2c.cc b/test/decoupled/2p2c/test_multiphysics2p2c.cc
index 262a5e06b4..b7c89683b4 100644
--- a/test/decoupled/2p2c/test_multiphysics2p2c.cc
+++ b/test/decoupled/2p2c/test_multiphysics2p2c.cc
@@ -51,10 +51,10 @@ int main(int argc, char** argv)
{
try {
typedef TTAG(TestMultTwoPTwoCProblem) TypeTag;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef GET_PROP_TYPE(TypeTag, Grid) Grid;
+ typedef GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef Dune::FieldVector<Scalar, Grid::dimensionworld> GlobalPosition;
static const int dim = Grid::dimension;
diff --git a/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh b/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
index 04f4692e76..000842afbe 100644
--- a/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
@@ -81,7 +81,7 @@ SET_PROP(TestMultTwoPTwoCProblem, PressureModel)
};
SET_INT_PROP(TestMultTwoPTwoCProblem, PressureFormulation,
- GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices))::pressureNW);
+ GET_PROP_TYPE(TypeTag, TwoPTwoCIndices)::pressureNW);
//// Select fluid system
//SET_PROP(TestMultTwoPTwoCProblem, FluidSystem)
@@ -95,9 +95,9 @@ SET_PROP(TestMultTwoPTwoCProblem, FluidSystem)
};
//// Select water formulation
-//SET_PROP(TestMultTwoPTwoCProblem, Components) : public GET_PROP(TypeTag, PTAG(DefaultComponents))
+//SET_PROP(TestMultTwoPTwoCProblem, Components) : public GET_PROP(TypeTag, DefaultComponents)
//{
-// typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+// typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
//// typedef Dumux::TabulatedComponent<Scalar, typename Dumux::H2O<Scalar> > H20;
// typedef Dumux::H2O<Scalar> H2O;
//};
@@ -106,8 +106,8 @@ SET_PROP(TestMultTwoPTwoCProblem, FluidSystem)
SET_PROP(TestMultTwoPTwoCProblem, SpatialParameters)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::Test2P2CSpatialParams<TypeTag> type;
@@ -118,7 +118,7 @@ SET_BOOL_PROP(TestMultTwoPTwoCProblem, EnableGravity, true);
SET_BOOL_PROP(TestMultTwoPTwoCProblem, EnableCapillarity, true);
SET_INT_PROP(TestMultTwoPTwoCProblem,
BoundaryMobility,
- GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices))::satDependent);
+ GET_PROP_TYPE(TypeTag, TwoPTwoCIndices)::satDependent);
SET_SCALAR_PROP(TestMultTwoPTwoCProblem, CFLFactor, 0.8);
}
@@ -143,16 +143,16 @@ template<class TypeTag = TTAG(TestMultTwoPTwoCProblem)>
class TestMultTwoPTwoCProblem: public IMPETProblem2P2C<TypeTag>
{
typedef IMPETProblem2P2C<TypeTag> ParentType;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPTwoCIndices)) Indices;
+typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
+typedef typename GET_PROP_TYPE(TypeTag, TwoPTwoCIndices) Indices;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
+typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
// boundary typedefs
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(PrimaryVariables)) PrimaryVariables;
+typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
+typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
enum
{
@@ -164,7 +164,7 @@ enum
wPhaseIdx = Indices::wPhaseIdx, nPhaseIdx = Indices::nPhaseIdx
};
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::Intersection Intersection;
diff --git a/test/decoupled/2padaptive/test_impes_adaptive.cc b/test/decoupled/2padaptive/test_impes_adaptive.cc
index be55667eab..846bde5ab1 100644
--- a/test/decoupled/2padaptive/test_impes_adaptive.cc
+++ b/test/decoupled/2padaptive/test_impes_adaptive.cc
@@ -66,17 +66,17 @@ int main(int argc, char** argv)
{
try {
typedef TTAG(TestIMPESAdaptiveProblem) TypeTag;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef GET_PROP_TYPE(TypeTag, Grid) Grid;
+ typedef GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef Dune::FieldVector<Scalar, Grid::dimensionworld> GlobalPosition;
- typedef typename GET_PROP(TypeTag, PTAG(ParameterTree)) Params;
+ typedef typename GET_PROP(TypeTag, ParameterTree) Params;
static const int dim = Grid::dimension;
//todo: diese zwei Zeile nach dem testen entfernen
- typedef GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
+ typedef GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GridView::Codim<0>::Iterator ElementLeafIterator;
// static const int dim = Grid::dimension;
diff --git a/test/decoupled/2padaptive/test_impes_adaptive_problem.hh b/test/decoupled/2padaptive/test_impes_adaptive_problem.hh
index 7258823676..674e42f45d 100644
--- a/test/decoupled/2padaptive/test_impes_adaptive_problem.hh
+++ b/test/decoupled/2padaptive/test_impes_adaptive_problem.hh
@@ -91,7 +91,7 @@ SET_PROP(TestIMPESAdaptiveProblem, PressureModel)
SET_PROP(TestIMPESAdaptiveProblem, WettingPhase)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
};
@@ -100,7 +100,7 @@ public:
SET_PROP(TestIMPESAdaptiveProblem, NonwettingPhase)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
};
@@ -137,15 +137,15 @@ class TestIMPESAdaptiveProblem: public IMPESProblem2P<TypeTag>//IMPESProblem2Pad
{
//typedef IMPESProblem2Padaptive<TypeTag> ParentType;
typedef IMPESProblem2P<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, Grid) Grid;
+typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
+typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
+typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
enum
{
@@ -161,14 +161,14 @@ enum
eqIdxSat = Indices::satEqIdx
};
-typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+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, PTAG(BoundaryTypes)) BoundaryTypes;
-typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
+typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
public:
diff --git a/test/decoupled/2padaptive/test_impes_adaptive_spatialparams.hh b/test/decoupled/2padaptive/test_impes_adaptive_spatialparams.hh
index 59b34f3ece..9a5eafdc25 100644
--- a/test/decoupled/2padaptive/test_impes_adaptive_spatialparams.hh
+++ b/test/decoupled/2padaptive/test_impes_adaptive_spatialparams.hh
@@ -51,7 +51,7 @@ SET_TYPE_PROP(TestIMPESAdaptiveSpatialParams, SpatialParameters, Dumux::TestIMPE
SET_PROP(TestIMPESAdaptiveSpatialParams, MaterialLaw)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef RegularizedBrooksCorey<Scalar> RawMaterialLaw;
public:
typedef EffToAbsLaw<RawMaterialLaw> type;
@@ -66,9 +66,9 @@ public:
template<class TypeTag>
class TestIMPESAdaptiveSpatialParams: public FVSpatialParameters<TypeTag>
{
- 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 FVSpatialParameters<TypeTag> ParentType;
typedef typename Grid::ctype CoordScalar;
@@ -80,7 +80,7 @@ class TestIMPESAdaptiveSpatialParams: public FVSpatialParameters<TypeTag>
typedef Dune::FieldMatrix<Scalar,dim,dim> FieldMatrix;
public:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw)) MaterialLaw;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename MaterialLaw::Params MaterialLawParams;
diff --git a/tutorial/tutorial_coupled.cc b/tutorial/tutorial_coupled.cc
index 998c340db3..64ef19a5f7 100644
--- a/tutorial/tutorial_coupled.cc
+++ b/tutorial/tutorial_coupled.cc
@@ -42,9 +42,9 @@ int main(int argc, char** argv)
{
try {
typedef TTAG(TutorialProblemCoupled) TypeTag; /*@\label{tutorial-coupled:set-type-tag}@*/
- typedef GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid; /*@\label{tutorial-coupled:retrieve-types-begin}@*/
- typedef GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem; /*@\label{tutorial-coupled:retrieve-types-end}@*/
+ typedef GET_PROP_TYPE(TypeTag, Grid) Grid; /*@\label{tutorial-coupled:retrieve-types-begin}@*/
+ typedef GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
+ typedef GET_PROP_TYPE(TypeTag, Problem) Problem; /*@\label{tutorial-coupled:retrieve-types-end}@*/
// Initialize MPI
Dune::MPIHelper::instance(argc, argv); /*@\label{tutorial-coupled:init-mpi}@*/
@@ -73,7 +73,7 @@ int main(int argc, char** argv)
std::istringstream(argv[argPos++]) >> dt; /*@\label{tutorial-coupled:parse-args-end}@*/
// create the grid
- Grid *gridPtr = GET_PROP(TypeTag, PTAG(Grid))::create(); /*@\label{tutorial-coupled:create-grid}@*/
+ Grid *gridPtr = GET_PROP(TypeTag, Grid)::create(); /*@\label{tutorial-coupled:create-grid}@*/
// create time manager responsible for global simulation control
TimeManager timeManager;
diff --git a/tutorial/tutorial_decoupled.cc b/tutorial/tutorial_decoupled.cc
index c0929ca4cb..9f243cf9ac 100644
--- a/tutorial/tutorial_decoupled.cc
+++ b/tutorial/tutorial_decoupled.cc
@@ -53,10 +53,10 @@ int main(int argc, char** argv)
{
try {
typedef TTAG(TutorialProblemDecoupled) TypeTag; /*@\label{tutorial-decoupled:set-type-tag}@*/
- typedef GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar; /*@\label{tutorial-decoupled:retrieve-types-begin}@*/
- typedef GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
- typedef GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
- typedef GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
+ typedef GET_PROP_TYPE(TypeTag, Scalar) Scalar; /*@\label{tutorial-decoupled:retrieve-types-begin}@*/
+ typedef GET_PROP_TYPE(TypeTag, Grid) Grid;
+ typedef GET_PROP_TYPE(TypeTag, Problem) Problem;
+ typedef GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
typedef Dune::FieldVector<Scalar, Grid::dimensionworld> GlobalPosition; /*@\label{tutorial-decoupled:retrieve-types-end}@*/
// initialize MPI, finalize is done automatically on exit
@@ -89,7 +89,7 @@ int main(int argc, char** argv)
dt = tEnd; /*@\label{tutorial-decoupled:parse-args-end}@*/
// create the grid
- Grid *gridPtr = GET_PROP(TypeTag, PTAG(Grid))::create(); /*@\label{tutorial-decoupled:create-grid}@*/
+ Grid *gridPtr = GET_PROP(TypeTag, Grid)::create(); /*@\label{tutorial-decoupled:create-grid}@*/
// create time manager responsible for global simulation control
TimeManager timeManager;
diff --git a/tutorial/tutorialproblem_coupled.hh b/tutorial/tutorialproblem_coupled.hh
index 52cd3b69f0..6ff0f21e64 100644
--- a/tutorial/tutorialproblem_coupled.hh
+++ b/tutorial/tutorialproblem_coupled.hh
@@ -80,14 +80,14 @@ SET_PROP(TutorialProblemCoupled, Grid) /*@\label{tutorial-coupled:set-grid}@*/
// Set the wetting phase
SET_PROP(TutorialProblemCoupled, WettingPhase) /*@\label{tutorial-coupled:2p-system-start}@*/
{
-private: typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public: typedef Dumux::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{tutorial-coupled:wettingPhase}@*/
};
// Set the non-wetting phase
SET_PROP(TutorialProblemCoupled, NonwettingPhase)
{
-private: typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public: typedef Dumux::LiquidPhase<Scalar, Dumux::Oil<Scalar> > type; /*@\label{tutorial-coupled:nonwettingPhase}@*/
}; /*@\label{tutorial-coupled:2p-system-end}@*/
@@ -107,8 +107,8 @@ template <class TypeTag>
class TutorialProblemCoupled : public TwoPProblem<TypeTag> /*@\label{tutorial-coupled:def-problem}@*/
{
typedef TwoPProblem<TypeTag> ParentType;
- 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;
// Grid dimension
enum { dim = GridView::dimension };
@@ -120,11 +120,11 @@ class TutorialProblemCoupled : public TwoPProblem<TypeTag> /*@\label{tutorial-co
typedef Dune::FieldVector<Scalar, dim> GlobalPosition;
// Dumux specific types
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices)) Indices;
- 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(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, TwoPIndices) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
public:
TutorialProblemCoupled(TimeManager &timeManager,
diff --git a/tutorial/tutorialproblem_decoupled.hh b/tutorial/tutorialproblem_decoupled.hh
index c46e48c172..24690fc95d 100644
--- a/tutorial/tutorialproblem_decoupled.hh
+++ b/tutorial/tutorialproblem_decoupled.hh
@@ -89,7 +89,7 @@ SET_PROP(TutorialProblemDecoupled, Grid) /*@\label{tutorial-decoupled:grid-begin
SET_PROP(TutorialProblemDecoupled, WettingPhase) /*@\label{tutorial-decoupled:2p-system-start}@*/
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{tutorial-decoupled:wettingPhase}@*/
};
@@ -98,7 +98,7 @@ public:
SET_PROP(TutorialProblemDecoupled, NonwettingPhase)
{
private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Dumux::LiquidPhase<Scalar, Dumux::Oil<Scalar> > type; /*@\label{tutorial-decoupled:nonwettingPhase}@*/
}; /*@\label{tutorial-decoupled:2p-system-end}@*/
@@ -116,7 +116,7 @@ SET_PROP(TutorialProblemDecoupled, PressureModel) /*@\label{tutorial-decoupled:P
// model-specific settings
SET_INT_PROP(TutorialProblemDecoupled, VelocityFormulation,
- GET_PROP_TYPE(TypeTag, PTAG(Indices))::velocityW); /*@\label{tutorial-decoupled:velocityFormulation}@*/
+ GET_PROP_TYPE(TypeTag, Indices)::velocityW); /*@\label{tutorial-decoupled:velocityFormulation}@*/
SET_TYPE_PROP(TutorialProblemDecoupled, DiffusivePart,
@@ -135,15 +135,15 @@ template<class TypeTag>
class TutorialProblemDecoupled: public IMPESProblem2P<TypeTag> /*@\label{tutorial-decoupled:def-problem}@*/
{
typedef IMPESProblem2P<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(GridView)) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(TimeManager)) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Indices)) Indices;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidState)) FluidState;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(BoundaryTypes)) BoundaryTypes;
- typedef typename GET_PROP(TypeTag, PTAG(SolutionTypes)) SolutionTypes;
+ typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
+ typedef typename GET_PROP(TypeTag, SolutionTypes) SolutionTypes;
typedef typename SolutionTypes::PrimaryVariables PrimaryVariables;
enum
@@ -161,7 +161,7 @@ class TutorialProblemDecoupled: public IMPESProblem2P<TypeTag> /*@\label{tutoria
satEqIdx = Indices::satEqIdx
};
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GridView::Traits::template Codim<0>::Entity Element;
typedef typename GridView::Intersection Intersection;
diff --git a/tutorial/tutorialspatialparameters_coupled.hh b/tutorial/tutorialspatialparameters_coupled.hh
index bb76d99968..f98943063c 100644
--- a/tutorial/tutorialspatialparameters_coupled.hh
+++ b/tutorial/tutorialspatialparameters_coupled.hh
@@ -55,7 +55,7 @@ SET_PROP(TutorialSpatialParametersCoupled, MaterialLaw)
{
private:
// material law typedefs
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
// select material law to be used
typedef RegularizedBrooksCorey<Scalar> RawMaterialLaw; /*@\label{tutorial-coupled:rawlaw}@*/
public:
@@ -74,9 +74,9 @@ template<class TypeTag>
class TutorialSpatialParametersCoupled: public BoxSpatialParameters<TypeTag> /*@\label{tutorial-coupled:tutorialSpatialParameters}@*/
{
// Get informations for current implementation via property system
- 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;
enum
{
dim = Grid::dimension,
@@ -85,12 +85,12 @@ class TutorialSpatialParametersCoupled: public BoxSpatialParameters<TypeTag> /*@
typedef Dune::FieldVector<Scalar, dim> GlobalPosition;
// Get object types for function arguments
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
+ typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
typedef typename Grid::Traits::template Codim<0>::Entity Element;
public:
// get material law from property system
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw)) MaterialLaw;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
// determine appropriate parameters depening on selected materialLaw
typedef typename MaterialLaw::Params MaterialLawParams; /*@\label{tutorial-coupled:matLawObjectType}@*/
diff --git a/tutorial/tutorialspatialparameters_decoupled.hh b/tutorial/tutorialspatialparameters_decoupled.hh
index 63841d0862..28530dfb3d 100644
--- a/tutorial/tutorialspatialparameters_decoupled.hh
+++ b/tutorial/tutorialspatialparameters_decoupled.hh
@@ -53,7 +53,7 @@ SET_PROP(TutorialSpatialParametersDecoupled, MaterialLaw)
{
private:
// material law typedefs
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef RegularizedBrooksCorey<Scalar> RawMaterialLaw;
public:
typedef EffToAbsLaw<RawMaterialLaw> type;
@@ -66,9 +66,9 @@ template<class TypeTag>
class TutorialSpatialParametersDecoupled: public FVSpatialParameters<TypeTag>
{
typedef FVSpatialParameters<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
@@ -80,7 +80,7 @@ class TutorialSpatialParametersDecoupled: public FVSpatialParameters<TypeTag>
typedef Dune::FieldMatrix<Scalar,dim,dim> FieldMatrix;
public:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw)) MaterialLaw;
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename MaterialLaw::Params MaterialLawParams;
//! Intrinsic permeability tensor K \f$[m^2]\f$ depending
--
GitLab