From dc78f9c043c932296b1edc5418ac9ec1fa374a99 Mon Sep 17 00:00:00 2001
From: Nicolas Schwenck <nicolas.schwenck@iws.uni-stuttgart.de>
Date: Wed, 15 Feb 2012 10:47:19 +0000
Subject: [PATCH] TTAG clean up. Approved by RM.
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7787 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
test/boxmodels/1p/1ptestproblem.hh | 4 ++--
test/boxmodels/1p2c/1p2coutflowproblem.hh | 2 +-
test/boxmodels/2p2c/injectionproblem.hh | 4 ++--
test/decoupled/2p2c/test_dec2p2cproblem.hh | 2 +-
test/decoupled/2p2c/test_multiphysics2p2cproblem.hh | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/test/boxmodels/1p/1ptestproblem.hh b/test/boxmodels/1p/1ptestproblem.hh
index 8f2799ca33..cfcc88f3f0 100644
--- a/test/boxmodels/1p/1ptestproblem.hh
+++ b/test/boxmodels/1p/1ptestproblem.hh
@@ -73,7 +73,7 @@ SET_PROP(OnePTestProblem, Grid)
// Set the problem property
SET_PROP(OnePTestProblem, Problem)
-{ typedef Dumux::OnePTestProblem<TTAG(OnePTestProblem)> type; };
+{ typedef Dumux::OnePTestProblem<TypeTag> type; };
// Set the spatial parameters
SET_PROP(OnePTestProblem, SpatialParameters)
@@ -110,7 +110,7 @@ SET_BOOL_PROP(OnePTestProblem, EnableGravity, true);
* <tt>typedef Dune::SGrid<3,3> type;</tt> in the problem file
* and use <tt>1p_3d.dgf</tt> in the parameter file.
*/
-template <class TypeTag = TTAG(OnePTestProblem) >
+template <class TypeTag>
class OnePTestProblem : public OnePBoxProblem<TypeTag>
{
typedef OnePBoxProblem<TypeTag> ParentType;
diff --git a/test/boxmodels/1p2c/1p2coutflowproblem.hh b/test/boxmodels/1p2c/1p2coutflowproblem.hh
index 85ef93061c..a4e7d32daa 100644
--- a/test/boxmodels/1p2c/1p2coutflowproblem.hh
+++ b/test/boxmodels/1p2c/1p2coutflowproblem.hh
@@ -65,7 +65,7 @@ SET_PROP(OnePTwoCOutflowProblem, Grid)
// Set the problem property
SET_PROP(OnePTwoCOutflowProblem, Problem)
{
- typedef Dumux::OnePTwoCOutflowProblem<TTAG(OnePTwoCOutflowProblem)> type;
+ typedef Dumux::OnePTwoCOutflowProblem<TypeTag> type;
};
// Set fluid configuration
diff --git a/test/boxmodels/2p2c/injectionproblem.hh b/test/boxmodels/2p2c/injectionproblem.hh
index dd7f0b3e06..5d9cd8297a 100644
--- a/test/boxmodels/2p2c/injectionproblem.hh
+++ b/test/boxmodels/2p2c/injectionproblem.hh
@@ -55,7 +55,7 @@ SET_PROP(InjectionProblem, Grid)
// Set the problem property
SET_PROP(InjectionProblem, Problem)
{
- typedef Dumux::InjectionProblem<TTAG(InjectionProblem)> type;
+ typedef Dumux::InjectionProblem<TypeTag> type;
};
// Set fluid configuration
@@ -92,7 +92,7 @@ SET_BOOL_PROP(InjectionProblem, EnableVelocityOutput, false);
* To run the simulation execute the following line in shell:
* <tt>./test_2p2c -parameterFile ./test_2p2c.input</tt>
*/
-template <class TypeTag = TTAG(InjectionProblem) >
+template <class TypeTag>
class InjectionProblem : public TwoPTwoCProblem<TypeTag>
{
typedef TwoPTwoCProblem<TypeTag> ParentType;
diff --git a/test/decoupled/2p2c/test_dec2p2cproblem.hh b/test/decoupled/2p2c/test_dec2p2cproblem.hh
index bd61459fbd..f89663542c 100644
--- a/test/decoupled/2p2c/test_dec2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_dec2p2cproblem.hh
@@ -127,7 +127,7 @@ SET_SCALAR_PROP(TestDecTwoPTwoCProblem, CFLFactor, 0.8);
* To run the simulation execute the following line in shell:
* <tt>./test_dec2p2c -parameterFile ./test_dec2p2c.input</tt>
*/
-template<class TypeTag = TTAG(TestDecTwoPTwoCProblem)>
+template<class TypeTag>
class TestDecTwoPTwoCProblem: public IMPETProblem2P2C<TypeTag>
{
typedef IMPETProblem2P2C<TypeTag> ParentType;
diff --git a/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh b/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
index 5c9126d043..d1e6309bd4 100644
--- a/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
@@ -135,7 +135,7 @@ SET_SCALAR_PROP(TestMultTwoPTwoCProblem, CFLFactor, 0.8);
* Optionally, simulation endtime and first timestep size can be
* specified by programm arguments.
*/
-template<class TypeTag = TTAG(TestMultTwoPTwoCProblem)>
+template<class TypeTag>
class TestMultTwoPTwoCProblem: public IMPETProblem2P2C<TypeTag>
{
typedef IMPETProblem2P2C<TypeTag> ParentType;
--
GitLab