diff --git a/test/freeflow/navierstokes/angelitestproblem.hh b/test/freeflow/navierstokes/angelitestproblem.hh
index a6561feb94ae6a47a1f24260be959a9963320b6c..1bd51eb1fff69e1ddf118cbefefbb74cce1873a9 100644
--- a/test/freeflow/navierstokes/angelitestproblem.hh
+++ b/test/freeflow/navierstokes/angelitestproblem.hh
@@ -38,10 +38,10 @@ class AngeliTestProblem;
namespace Properties
{
-NEW_TYPE_TAG(AngeliTestProblem, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
+NEW_TYPE_TAG(AngeliTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
// the fluid system
-SET_PROP(AngeliTestProblem, FluidSystem)
+SET_PROP(AngeliTestTypeTag, FluidSystem)
{
private:
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
@@ -50,17 +50,17 @@ public:
};
// Set the grid type
-SET_TYPE_PROP(AngeliTestProblem, Grid, Dune::YaspGrid<2, Dune::EquidistantOffsetCoordinates<typename GET_PROP_TYPE(TypeTag, Scalar), 2> >);
+SET_TYPE_PROP(AngeliTestTypeTag, Grid, Dune::YaspGrid<2, Dune::EquidistantOffsetCoordinates<typename GET_PROP_TYPE(TypeTag, Scalar), 2> >);
// Set the problem property
-SET_TYPE_PROP(AngeliTestProblem, Problem, Dumux::AngeliTestProblem<TypeTag> );
+SET_TYPE_PROP(AngeliTestTypeTag, Problem, Dumux::AngeliTestProblem<TypeTag> );
-SET_BOOL_PROP(AngeliTestProblem, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(AngeliTestTypeTag, EnableFVGridGeometryCache, true);
-SET_BOOL_PROP(AngeliTestProblem, EnableGridFluxVariablesCache, true);
-SET_BOOL_PROP(AngeliTestProblem, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(AngeliTestTypeTag, EnableGridFluxVariablesCache, true);
+SET_BOOL_PROP(AngeliTestTypeTag, EnableGridVolumeVariablesCache, true);
-SET_BOOL_PROP(AngeliTestProblem, EnableInertiaTerms, true);
+SET_BOOL_PROP(AngeliTestTypeTag, EnableInertiaTerms, true);
}
/*!
diff --git a/test/freeflow/navierstokes/channeltestproblem.hh b/test/freeflow/navierstokes/channeltestproblem.hh
index 8dfe135e62116d050512e9705d134daed5dcd849..dd012cc2d1623a667d0eedbaedaa13c137bd93f4 100644
--- a/test/freeflow/navierstokes/channeltestproblem.hh
+++ b/test/freeflow/navierstokes/channeltestproblem.hh
@@ -40,13 +40,13 @@ class ChannelTestProblem;
namespace Properties
{
#if !NONISOTHERMAL
-NEW_TYPE_TAG(ChannelTestProblem, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
+NEW_TYPE_TAG(ChannelTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
#else
-NEW_TYPE_TAG(ChannelTestProblem, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNI));
+NEW_TYPE_TAG(ChannelTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNI));
#endif
// the fluid system
-SET_PROP(ChannelTestProblem, FluidSystem)
+SET_PROP(ChannelTestTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
#if NONISOTHERMAL
@@ -57,21 +57,21 @@ SET_PROP(ChannelTestProblem, FluidSystem)
};
// Set the grid type
-SET_TYPE_PROP(ChannelTestProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(ChannelTestTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(ChannelTestProblem, Problem, Dumux::ChannelTestProblem<TypeTag> );
+SET_TYPE_PROP(ChannelTestTypeTag, Problem, Dumux::ChannelTestProblem<TypeTag> );
-SET_BOOL_PROP(ChannelTestProblem, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(ChannelTestTypeTag, EnableFVGridGeometryCache, true);
-SET_BOOL_PROP(ChannelTestProblem, EnableGridFluxVariablesCache, true);
-SET_BOOL_PROP(ChannelTestProblem, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(ChannelTestTypeTag, EnableGridFluxVariablesCache, true);
+SET_BOOL_PROP(ChannelTestTypeTag, EnableGridVolumeVariablesCache, true);
#if ENABLE_NAVIERSTOKES
-SET_BOOL_PROP(ChannelTestProblem, EnableInertiaTerms, true);
+SET_BOOL_PROP(ChannelTestTypeTag, EnableInertiaTerms, true);
#else
-SET_BOOL_PROP(ChannelTestProblem, EnableInertiaTerms, false);
+SET_BOOL_PROP(ChannelTestTypeTag, EnableInertiaTerms, false);
#endif
}
diff --git a/test/freeflow/navierstokes/closedsystemtestproblem.hh b/test/freeflow/navierstokes/closedsystemtestproblem.hh
index 3ecf2fcbe8c48bebb6b5c8cb8389cbffb59b7503..6691313c37a80ce9c6f89991ec93ad6269b69455 100644
--- a/test/freeflow/navierstokes/closedsystemtestproblem.hh
+++ b/test/freeflow/navierstokes/closedsystemtestproblem.hh
@@ -38,25 +38,25 @@ class ClosedSystemTestProblem;
namespace Properties
{
-NEW_TYPE_TAG(ClosedSystemTestProblem, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
+NEW_TYPE_TAG(ClosedSystemTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
// the fluid system
-SET_PROP(ClosedSystemTestProblem, FluidSystem)
+SET_PROP(ClosedSystemTestTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using type = FluidSystems::LiquidPhase<Scalar, Components::Constant<1, Scalar> >;
};
// Set the grid type
-SET_TYPE_PROP(ClosedSystemTestProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(ClosedSystemTestTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(ClosedSystemTestProblem, Problem, Dumux::ClosedSystemTestProblem<TypeTag> );
+SET_TYPE_PROP(ClosedSystemTestTypeTag, Problem, Dumux::ClosedSystemTestProblem<TypeTag> );
-SET_BOOL_PROP(ClosedSystemTestProblem, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(ClosedSystemTestTypeTag, EnableFVGridGeometryCache, true);
-SET_BOOL_PROP(ClosedSystemTestProblem, EnableGridFluxVariablesCache, true);
-SET_BOOL_PROP(ClosedSystemTestProblem, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(ClosedSystemTestTypeTag, EnableGridFluxVariablesCache, true);
+SET_BOOL_PROP(ClosedSystemTestTypeTag, EnableGridVolumeVariablesCache, true);
}
diff --git a/test/freeflow/navierstokes/doneatestproblem.hh b/test/freeflow/navierstokes/doneatestproblem.hh
index 5ba0d15881c54bb8f6ca57cd5bdad2c1f83073f3..f26c4c46b595876b189402c175446fe19aea3125 100644
--- a/test/freeflow/navierstokes/doneatestproblem.hh
+++ b/test/freeflow/navierstokes/doneatestproblem.hh
@@ -39,30 +39,30 @@ class DoneaTestProblem;
namespace Properties
{
-NEW_TYPE_TAG(DoneaTestProblem, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
+NEW_TYPE_TAG(DoneaTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
// the fluid system
-SET_PROP(DoneaTestProblem, FluidSystem)
+SET_PROP(DoneaTestTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using type = FluidSystems::LiquidPhase<Scalar, Components::Constant<1, Scalar> >;
};
// Set the grid type
-SET_TYPE_PROP(DoneaTestProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(DoneaTestTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(DoneaTestProblem, Problem, Dumux::DoneaTestProblem<TypeTag> );
+SET_TYPE_PROP(DoneaTestTypeTag, Problem, Dumux::DoneaTestProblem<TypeTag> );
-SET_BOOL_PROP(DoneaTestProblem, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(DoneaTestTypeTag, EnableFVGridGeometryCache, true);
-SET_BOOL_PROP(DoneaTestProblem, EnableGridFluxVariablesCache, true);
-SET_BOOL_PROP(DoneaTestProblem, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(DoneaTestTypeTag, EnableGridFluxVariablesCache, true);
+SET_BOOL_PROP(DoneaTestTypeTag, EnableGridVolumeVariablesCache, true);
#if ENABLE_NAVIERSTOKES
-SET_BOOL_PROP(DoneaTestProblem, EnableInertiaTerms, true);
+SET_BOOL_PROP(DoneaTestTypeTag, EnableInertiaTerms, true);
#else
-SET_BOOL_PROP(DoneaTestProblem, EnableInertiaTerms, false);
+SET_BOOL_PROP(DoneaTestTypeTag, EnableInertiaTerms, false);
#endif
}
diff --git a/test/freeflow/navierstokes/kovasznaytestproblem.hh b/test/freeflow/navierstokes/kovasznaytestproblem.hh
index ce99d609fdf58e17c81c65c1270443f2f1fca9e0..4b9f32dda0c752dffc292ba181ee1ea9fffbbe47 100644
--- a/test/freeflow/navierstokes/kovasznaytestproblem.hh
+++ b/test/freeflow/navierstokes/kovasznaytestproblem.hh
@@ -38,27 +38,27 @@ class KovasznayTestProblem;
namespace Properties
{
-NEW_TYPE_TAG(KovasznayTestProblem, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
+NEW_TYPE_TAG(KovasznayTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
// the fluid system
-SET_PROP(KovasznayTestProblem, FluidSystem)
+SET_PROP(KovasznayTestTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using type = FluidSystems::LiquidPhase<Scalar, Components::Constant<1, Scalar> >;
};
// Set the grid type
-SET_TYPE_PROP(KovasznayTestProblem, Grid, Dune::YaspGrid<2, Dune::EquidistantOffsetCoordinates<typename GET_PROP_TYPE(TypeTag, Scalar), 2> >);
+SET_TYPE_PROP(KovasznayTestTypeTag, Grid, Dune::YaspGrid<2, Dune::EquidistantOffsetCoordinates<typename GET_PROP_TYPE(TypeTag, Scalar), 2> >);
// Set the problem property
-SET_TYPE_PROP(KovasznayTestProblem, Problem, Dumux::KovasznayTestProblem<TypeTag> );
+SET_TYPE_PROP(KovasznayTestTypeTag, Problem, Dumux::KovasznayTestProblem<TypeTag> );
-SET_BOOL_PROP(KovasznayTestProblem, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(KovasznayTestTypeTag, EnableFVGridGeometryCache, true);
-SET_BOOL_PROP(KovasznayTestProblem, EnableGridFluxVariablesCache, true);
-SET_BOOL_PROP(KovasznayTestProblem, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(KovasznayTestTypeTag, EnableGridFluxVariablesCache, true);
+SET_BOOL_PROP(KovasznayTestTypeTag, EnableGridVolumeVariablesCache, true);
-SET_BOOL_PROP(KovasznayTestProblem, EnableInertiaTerms, true);
+SET_BOOL_PROP(KovasznayTestTypeTag, EnableInertiaTerms, true);
}
/*!
diff --git a/test/freeflow/navierstokes/test_angeli.cc b/test/freeflow/navierstokes/test_angeli.cc
index 7ed802fe19e04e6ae076e06ed05d3ea17d8737f7..dbb484c5c279cce6e577272da34c73aaeef81c4a 100644
--- a/test/freeflow/navierstokes/test_angeli.cc
+++ b/test/freeflow/navierstokes/test_angeli.cc
@@ -90,7 +90,7 @@ int main(int argc, char** argv) try
using namespace Dumux;
// define the type tag for this problem
- using TypeTag = TTAG(AngeliTestProblem);
+ using TypeTag = TTAG(AngeliTestTypeTag);
// initialize MPI, finalize is done automatically on exit
const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
diff --git a/test/freeflow/navierstokes/test_channel.cc b/test/freeflow/navierstokes/test_channel.cc
index d35ebcb8ef307e1cfa3a4908c300cd39089e961d..26dc86653e7f0dbb878c839d571131588171b68f 100644
--- a/test/freeflow/navierstokes/test_channel.cc
+++ b/test/freeflow/navierstokes/test_channel.cc
@@ -91,7 +91,7 @@ int main(int argc, char** argv) try
using namespace Dumux;
// define the type tag for this problem
- using TypeTag = TTAG(ChannelTestProblem);
+ using TypeTag = TTAG(ChannelTestTypeTag);
// initialize MPI, finalize is done automatically on exit
const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
diff --git a/test/freeflow/navierstokes/test_closedsystem.cc b/test/freeflow/navierstokes/test_closedsystem.cc
index b5ae119dcb1b864b1bb6740ab5b148173c92f431..c946693b60db57d55558a09cf07ef93e876773d6 100644
--- a/test/freeflow/navierstokes/test_closedsystem.cc
+++ b/test/freeflow/navierstokes/test_closedsystem.cc
@@ -89,7 +89,7 @@ int main(int argc, char** argv) try
using namespace Dumux;
// define the type tag for this problem
- using TypeTag = TTAG(ClosedSystemTestProblem);
+ using TypeTag = TTAG(ClosedSystemTestTypeTag);
// initialize MPI, finalize is done automatically on exit
const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
diff --git a/test/freeflow/navierstokes/test_donea.cc b/test/freeflow/navierstokes/test_donea.cc
index 1b918b6344987e9dd9277c7a52a2d5b801118c08..c29346f65bd1249beb568141670c2d2cfaf4bd6b 100644
--- a/test/freeflow/navierstokes/test_donea.cc
+++ b/test/freeflow/navierstokes/test_donea.cc
@@ -91,7 +91,7 @@ int main(int argc, char** argv) try
using namespace Dumux;
// define the type tag for this problem
- using TypeTag = TTAG(DoneaTestProblem);
+ using TypeTag = TTAG(DoneaTestTypeTag);
// initialize MPI, finalize is done automatically on exit
const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
diff --git a/test/freeflow/navierstokes/test_kovasznay.cc b/test/freeflow/navierstokes/test_kovasznay.cc
index b8204a95d2f22b16dd5f61229be8d901d8dca81d..06ebd5fd6e7358c19890c9385775376fc4960575 100644
--- a/test/freeflow/navierstokes/test_kovasznay.cc
+++ b/test/freeflow/navierstokes/test_kovasznay.cc
@@ -90,7 +90,7 @@ int main(int argc, char** argv) try
using namespace Dumux;
// define the type tag for this problem
- using TypeTag = TTAG(KovasznayTestProblem);
+ using TypeTag = TTAG(KovasznayTestTypeTag);
// initialize MPI, finalize is done automatically on exit
const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
diff --git a/test/freeflow/navierstokesnc/channeltestproblem.hh b/test/freeflow/navierstokesnc/channeltestproblem.hh
index 5cebba5386f4cd52ef2a27306866bc32b725f008..d663e5a8b2c4b8fb6c2911af3fde8c37b5e31bf0 100644
--- a/test/freeflow/navierstokesnc/channeltestproblem.hh
+++ b/test/freeflow/navierstokesnc/channeltestproblem.hh
@@ -43,18 +43,18 @@ namespace Properties
{
#if !NONISOTHERMAL
-NEW_TYPE_TAG(ChannelNCTestProblem, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNC));
+NEW_TYPE_TAG(ChannelNCTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNC));
#else
-NEW_TYPE_TAG(ChannelNCTestProblem, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNCNI));
+NEW_TYPE_TAG(ChannelNCTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNCNI));
#endif
NEW_PROP_TAG(FluidSystem);
// Select the fluid system
-SET_TYPE_PROP(ChannelNCTestProblem, FluidSystem,
+SET_TYPE_PROP(ChannelNCTestTypeTag, FluidSystem,
FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)/*, SimpleH2O<typename GET_PROP_TYPE(TypeTag, Scalar)>, true*/>);
-SET_PROP(ChannelNCTestProblem, PhaseIdx)
+SET_PROP(ChannelNCTestTypeTag, PhaseIdx)
{
private:
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
@@ -62,26 +62,26 @@ public:
static constexpr int value = FluidSystem::wPhaseIdx;
};
-SET_INT_PROP(ChannelNCTestProblem, ReplaceCompEqIdx, 0);
+SET_INT_PROP(ChannelNCTestTypeTag, ReplaceCompEqIdx, 0);
// Set the grid type
-SET_TYPE_PROP(ChannelNCTestProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(ChannelNCTestTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(ChannelNCTestProblem, Problem, Dumux::ChannelNCTestProblem<TypeTag> );
+SET_TYPE_PROP(ChannelNCTestTypeTag, Problem, Dumux::ChannelNCTestProblem<TypeTag> );
-SET_BOOL_PROP(ChannelNCTestProblem, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(ChannelNCTestTypeTag, EnableFVGridGeometryCache, true);
-SET_BOOL_PROP(ChannelNCTestProblem, EnableGridFluxVariablesCache, true);
-SET_BOOL_PROP(ChannelNCTestProblem, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(ChannelNCTestTypeTag, EnableGridFluxVariablesCache, true);
+SET_BOOL_PROP(ChannelNCTestTypeTag, EnableGridVolumeVariablesCache, true);
// Enable gravity
-SET_BOOL_PROP(ChannelNCTestProblem, UseMoles, true);
+SET_BOOL_PROP(ChannelNCTestTypeTag, UseMoles, true);
// #if ENABLE_NAVIERSTOKES
-SET_BOOL_PROP(ChannelNCTestProblem, EnableInertiaTerms, true);
+SET_BOOL_PROP(ChannelNCTestTypeTag, EnableInertiaTerms, true);
// #else
-// SET_BOOL_PROP(ChannelNCTestProblem, EnableInertiaTerms, false);
+// SET_BOOL_PROP(ChannelNCTestTypeTag, EnableInertiaTerms, false);
// #endif
}
diff --git a/test/freeflow/navierstokesnc/densityflowproblem.hh b/test/freeflow/navierstokesnc/densityflowproblem.hh
index bd6fc5e41094dd863ef5f68efd186d87b81368c7..208f9d6f45439355784c418ee060d53f457233c5 100644
--- a/test/freeflow/navierstokesnc/densityflowproblem.hh
+++ b/test/freeflow/navierstokesnc/densityflowproblem.hh
@@ -41,15 +41,15 @@ class DensityDrivenFlowProblem;
namespace Properties
{
-NEW_TYPE_TAG(DensityDrivenFlowProblem, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNC));
+NEW_TYPE_TAG(DensityDrivenFlowTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNC));
NEW_PROP_TAG(FluidSystem);
// Select the fluid system
-SET_TYPE_PROP(DensityDrivenFlowProblem, FluidSystem,
+SET_TYPE_PROP(DensityDrivenFlowTypeTag, FluidSystem,
FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)/*, SimpleH2O<typename GET_PROP_TYPE(TypeTag, Scalar)>, false*/>);
-SET_PROP(DensityDrivenFlowProblem, PhaseIdx)
+SET_PROP(DensityDrivenFlowTypeTag, PhaseIdx)
{
private:
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
@@ -57,25 +57,25 @@ public:
static constexpr int value = FluidSystem::wPhaseIdx;
};
-SET_INT_PROP(DensityDrivenFlowProblem, ReplaceCompEqIdx, 0);
+SET_INT_PROP(DensityDrivenFlowTypeTag, ReplaceCompEqIdx, 0);
// Set the grid type
-SET_TYPE_PROP(DensityDrivenFlowProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(DensityDrivenFlowTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(DensityDrivenFlowProblem, Problem, Dumux::DensityDrivenFlowProblem<TypeTag> );
+SET_TYPE_PROP(DensityDrivenFlowTypeTag, Problem, Dumux::DensityDrivenFlowProblem<TypeTag> );
-SET_BOOL_PROP(DensityDrivenFlowProblem, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(DensityDrivenFlowTypeTag, EnableFVGridGeometryCache, true);
-SET_BOOL_PROP(DensityDrivenFlowProblem, EnableGridFluxVariablesCache, true);
-SET_BOOL_PROP(DensityDrivenFlowProblem, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(DensityDrivenFlowTypeTag, EnableGridFluxVariablesCache, true);
+SET_BOOL_PROP(DensityDrivenFlowTypeTag, EnableGridVolumeVariablesCache, true);
-SET_BOOL_PROP(DensityDrivenFlowProblem, UseMoles, true);
+SET_BOOL_PROP(DensityDrivenFlowTypeTag, UseMoles, true);
#if ENABLE_NAVIERSTOKES
-SET_BOOL_PROP(DensityDrivenFlowProblem, EnableInertiaTerms, true);
+SET_BOOL_PROP(DensityDrivenFlowTypeTag, EnableInertiaTerms, true);
#else
-SET_BOOL_PROP(DensityDrivenFlowProblem, EnableInertiaTerms, false);
+SET_BOOL_PROP(DensityDrivenFlowTypeTag, EnableInertiaTerms, false);
#endif
}
diff --git a/test/freeflow/navierstokesnc/msfreeflowtestproblem.hh b/test/freeflow/navierstokesnc/msfreeflowtestproblem.hh
index 9f008b1fb086a80063b3b62c752d32ced8424f92..5b560311f796833754a3b53fee25d3c46741576e 100644
--- a/test/freeflow/navierstokesnc/msfreeflowtestproblem.hh
+++ b/test/freeflow/navierstokesnc/msfreeflowtestproblem.hh
@@ -43,33 +43,33 @@ class MaxwellStefanNCTestProblem;
namespace Properties {
#if !NONISOTHERMAL
-NEW_TYPE_TAG(MaxwellStefanNCTestProblem, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNC));
+NEW_TYPE_TAG(MaxwellStefanNCTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNC));
#else
-NEW_TYPE_TAG(MaxwellStefanNCTestProblem, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNCNI));
+NEW_TYPE_TAG(MaxwellStefanNCTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNCNI));
#endif
NEW_PROP_TAG(FluidSystem);
-SET_INT_PROP(MaxwellStefanNCTestProblem, ReplaceCompEqIdx, 0);
+SET_INT_PROP(MaxwellStefanNCTestTypeTag, ReplaceCompEqIdx, 0);
// Set the grid type
-SET_TYPE_PROP(MaxwellStefanNCTestProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(MaxwellStefanNCTestTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(MaxwellStefanNCTestProblem, Problem, Dumux::MaxwellStefanNCTestProblem<TypeTag> );
+SET_TYPE_PROP(MaxwellStefanNCTestTypeTag, Problem, Dumux::MaxwellStefanNCTestProblem<TypeTag> );
-SET_BOOL_PROP(MaxwellStefanNCTestProblem, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(MaxwellStefanNCTestTypeTag, EnableFVGridGeometryCache, true);
-SET_BOOL_PROP(MaxwellStefanNCTestProblem, EnableGridFluxVariablesCache, true);
-SET_BOOL_PROP(MaxwellStefanNCTestProblem, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(MaxwellStefanNCTestTypeTag, EnableGridFluxVariablesCache, true);
+SET_BOOL_PROP(MaxwellStefanNCTestTypeTag, EnableGridVolumeVariablesCache, true);
-SET_BOOL_PROP(MaxwellStefanNCTestProblem, UseMoles, true);
+SET_BOOL_PROP(MaxwellStefanNCTestTypeTag, UseMoles, true);
// #if ENABLE_NAVIERSTOKES
-SET_BOOL_PROP(MaxwellStefanNCTestProblem, EnableInertiaTerms, true);
+SET_BOOL_PROP(MaxwellStefanNCTestTypeTag, EnableInertiaTerms, true);
//! Here we set FicksLaw or MaxwellStefansLaw
-SET_TYPE_PROP(MaxwellStefanNCTestProblem, MolecularDiffusionType, MaxwellStefansLaw<TypeTag>);
+SET_TYPE_PROP(MaxwellStefanNCTestTypeTag, MolecularDiffusionType, MaxwellStefansLaw<TypeTag>);
/*!
@@ -170,7 +170,7 @@ public:
}
};
-SET_TYPE_PROP(MaxwellStefanNCTestProblem, FluidSystem, MaxwellStefanFluidSystem<TypeTag>);
+SET_TYPE_PROP(MaxwellStefanNCTestTypeTag, FluidSystem, MaxwellStefanFluidSystem<TypeTag>);
} //end namespace Property
/*!
diff --git a/test/freeflow/navierstokesnc/test_channel.cc b/test/freeflow/navierstokesnc/test_channel.cc
index 6f888cd15e2309a8db97160bb45b4aba127531e8..8c06550191cc902976a144bf2ee63202ec465dee 100644
--- a/test/freeflow/navierstokesnc/test_channel.cc
+++ b/test/freeflow/navierstokesnc/test_channel.cc
@@ -89,7 +89,7 @@ int main(int argc, char** argv) try
using namespace Dumux;
// define the type tag for this problem
- using TypeTag = TTAG(ChannelNCTestProblem);
+ using TypeTag = TTAG(ChannelNCTestTypeTag);
// initialize MPI, finalize is done automatically on exit
const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
diff --git a/test/freeflow/navierstokesnc/test_densitydrivenflow.cc b/test/freeflow/navierstokesnc/test_densitydrivenflow.cc
index 843f5cc76bae6688dcb4be2f22ca5cdf75a69739..0f27ad978071f1b8970a2bca3b5964b055100e57 100644
--- a/test/freeflow/navierstokesnc/test_densitydrivenflow.cc
+++ b/test/freeflow/navierstokesnc/test_densitydrivenflow.cc
@@ -89,7 +89,7 @@ int main(int argc, char** argv) try
using namespace Dumux;
// define the type tag for this problem
- using TypeTag = TTAG(DensityDrivenFlowProblem);
+ using TypeTag = TTAG(DensityDrivenFlowTypeTag);
// initialize MPI, finalize is done automatically on exit
const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
diff --git a/test/freeflow/navierstokesnc/test_msfreeflow.cc b/test/freeflow/navierstokesnc/test_msfreeflow.cc
index 3546b5a5bf1b2ff991c9337ed7ccc6b527563b7e..6ab3394118d662e5212d86fccb3b58ddb3a7ba34 100644
--- a/test/freeflow/navierstokesnc/test_msfreeflow.cc
+++ b/test/freeflow/navierstokesnc/test_msfreeflow.cc
@@ -89,7 +89,7 @@ int main(int argc, char** argv) try
using namespace Dumux;
// define the type tag for this problem
- using TypeTag = TTAG(MaxwellStefanNCTestProblem);
+ using TypeTag = TTAG(MaxwellStefanNCTestTypeTag);
// initialize MPI, finalize is done automatically on exit
const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
diff --git a/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh b/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh
index a9e2128b9806e27be82a3e95b6303e66c369e596..d8395c300bec0042db4abd8a91f5851ee1408dfa 100644
--- a/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh
+++ b/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh
@@ -47,29 +47,29 @@ class OnePNIConductionProblem;
namespace Properties
{
-NEW_TYPE_TAG(OnePNIConductionProblem, INHERITS_FROM(OnePNI));
-NEW_TYPE_TAG(OnePNIConductionBoxProblem, INHERITS_FROM(BoxModel, OnePNIConductionProblem));
-NEW_TYPE_TAG(OnePNIConductionCCTpfaProblem, INHERITS_FROM(CCTpfaModel, OnePNIConductionProblem));
-NEW_TYPE_TAG(OnePNIConductionCCMpfaProblem, INHERITS_FROM(CCMpfaModel, OnePNIConductionProblem));
+NEW_TYPE_TAG(OnePNIConductionTypeTag, INHERITS_FROM(OnePNI));
+NEW_TYPE_TAG(OnePNIConductionBoxTypeTag, INHERITS_FROM(BoxModel, OnePNIConductionTypeTag));
+NEW_TYPE_TAG(OnePNIConductionCCTpfaTypeTag, INHERITS_FROM(CCTpfaModel, OnePNIConductionTypeTag));
+NEW_TYPE_TAG(OnePNIConductionCCMpfaTypeTag, INHERITS_FROM(CCMpfaModel, OnePNIConductionTypeTag));
// Set the grid type
-SET_TYPE_PROP(OnePNIConductionProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(OnePNIConductionTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(OnePNIConductionProblem, Problem,
+SET_TYPE_PROP(OnePNIConductionTypeTag, Problem,
OnePNIConductionProblem<TypeTag>);
// Set the fluid system
-SET_TYPE_PROP(OnePNIConductionProblem, FluidSystem,
+SET_TYPE_PROP(OnePNIConductionTypeTag, FluidSystem,
FluidSystems::LiquidPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
H2O<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
// Set the spatial parameters
-SET_TYPE_PROP(OnePNIConductionProblem,
+SET_TYPE_PROP(OnePNIConductionTypeTag,
SpatialParams,
OnePNISpatialParams<TypeTag>);
// Set the model parameter group for the mpfa case (velocity disabled in input file)
-SET_STRING_PROP(OnePNIConductionCCMpfaProblem, ModelParameterGroup, "MpfaTest");
+SET_STRING_PROP(OnePNIConductionCCMpfaTypeTag, ModelParameterGroup, "MpfaTest");
}
diff --git a/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh b/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh
index 898a40d7962cff658ed5ad731f3b599d75da8f32..34fbf7f18e944767b8ffcac7617ffdc45d015f3a 100644
--- a/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh
+++ b/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh
@@ -47,27 +47,27 @@ class OnePNIConvectionProblem;
namespace Properties
{
-NEW_TYPE_TAG(OnePNIConvectionProblem, INHERITS_FROM(OnePNI));
-NEW_TYPE_TAG(OnePNIConvectionBoxProblem, INHERITS_FROM(BoxModel, OnePNIConvectionProblem));
-NEW_TYPE_TAG(OnePNIConvectionCCTpfaProblem, INHERITS_FROM(CCTpfaModel, OnePNIConvectionProblem));
-NEW_TYPE_TAG(OnePNIConvectionCCMpfaProblem, INHERITS_FROM(CCMpfaModel, OnePNIConvectionProblem));
+NEW_TYPE_TAG(OnePNIConvectionTypeTag, INHERITS_FROM(OnePNI));
+NEW_TYPE_TAG(OnePNIConvectionBoxTypeTag, INHERITS_FROM(BoxModel, OnePNIConvectionTypeTag));
+NEW_TYPE_TAG(OnePNIConvectionCCTpfaTypeTag, INHERITS_FROM(CCTpfaModel, OnePNIConvectionTypeTag));
+NEW_TYPE_TAG(OnePNIConvectionCCMpfaTypeTag, INHERITS_FROM(CCMpfaModel, OnePNIConvectionTypeTag));
// Set the grid type
-SET_TYPE_PROP(OnePNIConvectionProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(OnePNIConvectionTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(OnePNIConvectionProblem, Problem, OnePNIConvectionProblem<TypeTag>);
+SET_TYPE_PROP(OnePNIConvectionTypeTag, Problem, OnePNIConvectionProblem<TypeTag>);
// Set the fluid system
-SET_TYPE_PROP(OnePNIConvectionProblem, FluidSystem,
+SET_TYPE_PROP(OnePNIConvectionTypeTag, FluidSystem,
FluidSystems::LiquidPhase<typename GET_PROP_TYPE(TypeTag, Scalar),
H2O<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
// Set the spatial parameters
-SET_TYPE_PROP(OnePNIConvectionProblem, SpatialParams, OnePNISpatialParams<TypeTag>);
+SET_TYPE_PROP(OnePNIConvectionTypeTag, SpatialParams, OnePNISpatialParams<TypeTag>);
// Set the model parameter group for the mpfa case (velocity disabled in input file)
-SET_STRING_PROP(OnePNIConvectionCCMpfaProblem, ModelParameterGroup, "MpfaTest");
+SET_STRING_PROP(OnePNIConvectionCCMpfaTypeTag, ModelParameterGroup, "MpfaTest");
} // end namespace Properties
diff --git a/test/porousmediumflow/1p/implicit/1ptestproblem.hh b/test/porousmediumflow/1p/implicit/1ptestproblem.hh
index 0ca7e0c7ec41adc413fcca515496c289fee8791f..d8d017ba65e4316b9d35da362dec57685d4f7332 100644
--- a/test/porousmediumflow/1p/implicit/1ptestproblem.hh
+++ b/test/porousmediumflow/1p/implicit/1ptestproblem.hh
@@ -42,28 +42,28 @@ class OnePTestProblem;
namespace Properties
{
-NEW_TYPE_TAG(OnePTestProblem, INHERITS_FROM(OneP, OnePTestSpatialParams));
-NEW_TYPE_TAG(OnePTestBoxProblem, INHERITS_FROM(BoxModel, OnePTestProblem));
-NEW_TYPE_TAG(OnePTestCCTpfaProblem, INHERITS_FROM(CCTpfaModel, OnePTestProblem));
-NEW_TYPE_TAG(OnePTestCCMpfaProblem, INHERITS_FROM(CCMpfaModel, OnePTestProblem));
+NEW_TYPE_TAG(OnePTestTypeTag, INHERITS_FROM(OneP, OnePTestSpatialParams));
+NEW_TYPE_TAG(OnePTestBoxTypeTag, INHERITS_FROM(BoxModel, OnePTestTypeTag));
+NEW_TYPE_TAG(OnePTestCCTpfaTypeTag, INHERITS_FROM(CCTpfaModel, OnePTestTypeTag));
+NEW_TYPE_TAG(OnePTestCCMpfaTypeTag, INHERITS_FROM(CCMpfaModel, OnePTestTypeTag));
// the fluid system
-SET_PROP(OnePTestProblem, FluidSystem)
+SET_PROP(OnePTestTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using type = FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> >;
};
// Set the grid type
-SET_TYPE_PROP(OnePTestProblem, Grid, Dune::YaspGrid<2>);
-//SET_TYPE_PROP(OnePTestProblem, Grid, Dune::UGGrid<2>);
-//SET_TYPE_PROP(OnePTestProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
+SET_TYPE_PROP(OnePTestTypeTag, Grid, Dune::YaspGrid<2>);
+//SET_TYPE_PROP(OnePTestTypeTag, Grid, Dune::UGGrid<2>);
+//SET_TYPE_PROP(OnePTestTypeTag, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
// Set the problem property
-SET_TYPE_PROP(OnePTestProblem, Problem, OnePTestProblem<TypeTag> );
+SET_TYPE_PROP(OnePTestTypeTag, Problem, OnePTestProblem<TypeTag> );
// Set the spatial parameters
-SET_TYPE_PROP(OnePTestProblem, SpatialParams, OnePTestSpatialParams<TypeTag> );
+SET_TYPE_PROP(OnePTestTypeTag, SpatialParams, OnePTestSpatialParams<TypeTag> );
}
/*!
diff --git a/test/porousmediumflow/1p/implicit/CMakeLists.txt b/test/porousmediumflow/1p/implicit/CMakeLists.txt
index c420e1a41bbef6f1c18776d3ccf5e1c66db64963..6ef54d943db55d876d111cf55685348bbe2bcf7e 100644
--- a/test/porousmediumflow/1p/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/CMakeLists.txt
@@ -11,7 +11,7 @@ dune_symlink_to_source_files(FILES "tubesconvergencetest.py")
# isothermal tests
dune_add_test(NAME test_1pcctpfa
SOURCES test_1pfv.cc
- COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfaProblem
+ COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfaTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
@@ -20,7 +20,7 @@ dune_add_test(NAME test_1pcctpfa
dune_add_test(NAME test_1pccmpfa
SOURCES test_1pfv.cc
- COMPILE_DEFINITIONS TYPETAG=OnePTestCCMpfaProblem
+ COMPILE_DEFINITIONS TYPETAG=OnePTestCCMpfaTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
@@ -29,7 +29,7 @@ dune_add_test(NAME test_1pccmpfa
dune_add_test(NAME test_1pbox
SOURCES test_1pfv.cc
- COMPILE_DEFINITIONS TYPETAG=OnePTestBoxProblem
+ COMPILE_DEFINITIONS TYPETAG=OnePTestBoxTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox-reference.vtu
@@ -39,13 +39,13 @@ dune_add_test(NAME test_1pbox
# a gstat test (becaue it's a random permeability field we can't test against a reference solution)
dune_add_test(NAME test_1pwithgstat
SOURCES test_1pfv.cc
- COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfaProblem
+ COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfaTypeTag
CMAKE_GUARD HAVE_GSTAT)
# non-isothermal tests
dune_add_test(NAME test_1pnibox_conduction
SOURCES test_1pnifv.cc
- COMPILE_DEFINITIONS TYPETAG=OnePNIConductionBoxProblem
+ COMPILE_DEFINITIONS TYPETAG=OnePNIConductionBoxTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1pniboxconduction-reference.vtu
@@ -55,7 +55,7 @@ dune_add_test(NAME test_1pnibox_conduction
dune_add_test(NAME test_1pnibox_convection
SOURCES test_1pnifv.cc
- COMPILE_DEFINITIONS TYPETAG=OnePNIConvectionBoxProblem
+ COMPILE_DEFINITIONS TYPETAG=OnePNIConvectionBoxTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1pniboxconvection-reference.vtu
@@ -65,7 +65,7 @@ dune_add_test(NAME test_1pnibox_convection
dune_add_test(NAME test_1pnicctpfa_conduction
SOURCES test_1pnifv.cc
- COMPILE_DEFINITIONS TYPETAG=OnePNIConductionCCTpfaProblem
+ COMPILE_DEFINITIONS TYPETAG=OnePNIConductionCCTpfaTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1pniccconduction-reference.vtu
@@ -75,7 +75,7 @@ dune_add_test(NAME test_1pnicctpfa_conduction
dune_add_test(NAME test_1pnicctpfa_convection
SOURCES test_1pnifv.cc
- COMPILE_DEFINITIONS TYPETAG=OnePNIConvectionCCTpfaProblem
+ COMPILE_DEFINITIONS TYPETAG=OnePNIConvectionCCTpfaTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1pniccconvection-reference.vtu
@@ -84,7 +84,7 @@ dune_add_test(NAME test_1pnicctpfa_convection
dune_add_test(NAME test_1pniccmpfa_conduction
SOURCES test_1pnifv.cc
- COMPILE_DEFINITIONS TYPETAG=OnePNIConductionCCMpfaProblem
+ COMPILE_DEFINITIONS TYPETAG=OnePNIConductionCCMpfaTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/ccmpfa1pniconduction-reference.vtu
@@ -93,7 +93,7 @@ dune_add_test(NAME test_1pniccmpfa_conduction
dune_add_test(NAME test_1pniccmpfa_convection
SOURCES test_1pnifv.cc
- COMPILE_DEFINITIONS TYPETAG=OnePNIConvectionCCMpfaProblem
+ COMPILE_DEFINITIONS TYPETAG=OnePNIConvectionCCMpfaTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/ccmpfa1pniconvection-reference.vtu
@@ -103,14 +103,14 @@ dune_add_test(NAME test_1pniccmpfa_convection
# dim < dimWorld tests with Dune::Foamgrid<1,3>
dune_add_test(NAME test_1pcctpfa_network1d3d
SOURCES test_1pfv_network1d3d.cc
- COMPILE_DEFINITIONS TYPETAG=TubesTestCCTpfaProblem
+ COMPILE_DEFINITIONS TYPETAG=TubesTestCCTpfaTypeTag
CMAKE_GUARD dune-foamgrid_FOUND
COMMAND ./tubesconvergencetest.py
CMD_ARGS test_1pcctpfa_network1d3d test_1pfv_network1d3d.input -Problem.Name test_1pcctpfa_network1d3d)
dune_add_test(NAME test_1pbox_network1d3d
SOURCES test_1pfv_network1d3d.cc
- COMPILE_DEFINITIONS TYPETAG=TubesTestBoxProblem
+ COMPILE_DEFINITIONS TYPETAG=TubesTestBoxTypeTag
CMAKE_GUARD dune-foamgrid_FOUND
COMMAND ./tubesconvergencetest.py
CMD_ARGS test_1pbox_network1d3d test_1pfv_network1d3d.input -Problem.Name test_1pbox_network1d3d)
@@ -118,7 +118,7 @@ dune_add_test(NAME test_1pbox_network1d3d
# dim < dimWorld tests with Dune::Foamgrid<2,3>
dune_add_test(NAME test_1pbox_fracture2d3d
SOURCES test_1pfv_fracture2d3d.cc
- COMPILE_DEFINITIONS TYPETAG=FractureBoxProblem
+ COMPILE_DEFINITIONS TYPETAG=FractureBoxTypeTag
CMAKE_GUARD dune-foamgrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
@@ -128,7 +128,7 @@ dune_add_test(NAME test_1pbox_fracture2d3d
dune_add_test(NAME test_1pcctpfa_fracture2d3d
SOURCES test_1pfv_fracture2d3d.cc
- COMPILE_DEFINITIONS TYPETAG=FractureCCTpfaProblem
+ COMPILE_DEFINITIONS TYPETAG=FractureCCTpfaTypeTag
CMAKE_GUARD dune-foamgrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
@@ -138,7 +138,7 @@ dune_add_test(NAME test_1pcctpfa_fracture2d3d
dune_add_test(NAME test_1pccmpfa_fracture2d3d
SOURCES test_1pfv_fracture2d3d.cc
- COMPILE_DEFINITIONS TYPETAG=FractureCCMpfaProblem
+ COMPILE_DEFINITIONS TYPETAG=FractureCCMpfaTypeTag
CMAKE_GUARD dune-foamgrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
diff --git a/test/porousmediumflow/1p/implicit/fractureproblem.hh b/test/porousmediumflow/1p/implicit/fractureproblem.hh
index bdc87a53484a585af3b3c20d4877f462fa61f801..1d7a2631335ccf6841204a853c4de0aba67f0a2c 100644
--- a/test/porousmediumflow/1p/implicit/fractureproblem.hh
+++ b/test/porousmediumflow/1p/implicit/fractureproblem.hh
@@ -44,24 +44,24 @@ class FractureProblem;
namespace Properties
{
-NEW_TYPE_TAG(FractureProblem, INHERITS_FROM(OneP, FractureSpatialParams));
-NEW_TYPE_TAG(FractureBoxProblem, INHERITS_FROM(BoxModel, FractureProblem));
-NEW_TYPE_TAG(FractureCCTpfaProblem, INHERITS_FROM(CCTpfaModel, FractureProblem));
-NEW_TYPE_TAG(FractureCCMpfaProblem, INHERITS_FROM(CCMpfaModel, FractureProblem));
+NEW_TYPE_TAG(FractureTypeTag, INHERITS_FROM(OneP, FractureSpatialParams));
+NEW_TYPE_TAG(FractureBoxTypeTag, INHERITS_FROM(BoxModel, FractureTypeTag));
+NEW_TYPE_TAG(FractureCCTpfaTypeTag, INHERITS_FROM(CCTpfaModel, FractureTypeTag));
+NEW_TYPE_TAG(FractureCCMpfaTypeTag, INHERITS_FROM(CCMpfaModel, FractureTypeTag));
//! Enable caching (more memory, but faster runtime)
-SET_BOOL_PROP(FractureProblem, EnableFVGridGeometryCache, true);
-SET_BOOL_PROP(FractureProblem, EnableGridVolumeVariablesCache, true);
-SET_BOOL_PROP(FractureProblem, EnableGridFluxVariablesCache, true);
+SET_BOOL_PROP(FractureTypeTag, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(FractureTypeTag, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(FractureTypeTag, EnableGridFluxVariablesCache, true);
//! The grid type
-SET_TYPE_PROP(FractureProblem, Grid, Dune::FoamGrid<2, 3>);
+SET_TYPE_PROP(FractureTypeTag, Grid, Dune::FoamGrid<2, 3>);
// Set the problem property
-SET_TYPE_PROP(FractureProblem, Problem, Dumux::FractureProblem<TypeTag>);
+SET_TYPE_PROP(FractureTypeTag, Problem, Dumux::FractureProblem<TypeTag>);
// the fluid system
-SET_PROP(FractureProblem, FluidSystem)
+SET_PROP(FractureTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using type = FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> >;
diff --git a/test/porousmediumflow/1p/implicit/tubesproblem.hh b/test/porousmediumflow/1p/implicit/tubesproblem.hh
index 919ddc44f9b51140494f17962c4f0539a3112315..2878bd7f1cf57587a43a28693f663a20094620b8 100644
--- a/test/porousmediumflow/1p/implicit/tubesproblem.hh
+++ b/test/porousmediumflow/1p/implicit/tubesproblem.hh
@@ -45,21 +45,21 @@ class TubesTestProblem;
namespace Properties
{
-NEW_TYPE_TAG(TubesTestProblem, INHERITS_FROM(OneP));
-NEW_TYPE_TAG(TubesTestCCTpfaProblem, INHERITS_FROM(CCTpfaModel, TubesTestProblem));
-NEW_TYPE_TAG(TubesTestBoxProblem, INHERITS_FROM(BoxModel, TubesTestProblem));
+NEW_TYPE_TAG(TubesTestTypeTag, INHERITS_FROM(OneP));
+NEW_TYPE_TAG(TubesTestCCTpfaTypeTag, INHERITS_FROM(CCTpfaModel, TubesTestTypeTag));
+NEW_TYPE_TAG(TubesTestBoxTypeTag, INHERITS_FROM(BoxModel, TubesTestTypeTag));
// Set the grid type
-SET_TYPE_PROP(TubesTestProblem, Grid, Dune::FoamGrid<1, 3>);
+SET_TYPE_PROP(TubesTestTypeTag, Grid, Dune::FoamGrid<1, 3>);
// Set the problem property
-SET_TYPE_PROP(TubesTestProblem, Problem, TubesTestProblem<TypeTag>);
+SET_TYPE_PROP(TubesTestTypeTag, Problem, TubesTestProblem<TypeTag>);
// Set the spatial parameters
-SET_TYPE_PROP(TubesTestProblem, SpatialParams, TubesTestSpatialParams<TypeTag>);
+SET_TYPE_PROP(TubesTestTypeTag, SpatialParams, TubesTestSpatialParams<TypeTag>);
// the fluid system
-SET_PROP(TubesTestProblem, FluidSystem)
+SET_PROP(TubesTestTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using type = FluidSystems::LiquidPhase<Scalar, Components::Constant<1, Scalar> >;
diff --git a/test/porousmediumflow/1p/sequential/test_1p.cc b/test/porousmediumflow/1p/sequential/test_1p.cc
index f5f774958c7324d33b6c627d01ad1472c362264f..557300a25a5aa105ea503208ae8f02a8f3125299 100644
--- a/test/porousmediumflow/1p/sequential/test_1p.cc
+++ b/test/porousmediumflow/1p/sequential/test_1p.cc
@@ -60,7 +60,7 @@ void usage(const char *progName, const std::string &errorMsg)
////////////////////////
int main(int argc, char** argv)
{
- using ProblemTypeTag = TTAG(TestProblemOneP);
+ using ProblemTypeTag = TTAG(TestOnePTypeTag);
return Dumux::start<ProblemTypeTag>(argc, argv, usage);
}
diff --git a/test/porousmediumflow/1p/sequential/test_1pproblem.hh b/test/porousmediumflow/1p/sequential/test_1pproblem.hh
index 240042279f75841535f8af5ccefd954fd84802bb..f09512ec768ce938e9923ee89afe213b14b944cf 100644
--- a/test/porousmediumflow/1p/sequential/test_1pproblem.hh
+++ b/test/porousmediumflow/1p/sequential/test_1pproblem.hh
@@ -44,23 +44,23 @@ class TestProblemOneP;
//////////
namespace Properties
{
-NEW_TYPE_TAG(TestProblemOneP, INHERITS_FROM(FVPressureOneP));
+NEW_TYPE_TAG(TestOnePTypeTag, INHERITS_FROM(FVPressureOneP));
// Set the grid type
-SET_TYPE_PROP(TestProblemOneP, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(TestOnePTypeTag, Grid, Dune::YaspGrid<2>);
// the fluid system
-SET_PROP(TestProblemOneP, FluidSystem)
+SET_PROP(TestOnePTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using type = FluidSystems::LiquidPhase<Scalar, Components::Constant<1, Scalar> >;
};
// Set the spatial parameters
-SET_TYPE_PROP(TestProblemOneP, SpatialParams, TestOnePSpatialParams<TypeTag>);
+SET_TYPE_PROP(TestOnePTypeTag, SpatialParams, TestOnePSpatialParams<TypeTag>);
//Set the problem
-SET_TYPE_PROP(TestProblemOneP, Problem, TestProblemOneP<TypeTag>);
+SET_TYPE_PROP(TestOnePTypeTag, Problem, TestProblemOneP<TypeTag>);
}
/*!
diff --git a/test/porousmediumflow/1p/sequential/test_diffusion.cc b/test/porousmediumflow/1p/sequential/test_diffusion.cc
index b4d640fb70b001cd8c448a13bcad7442fc39b0d7..0a5ee3a48849096d7ea218c01e1de31661a64d4a 100644
--- a/test/porousmediumflow/1p/sequential/test_diffusion.cc
+++ b/test/porousmediumflow/1p/sequential/test_diffusion.cc
@@ -51,7 +51,7 @@ void usage(const char *progName, const std::string &errorMsg)
int main(int argc, char** argv)
{
try {
- using TypeTag = TTAG(FVVelocity2PTestProblem);
+ using TypeTag = TTAG(FVVelocity2PTestTypeTag);
// initialize MPI, finalize is done automatically on exit
Dune::MPIHelper::instance(argc, argv);
@@ -72,7 +72,7 @@ int main(int argc, char** argv)
Dune::Timer timer;
bool consecutiveNumbering = true;
- using FVProblem = GET_PROP_TYPE(TTAG(FVVelocity2PTestProblem), Problem);
+ using FVProblem = GET_PROP_TYPE(TTAG(FVVelocity2PTestTypeTag), Problem);
FVProblem fvProblem(grid.leafGridView());
fvProblem.setName("fvdiffusion");
timer.reset();
@@ -83,7 +83,7 @@ int main(int argc, char** argv)
Dumux::ResultEvaluation fvResult;
fvResult.evaluate(grid.leafGridView(), fvProblem, consecutiveNumbering);
- using MPFAOProblem = GET_PROP_TYPE(TTAG(FVMPFAOVelocity2PTestProblem), Problem);
+ using MPFAOProblem = GET_PROP_TYPE(TTAG(FVMPFAOVelocity2PTestTypeTag), Problem);
MPFAOProblem mpfaProblem(grid.leafGridView());
mpfaProblem.setName("fvmpfaodiffusion");
timer.reset();
@@ -93,7 +93,7 @@ int main(int argc, char** argv)
Dumux::ResultEvaluation mpfaResult;
mpfaResult.evaluate(grid.leafGridView(), mpfaProblem, consecutiveNumbering);
- using MimeticProblem = GET_PROP_TYPE(TTAG(MimeticPressure2PTestProblem), Problem);
+ using MimeticProblem = GET_PROP_TYPE(TTAG(MimeticPressure2PTestTypeTag), Problem);
MimeticProblem mimeticProblem(grid.leafGridView());
mimeticProblem.setName("mimeticdiffusion");
timer.reset();
diff --git a/test/porousmediumflow/1p/sequential/test_diffusion3d.cc b/test/porousmediumflow/1p/sequential/test_diffusion3d.cc
index 76b8012176b0cb779833cd8273518a1bfe776863..f898e771bac6732babb0a851f31d265ed6c4500b 100644
--- a/test/porousmediumflow/1p/sequential/test_diffusion3d.cc
+++ b/test/porousmediumflow/1p/sequential/test_diffusion3d.cc
@@ -68,7 +68,7 @@ int start(int argc,
// parse the command line arguments and input file
////////////////////////////////////////////////////////////
- using TypeTag = TTAG(DiffusionTestProblem);
+ using TypeTag = TTAG(DiffusionTestTypeTag);
auto defaultParams = [] (Dune::ParameterTree& p) {GET_PROP(TypeTag, ModelDefaultParameters)::defaultParams(p);};
Parameters::init(argc, argv, defaultParams, usage);
@@ -111,7 +111,7 @@ int start(int argc,
// finite volume TPFA test problem
/////////////////////////////////////////////////////////////////////
- using FVTypeTag = TTAG(FVTestProblem);
+ using FVTypeTag = TTAG(FVTestTypeTag);
using FVProblem = GET_PROP_TYPE(FVTypeTag, Problem);
auto fvDefaultParams = [] (Dune::ParameterTree& p) {GET_PROP(FVTypeTag, ModelDefaultParameters)::defaultParams(p);};
Dumux::Parameters::init(argc, argv, fvDefaultParams, usage);
@@ -139,7 +139,7 @@ int start(int argc,
// finite volume MPFA-L test problem
/////////////////////////////////////////////////////////////////////
- using MPFALTypeTag = TTAG(FVMPFAL3DTestProblem);
+ using MPFALTypeTag = TTAG(FVMPFAL3DTestTypeTag);
using MPFALProblem = GET_PROP_TYPE(MPFALTypeTag, Problem);
auto mpfalDefaultParams = [] (Dune::ParameterTree& p) {GET_PROP(MPFALTypeTag, ModelDefaultParameters)::defaultParams(p);};
Dumux::Parameters::init(argc, argv, mpfalDefaultParams, usage);
@@ -167,7 +167,7 @@ int start(int argc,
// mimetic finite difference test problem
/////////////////////////////////////////////////////////////////////
- using MimeticTypeTag = TTAG(MimeticTestProblem);
+ using MimeticTypeTag = TTAG(MimeticTestTypeTag);
using MimeticProblem = GET_PROP_TYPE(MimeticTypeTag, Problem);
auto mimeticDefaultParams = [] (Dune::ParameterTree& p) {GET_PROP(MimeticTypeTag, ModelDefaultParameters)::defaultParams(p);};
Dumux::Parameters::init(argc, argv, mimeticDefaultParams, usage);
diff --git a/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh b/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh
index 2714ad080c403f641e6067201331ff0a3350dbbf..9345782c5b17ed8c2446bfaa1839803a8e7e956f 100644
--- a/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh
+++ b/test/porousmediumflow/1p/sequential/test_diffusionproblem.hh
@@ -51,14 +51,14 @@ class TestDiffusionProblem;
namespace Properties
{
//// set the types for the 2PFA FV method
-NEW_TYPE_TAG(FVVelocity2PTestProblem, INHERITS_FROM(FVPressureTwoP, TestDiffusionSpatialParams));
-SET_TYPE_PROP(FVVelocity2PTestProblem, Problem, TestDiffusionProblem<TypeTag>);
+NEW_TYPE_TAG(FVVelocity2PTestTypeTag, INHERITS_FROM(FVPressureTwoP, TestDiffusionSpatialParams));
+SET_TYPE_PROP(FVVelocity2PTestTypeTag, Problem, TestDiffusionProblem<TypeTag>);
// Set the grid type
-SET_TYPE_PROP(FVVelocity2PTestProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(FVVelocity2PTestTypeTag, Grid, Dune::YaspGrid<2>);
// Set the fluid system
-SET_PROP(FVVelocity2PTestProblem, FluidSystem)
+SET_PROP(FVVelocity2PTestTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using WettingPhase = FluidSystems::LiquidPhase<Scalar, Components::Constant<1, Scalar> >;
@@ -67,15 +67,15 @@ SET_PROP(FVVelocity2PTestProblem, FluidSystem)
};
// set the types for the MPFA-O FV method
-NEW_TYPE_TAG(FVMPFAOVelocity2PTestProblem, INHERITS_FROM(FvMpfaO2dPressureTwoP, TestDiffusionSpatialParams));
-//SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, LinearSolver, ILUnBiCGSTABBackend);
-SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, LinearSolver, SSORBiCGSTABBackend);
-SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, Problem, TestDiffusionProblem<TypeTag>);
+NEW_TYPE_TAG(FVMPFAOVelocity2PTestTypeTag, INHERITS_FROM(FvMpfaO2dPressureTwoP, TestDiffusionSpatialParams));
+//SET_TYPE_PROP(FVMPFAOVelocity2PTestTypeTag, LinearSolver, ILUnBiCGSTABBackend);
+SET_TYPE_PROP(FVMPFAOVelocity2PTestTypeTag, LinearSolver, SSORBiCGSTABBackend);
+SET_TYPE_PROP(FVMPFAOVelocity2PTestTypeTag, Problem, TestDiffusionProblem<TypeTag>);
// Set the grid type
-SET_TYPE_PROP(FVMPFAOVelocity2PTestProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(FVMPFAOVelocity2PTestTypeTag, Grid, Dune::YaspGrid<2>);
// Set the fluid system
-SET_PROP(FVMPFAOVelocity2PTestProblem, FluidSystem)
+SET_PROP(FVMPFAOVelocity2PTestTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using WettingPhase = FluidSystems::LiquidPhase<Scalar, Components::Constant<1, Scalar> >;
@@ -84,14 +84,14 @@ SET_PROP(FVMPFAOVelocity2PTestProblem, FluidSystem)
};
// set the types for the mimetic FD method
-NEW_TYPE_TAG(MimeticPressure2PTestProblem, INHERITS_FROM(MimeticPressureTwoP, TestDiffusionSpatialParams));
-SET_TYPE_PROP(MimeticPressure2PTestProblem, Problem, TestDiffusionProblem<TypeTag>);
+NEW_TYPE_TAG(MimeticPressure2PTestTypeTag, INHERITS_FROM(MimeticPressureTwoP, TestDiffusionSpatialParams));
+SET_TYPE_PROP(MimeticPressure2PTestTypeTag, Problem, TestDiffusionProblem<TypeTag>);
// Set the grid type
-SET_TYPE_PROP(MimeticPressure2PTestProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(MimeticPressure2PTestTypeTag, Grid, Dune::YaspGrid<2>);
// Set the fluid system
-SET_PROP(MimeticPressure2PTestProblem, FluidSystem)
+SET_PROP(MimeticPressure2PTestTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using WettingPhase = FluidSystems::LiquidPhase<Scalar, Components::Constant<1, Scalar> >;
diff --git a/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh b/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
index a1bf40154f0f8959c4c379839c9d000da796ae6e..e65a5a23b943d602be3cbca35b5511bdbdf4a2fc 100644
--- a/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
+++ b/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
@@ -46,21 +46,21 @@ class TestDiffusion3DProblem;
//////////
namespace Properties
{
-NEW_TYPE_TAG(DiffusionTestProblem, INHERITS_FROM(SequentialTwoP, TestDiffusionSpatialParams3d));
+NEW_TYPE_TAG(DiffusionTestTypeTag, INHERITS_FROM(SequentialTwoP, TestDiffusionSpatialParams3d));
// Set the grid type
#if HAVE_DUNE_ALUGRID
-SET_TYPE_PROP(DiffusionTestProblem, Grid, Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming>);
+SET_TYPE_PROP(DiffusionTestTypeTag, Grid, Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming>);
#elif HAVE_UG
-SET_TYPE_PROP(DiffusionTestProblem, Grid, Dune::UGGrid<3>);
+SET_TYPE_PROP(DiffusionTestTypeTag, Grid, Dune::UGGrid<3>);
#else
-SET_TYPE_PROP(DiffusionTestProblem, Grid, Dune::YaspGrid<3>);
+SET_TYPE_PROP(DiffusionTestTypeTag, Grid, Dune::YaspGrid<3>);
#endif
-SET_TYPE_PROP(DiffusionTestProblem, Problem, TestDiffusion3DProblem<TypeTag>);
+SET_TYPE_PROP(DiffusionTestTypeTag, Problem, TestDiffusion3DProblem<TypeTag>);
// Set the fluid system
-SET_PROP(DiffusionTestProblem, FluidSystem)
+SET_PROP(DiffusionTestTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using WettingPhase = FluidSystems::LiquidPhase<Scalar, Components::Constant<1, Scalar> >;
@@ -69,23 +69,23 @@ SET_PROP(DiffusionTestProblem, FluidSystem)
};
#if HAVE_SUPERLU
-SET_TYPE_PROP(DiffusionTestProblem, LinearSolver, SuperLUBackend);
+SET_TYPE_PROP(DiffusionTestTypeTag, LinearSolver, SuperLUBackend);
#else
-SET_TYPE_PROP(DiffusionTestProblem, LinearSolver, ILUnRestartedGMResBackend);
-SET_INT_PROP(DiffusionTestProblem, LinearSolverGMResRestart, 80);
-SET_INT_PROP(DiffusionTestProblem, LinearSolverMaxIterations, 1000);
-SET_SCALAR_PROP(DiffusionTestProblem, LinearSolverResidualReduction, 1e-8);
-SET_SCALAR_PROP(DiffusionTestProblem, LinearSolverPreconditionerIterations, 1);
+SET_TYPE_PROP(DiffusionTestTypeTag, LinearSolver, ILUnRestartedGMResBackend);
+SET_INT_PROP(DiffusionTestTypeTag, LinearSolverGMResRestart, 80);
+SET_INT_PROP(DiffusionTestTypeTag, LinearSolverMaxIterations, 1000);
+SET_SCALAR_PROP(DiffusionTestTypeTag, LinearSolverResidualReduction, 1e-8);
+SET_SCALAR_PROP(DiffusionTestTypeTag, LinearSolverPreconditionerIterations, 1);
#endif
// set the types for the 2PFA FV method
-NEW_TYPE_TAG(FVTestProblem, INHERITS_FROM(FVPressureTwoP, DiffusionTestProblem));
+NEW_TYPE_TAG(FVTestTypeTag, INHERITS_FROM(FVPressureTwoP, DiffusionTestTypeTag));
// set the types for the MPFA-L FV method
-NEW_TYPE_TAG(FVMPFAL3DTestProblem, INHERITS_FROM(FvMpfaL3dPressureTwoP, DiffusionTestProblem));
+NEW_TYPE_TAG(FVMPFAL3DTestTypeTag, INHERITS_FROM(FvMpfaL3dPressureTwoP, DiffusionTestTypeTag));
// set the types for the mimetic FD method
-NEW_TYPE_TAG(MimeticTestProblem, INHERITS_FROM(MimeticPressureTwoP, DiffusionTestProblem));
+NEW_TYPE_TAG(MimeticTestTypeTag, INHERITS_FROM(MimeticPressureTwoP, DiffusionTestTypeTag));
}
/*!
diff --git a/test/porousmediumflow/1pnc/implicit/1p2cniconductionproblem.hh b/test/porousmediumflow/1pnc/implicit/1p2cniconductionproblem.hh
index 550a5bcf9e7c98ae58156a3e55b333b68a8f3f7a..6976e78a6fd52b56a48d5b4e5893636d7331a44e 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2cniconductionproblem.hh
+++ b/test/porousmediumflow/1pnc/implicit/1p2cniconductionproblem.hh
@@ -43,31 +43,31 @@ class OnePTwoCNIConductionProblem;
namespace Properties
{
-NEW_TYPE_TAG(OnePTwoCNIConductionProblem, INHERITS_FROM(OnePNCNI));
-NEW_TYPE_TAG(OnePTwoCNIConductionCCTpfaProblem, INHERITS_FROM(CCTpfaModel, OnePTwoCNIConductionProblem));
-NEW_TYPE_TAG(OnePTwoCNIConductionCCMpfaProblem, INHERITS_FROM(CCMpfaModel, OnePTwoCNIConductionProblem));
-NEW_TYPE_TAG(OnePTwoCNIConductionBoxProblem, INHERITS_FROM(BoxModel, OnePTwoCNIConductionProblem));
+NEW_TYPE_TAG(OnePTwoCNIConductionTypeTag, INHERITS_FROM(OnePNCNI));
+NEW_TYPE_TAG(OnePTwoCNIConductionCCTpfaTypeTag, INHERITS_FROM(CCTpfaModel, OnePTwoCNIConductionTypeTag));
+NEW_TYPE_TAG(OnePTwoCNIConductionCCMpfaTypeTag, INHERITS_FROM(CCMpfaModel, OnePTwoCNIConductionTypeTag));
+NEW_TYPE_TAG(OnePTwoCNIConductionBoxTypeTag, INHERITS_FROM(BoxModel, OnePTwoCNIConductionTypeTag));
// Set the grid type
#if HAVE_UG
-SET_TYPE_PROP(OnePTwoCNIConductionProblem, Grid, Dune::UGGrid<2>);
+SET_TYPE_PROP(OnePTwoCNIConductionTypeTag, Grid, Dune::UGGrid<2>);
#else
-SET_TYPE_PROP(OnePTwoCNIConductionProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(OnePTwoCNIConductionTypeTag, Grid, Dune::YaspGrid<2>);
#endif
// Set the problem property
-SET_TYPE_PROP(OnePTwoCNIConductionProblem, Problem, OnePTwoCNIConductionProblem<TypeTag>);
+SET_TYPE_PROP(OnePTwoCNIConductionTypeTag, Problem, OnePTwoCNIConductionProblem<TypeTag>);
// Set fluid configuration
-SET_TYPE_PROP(OnePTwoCNIConductionProblem,
+SET_TYPE_PROP(OnePTwoCNIConductionTypeTag,
FluidSystem,
FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), true>);
// Set the spatial parameters
-SET_TYPE_PROP(OnePTwoCNIConductionProblem, SpatialParams, OnePNCTestSpatialParams<TypeTag>);
+SET_TYPE_PROP(OnePTwoCNIConductionTypeTag, SpatialParams, OnePNCTestSpatialParams<TypeTag>);
// Define whether mole(true) or mass (false) fractions are used
-SET_BOOL_PROP(OnePTwoCNIConductionProblem, UseMoles, true);
+SET_BOOL_PROP(OnePTwoCNIConductionTypeTag, UseMoles, true);
}
diff --git a/test/porousmediumflow/1pnc/implicit/1p2cniconvectionproblem.hh b/test/porousmediumflow/1pnc/implicit/1p2cniconvectionproblem.hh
index 4b9e76c1f4391238ac1e8b21b1e68a70ffc906e7..e6405195607219cb5ec76820b1a67a01c4bf1b4e 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2cniconvectionproblem.hh
+++ b/test/porousmediumflow/1pnc/implicit/1p2cniconvectionproblem.hh
@@ -43,31 +43,31 @@ class OnePTwoCNIConvectionProblem;
namespace Properties
{
-NEW_TYPE_TAG(OnePTwoCNIConvectionProblem, INHERITS_FROM(OnePNCNI));
-NEW_TYPE_TAG(OnePTwoCNIConvectionCCTpfaProblem, INHERITS_FROM(CCTpfaModel, OnePTwoCNIConvectionProblem));
-NEW_TYPE_TAG(OnePTwoCNIConvectionCCMpfaProblem, INHERITS_FROM(CCMpfaModel, OnePTwoCNIConvectionProblem));
-NEW_TYPE_TAG(OnePTwoCNIConvectionBoxProblem, INHERITS_FROM(BoxModel, OnePTwoCNIConvectionProblem));
+NEW_TYPE_TAG(OnePTwoCNIConvectionTypeTag, INHERITS_FROM(OnePNCNI));
+NEW_TYPE_TAG(OnePTwoCNIConvectionCCTpfaTypeTag, INHERITS_FROM(CCTpfaModel, OnePTwoCNIConvectionTypeTag));
+NEW_TYPE_TAG(OnePTwoCNIConvectionCCMpfaTypeTag, INHERITS_FROM(CCMpfaModel, OnePTwoCNIConvectionTypeTag));
+NEW_TYPE_TAG(OnePTwoCNIConvectionBoxTypeTag, INHERITS_FROM(BoxModel, OnePTwoCNIConvectionTypeTag));
// Set the grid type
#if HAVE_UG
-SET_TYPE_PROP(OnePTwoCNIConvectionProblem, Grid, Dune::UGGrid<2>);
+SET_TYPE_PROP(OnePTwoCNIConvectionTypeTag, Grid, Dune::UGGrid<2>);
#else
-SET_TYPE_PROP(OnePTwoCNIConvectionProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(OnePTwoCNIConvectionTypeTag, Grid, Dune::YaspGrid<2>);
#endif
// Set the problem property
-SET_TYPE_PROP(OnePTwoCNIConvectionProblem, Problem, OnePTwoCNIConvectionProblem<TypeTag>);
+SET_TYPE_PROP(OnePTwoCNIConvectionTypeTag, Problem, OnePTwoCNIConvectionProblem<TypeTag>);
// Set fluid configuration
-SET_TYPE_PROP(OnePTwoCNIConvectionProblem,
+SET_TYPE_PROP(OnePTwoCNIConvectionTypeTag,
FluidSystem,
FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), true>);
// Set the spatial parameters
-SET_TYPE_PROP(OnePTwoCNIConvectionProblem, SpatialParams, OnePNCTestSpatialParams<TypeTag>);
+SET_TYPE_PROP(OnePTwoCNIConvectionTypeTag, SpatialParams, OnePNCTestSpatialParams<TypeTag>);
// Define whether mole(true) or mass (false) fractions are used
-SET_BOOL_PROP(OnePTwoCNIConvectionProblem, UseMoles, true);
+SET_BOOL_PROP(OnePTwoCNIConvectionTypeTag, UseMoles, true);
}
diff --git a/test/porousmediumflow/1pnc/implicit/1p2ctestproblem.hh b/test/porousmediumflow/1pnc/implicit/1p2ctestproblem.hh
index d7349db4d17002996eb221608dd965ad80f357c7..6aa5e01fe969a08f25e8552adcb5b2eaa9eea943 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2ctestproblem.hh
+++ b/test/porousmediumflow/1pnc/implicit/1p2ctestproblem.hh
@@ -44,31 +44,31 @@ class OnePTwoCTestProblem;
namespace Properties
{
-NEW_TYPE_TAG(OnePTwoCTestProblem, INHERITS_FROM(OnePNC));
-NEW_TYPE_TAG(OnePTwoCTestBoxProblem, INHERITS_FROM(BoxModel, OnePTwoCTestProblem));
-NEW_TYPE_TAG(OnePTwoCTestCCTpfaProblem, INHERITS_FROM(CCTpfaModel, OnePTwoCTestProblem));
-NEW_TYPE_TAG(OnePTwoCTestCCMpfaProblem, INHERITS_FROM(CCMpfaModel, OnePTwoCTestProblem));
+NEW_TYPE_TAG(OnePTwoCTestTypeTag, INHERITS_FROM(OnePNC));
+NEW_TYPE_TAG(OnePTwoCTestBoxTypeTag, INHERITS_FROM(BoxModel, OnePTwoCTestTypeTag));
+NEW_TYPE_TAG(OnePTwoCTestCCTpfaTypeTag, INHERITS_FROM(CCTpfaModel, OnePTwoCTestTypeTag));
+NEW_TYPE_TAG(OnePTwoCTestCCMpfaTypeTag, INHERITS_FROM(CCMpfaModel, OnePTwoCTestTypeTag));
// Set the grid type
#if HAVE_UG
-SET_TYPE_PROP(OnePTwoCTestProblem, Grid, Dune::UGGrid<2>);
+SET_TYPE_PROP(OnePTwoCTestTypeTag, Grid, Dune::UGGrid<2>);
#else
-SET_TYPE_PROP(OnePTwoCTestProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(OnePTwoCTestTypeTag, Grid, Dune::YaspGrid<2>);
#endif
// Set the problem property
-SET_TYPE_PROP(OnePTwoCTestProblem, Problem, OnePTwoCTestProblem<TypeTag>);
+SET_TYPE_PROP(OnePTwoCTestTypeTag, Problem, OnePTwoCTestProblem<TypeTag>);
// Set fluid configuration
-SET_TYPE_PROP(OnePTwoCTestProblem,
+SET_TYPE_PROP(OnePTwoCTestTypeTag,
FluidSystem,
FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
// Set the spatial parameters
-SET_TYPE_PROP(OnePTwoCTestProblem, SpatialParams, OnePNCTestSpatialParams<TypeTag>);
+SET_TYPE_PROP(OnePTwoCTestTypeTag, SpatialParams, OnePNCTestSpatialParams<TypeTag>);
// Define whether mole(true) or mass (false) fractions are used
-SET_BOOL_PROP(OnePTwoCTestProblem, UseMoles, true);
+SET_BOOL_PROP(OnePTwoCTestTypeTag, UseMoles, true);
}
diff --git a/test/porousmediumflow/1pnc/implicit/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/CMakeLists.txt
index 41b04667c0a3c2bf2adf5ccb334161f7168255e8..3d36101c63320b6329ec3fb2039eb6dc73728a5b 100644
--- a/test/porousmediumflow/1pnc/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/1pnc/implicit/CMakeLists.txt
@@ -2,7 +2,7 @@ add_input_file_links()
dune_add_test(NAME test_1p2c_box
SOURCES test_1p2c_fv.cc
- COMPILE_DEFINITIONS TYPETAG=OnePTwoCTestBoxProblem
+ COMPILE_DEFINITIONS TYPETAG=OnePTwoCTestBoxTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/outflowbox-reference.vtu
@@ -12,7 +12,7 @@ dune_add_test(NAME test_1p2c_box
dune_add_test(NAME test_1p2c_tpfa
SOURCES test_1p2c_fv.cc
- COMPILE_DEFINITIONS TYPETAG=OnePTwoCTestCCTpfaProblem
+ COMPILE_DEFINITIONS TYPETAG=OnePTwoCTestCCTpfaTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1p2ctestcc-reference.vtu
@@ -24,7 +24,7 @@ dune_add_test(NAME test_1p2c_tpfa
# solution where the velocities have been removed.
dune_add_test(NAME test_1p2c_mpfa
SOURCES test_1p2c_fv.cc
- COMPILE_DEFINITIONS TYPETAG=OnePTwoCTestCCMpfaProblem
+ COMPILE_DEFINITIONS TYPETAG=OnePTwoCTestCCMpfaTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1p2ctestmpfa-reference.vtu
@@ -35,7 +35,7 @@ dune_add_test(NAME test_1p2c_mpfa
# conduction
dune_add_test(NAME test_1p2cni_conduction_box
SOURCES test_1p2cni_conduction_fv.cc
- COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConductionBoxProblem
+ COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConductionBoxTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1p2cniboxconduction-reference.vtu
@@ -45,7 +45,7 @@ dune_add_test(NAME test_1p2cni_conduction_box
dune_add_test(NAME test_1p2cni_conduction_tpfa
SOURCES test_1p2cni_conduction_fv.cc
- COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConductionCCTpfaProblem
+ COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConductionCCTpfaTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1p2cniccconduction-reference.vtu
@@ -57,7 +57,7 @@ dune_add_test(NAME test_1p2cni_conduction_tpfa
# solution where the velocities have been removed.
dune_add_test(NAME test_1p2cni_conduction_mpfa
SOURCES test_1p2cni_conduction_fv.cc
- COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConductionCCMpfaProblem
+ COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConductionCCMpfaTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1p2cniccmpfaconduction-reference.vtu
@@ -67,7 +67,7 @@ dune_add_test(NAME test_1p2cni_conduction_mpfa
# convection
dune_add_test(NAME test_1p2cni_convection_box
SOURCES test_1p2cni_convection_fv.cc
- COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionBoxProblem
+ COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionBoxTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1p2cniboxconvection-reference.vtu
@@ -77,7 +77,7 @@ dune_add_test(NAME test_1p2cni_convection_box
dune_add_test(NAME test_1p2cni_convection_tpfa
SOURCES test_1p2cni_convection_fv.cc
- COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionCCTpfaProblem
+ COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionCCTpfaTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1p2cniccconvection-reference.vtu
@@ -89,7 +89,7 @@ dune_add_test(NAME test_1p2cni_convection_tpfa
# solution where the velocities have been removed.
dune_add_test(NAME test_1p2cni_convection_mpfa
SOURCES test_1p2cni_convection_fv.cc
- COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionCCMpfaProblem
+ COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionCCMpfaTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/1p2cniccmpfaconvection-reference.vtu
diff --git a/test/porousmediumflow/1pncmin/implicit/CMakeLists.txt b/test/porousmediumflow/1pncmin/implicit/CMakeLists.txt
index 89ad1f682e230697d8168fb4ae023fc744a8b199..bf7f90d5a799051b3a919339245cf67e7fc89230 100644
--- a/test/porousmediumflow/1pncmin/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/1pncmin/implicit/CMakeLists.txt
@@ -2,7 +2,7 @@ add_input_file_links()
dune_add_test(NAME test_1pncminni_box
SOURCES test_1pncminni_fv.cc
- COMPILE_DEFINITIONS TYPETAG=ThermoChemBoxProblem
+ COMPILE_DEFINITIONS TYPETAG=ThermoChemBoxTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_1pncmin-00064_batch.vtu
diff --git a/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh b/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
index 7bfbe7838065406537f0e23d4a90160ca4058c59..d516c2412c5c12df681963f103538d9f26307996 100644
--- a/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
+++ b/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
@@ -44,28 +44,28 @@ class ThermoChemProblem;
namespace Properties
{
-NEW_TYPE_TAG(ThermoChemProblem, INHERITS_FROM(OnePNCMinNI, ThermoChemSpatialParams));
-NEW_TYPE_TAG(ThermoChemBoxProblem, INHERITS_FROM(BoxModel, ThermoChemProblem));
+NEW_TYPE_TAG(ThermoChemTypeTag, INHERITS_FROM(OnePNCMinNI, ThermoChemSpatialParams));
+NEW_TYPE_TAG(ThermoChemBoxTypeTag, INHERITS_FROM(BoxModel, ThermoChemTypeTag));
// Set the grid type
-SET_TYPE_PROP(ThermoChemProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(ThermoChemTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(ThermoChemProblem, Problem, ThermoChemProblem<TypeTag>);
+SET_TYPE_PROP(ThermoChemTypeTag, Problem, ThermoChemProblem<TypeTag>);
// Set fluid configuration
-SET_PROP(ThermoChemProblem, FluidSystem)
+SET_PROP(ThermoChemTypeTag, FluidSystem)
{ /*private:*/
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using type = FluidSystems::ModifiedSteamN2CaO2H2<Scalar>;
};
// // Enable velocity output
-// SET_BOOL_PROP(ThermoChemProblem, VtkAddVelocity, false);
+// SET_BOOL_PROP(ThermoChemTypeTag, VtkAddVelocity, false);
// Set the spatial parameters
-SET_TYPE_PROP(ThermoChemProblem, SpatialParams, ThermoChemSpatialParams<TypeTag>);
+SET_TYPE_PROP(ThermoChemTypeTag, SpatialParams, ThermoChemSpatialParams<TypeTag>);
// Define whether mole(true) or mass (false) fractions are used
-SET_BOOL_PROP(ThermoChemProblem, UseMoles, true);
+SET_BOOL_PROP(ThermoChemTypeTag, UseMoles, true);
}
/*!
diff --git a/test/porousmediumflow/2p/implicit/fracture/problem.hh b/test/porousmediumflow/2p/implicit/fracture/problem.hh
index 859ea96a764daa62e22c3a0cc1cf0d94cd17073f..597c85334101ba99a87d6b8375eee597d094f3c0 100644
--- a/test/porousmediumflow/2p/implicit/fracture/problem.hh
+++ b/test/porousmediumflow/2p/implicit/fracture/problem.hh
@@ -47,19 +47,19 @@ class FractureProblem;
namespace Properties
{
-NEW_TYPE_TAG(FractureProblem, INHERITS_FROM(TwoP, FractureSpatialParams));
-NEW_TYPE_TAG(FractureBoxTypeTag, INHERITS_FROM(BoxModel, FractureProblem));
-NEW_TYPE_TAG(FractureCCTpfaTypeTag, INHERITS_FROM(CCTpfaModel, FractureProblem));
-NEW_TYPE_TAG(FractureCCMpfaTypeTag, INHERITS_FROM(CCMpfaModel, FractureProblem));
+NEW_TYPE_TAG(FractureTypeTag, INHERITS_FROM(TwoP, FractureSpatialParams));
+NEW_TYPE_TAG(FractureBoxTypeTag, INHERITS_FROM(BoxModel, FractureTypeTag));
+NEW_TYPE_TAG(FractureCCTpfaTypeTag, INHERITS_FROM(CCTpfaModel, FractureTypeTag));
+NEW_TYPE_TAG(FractureCCMpfaTypeTag, INHERITS_FROM(CCMpfaModel, FractureTypeTag));
// set the grid property
-SET_TYPE_PROP(FractureProblem, Grid, Dune::FoamGrid<2, 3>);
+SET_TYPE_PROP(FractureTypeTag, Grid, Dune::FoamGrid<2, 3>);
// Set the problem property
-SET_TYPE_PROP(FractureProblem, Problem, Dumux::FractureProblem<TypeTag>);
+SET_TYPE_PROP(FractureTypeTag, Problem, Dumux::FractureProblem<TypeTag>);
// Set the fluid system
-SET_PROP(FractureProblem, FluidSystem)
+SET_PROP(FractureTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using WettingPhase = FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> >;
@@ -68,12 +68,12 @@ SET_PROP(FractureProblem, FluidSystem)
};
// Use global caching
-SET_BOOL_PROP(FractureProblem, EnableFVGridGeometryCache, true);
-SET_BOOL_PROP(FractureProblem, EnableGridVolumeVariablesCache, true);
-SET_BOOL_PROP(FractureProblem, EnableGridFluxVariablesCache, true);
+SET_BOOL_PROP(FractureTypeTag, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(FractureTypeTag, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(FractureTypeTag, EnableGridFluxVariablesCache, true);
// permeablility is solution-independent
-SET_BOOL_PROP(FractureProblem, SolutionDependentAdvection, false);
+SET_BOOL_PROP(FractureTypeTag, SolutionDependentAdvection, false);
}
/*!
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt
index 03319857616e0de93989f31f157f46f59a52e1be..825f14125079c2bba9a9afa8ac276b17d8d09a87 100644
--- a/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt
+++ b/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt
@@ -4,7 +4,7 @@ dune_add_test(SOURCES test_2pni_fv.cc
NAME test_2pni_box_simplex
CMAKE_GUARD dune-uggrid_FOUND
COMPILE_DEFINITIONS GRIDTYPE=Dune::UGGrid<2>
- COMPILE_DEFINITIONS TYPETAG=InjectionBoxProblem2PNI
+ COMPILE_DEFINITIONS TYPETAG=InjectionBox2PNITypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/injection2pnibox-simplex-reference.vtu
@@ -14,7 +14,7 @@ dune_add_test(SOURCES test_2pni_fv.cc
dune_add_test(SOURCES test_2pni_fv.cc
NAME test_2pni_box_cube
COMPILE_DEFINITIONS GRIDTYPE=Dune::YaspGrid<2>
- COMPILE_DEFINITIONS TYPETAG=InjectionBoxProblem2PNI
+ COMPILE_DEFINITIONS TYPETAG=InjectionBox2PNITypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/injection2pnibox-cube-reference.vtu
@@ -25,7 +25,7 @@ dune_add_test(SOURCES test_2pni_fv.cc
NAME test_2pni_tpfa_simplex
CMAKE_GUARD dune-uggrid_FOUND
COMPILE_DEFINITIONS GRIDTYPE=Dune::UGGrid<2>
- COMPILE_DEFINITIONS TYPETAG=InjectionCCProblem2PNI
+ COMPILE_DEFINITIONS TYPETAG=InjectionCC2PNITypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/injection2pnicc-simplex-reference.vtu
@@ -35,7 +35,7 @@ dune_add_test(SOURCES test_2pni_fv.cc
dune_add_test(SOURCES test_2pni_fv.cc
NAME test_2pni_tpfa_cube
COMPILE_DEFINITIONS GRIDTYPE=Dune::YaspGrid<2>
- COMPILE_DEFINITIONS TYPETAG=InjectionCCProblem2PNI
+ COMPILE_DEFINITIONS TYPETAG=InjectionCC2PNITypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/injection2pnicc-cube-reference.vtu
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh b/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
index f35f3dd1f740700a73c25e1ebbbff4b4e41b40f7..a38c83614612752623c5c0673ee4cfdb905f08a4 100644
--- a/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
+++ b/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
@@ -50,18 +50,18 @@ namespace Dumux {
template <class TypeTag> class InjectionProblem2PNI;
namespace Properties {
-NEW_TYPE_TAG(InjectionProblem2PNI, INHERITS_FROM(TwoPNI, InjectionSpatialParams));
-NEW_TYPE_TAG(InjectionBoxProblem2PNI, INHERITS_FROM(BoxModel, InjectionProblem2PNI));
-NEW_TYPE_TAG(InjectionCCProblem2PNI, INHERITS_FROM(CCTpfaModel, InjectionProblem2PNI));
+NEW_TYPE_TAG(Injection2PNITypeTag, INHERITS_FROM(TwoPNI, InjectionSpatialParams));
+NEW_TYPE_TAG(InjectionBox2PNITypeTag, INHERITS_FROM(BoxModel, Injection2PNITypeTag));
+NEW_TYPE_TAG(InjectionCC2PNITypeTag, INHERITS_FROM(CCTpfaModel, Injection2PNITypeTag));
// Obtain grid type from COMPILE_DEFINITIONS
-SET_TYPE_PROP(InjectionProblem2PNI, Grid, GRIDTYPE);
+SET_TYPE_PROP(Injection2PNITypeTag, Grid, GRIDTYPE);
// Set the problem property
-SET_TYPE_PROP(InjectionProblem2PNI, Problem, InjectionProblem2PNI<TypeTag>);
+SET_TYPE_PROP(Injection2PNITypeTag, Problem, InjectionProblem2PNI<TypeTag>);
// Use the same fluid system as the 2p2c injection problem
-SET_TYPE_PROP(InjectionProblem2PNI, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
+SET_TYPE_PROP(Injection2PNITypeTag, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
} // namespace Properties
/*!
diff --git a/test/porousmediumflow/2p/sequential/test_3d2p.cc b/test/porousmediumflow/2p/sequential/test_3d2p.cc
index 1d0b1a29256e14445df7f5c81bff00d03ad59b1d..2785fa0e912d8a41d48dc641eecc5da83c177076 100644
--- a/test/porousmediumflow/2p/sequential/test_3d2p.cc
+++ b/test/porousmediumflow/2p/sequential/test_3d2p.cc
@@ -69,14 +69,14 @@ int main(int argc, char** argv)
using namespace Dumux;
try {
- auto defaultParams = [] (Dune::ParameterTree& p) {GET_PROP(TTAG(ThreeDTwoPTestProblem), ModelDefaultParameters)::defaultParams(p);};
+ auto defaultParams = [] (Dune::ParameterTree& p) {GET_PROP(TTAG(ThreeDTwoPTestTypeTag), ModelDefaultParameters)::defaultParams(p);};
Parameters::init(argc, argv, defaultParams, usage);
const auto modelType = getParam<std::string>("ModelType", "MPFAL");
if (modelType == "FV")
{
- using ProblemTypeTag = TTAG(FVTwoPTestProblem);
+ using ProblemTypeTag = TTAG(FVTwoPTestTypeTag);
std::cout<<"##########################################" << std::endl;
std::cout<<"Standard finite volume TPFA model" << std::endl;
std::cout<<"##########################################" << std::endl;
@@ -84,7 +84,7 @@ int main(int argc, char** argv)
}
else if (modelType == "FVAdaptive")
{
- using ProblemTypeTag = TTAG(FVAdaptiveTwoPTestProblem);
+ using ProblemTypeTag = TTAG(FVAdaptiveTwoPTestTypeTag);
std::cout<<"##########################################" << std::endl;
std::cout<<"Adapative finite volume TPFA model" << std::endl;
std::cout<<"##########################################" << std::endl;
@@ -92,7 +92,7 @@ int main(int argc, char** argv)
}
else if (modelType == "MPFAL")
{
- using ProblemTypeTag = TTAG(MPFALTwoPTestProblem);
+ using ProblemTypeTag = TTAG(MPFALTwoPTestTypeTag);
std::cout<<"##########################################" << std::endl;
std::cout<<"Standard finite volume MPFA-L model" << std::endl;
std::cout<<"##########################################" << std::endl;
@@ -100,7 +100,7 @@ int main(int argc, char** argv)
}
else if (modelType == "MPFALAdaptive")
{
- using ProblemTypeTag = TTAG(MPFALAdaptiveTwoPTestProblem);
+ using ProblemTypeTag = TTAG(MPFALAdaptiveTwoPTestTypeTag);
std::cout<<"##########################################" << std::endl;
std::cout<<"Adapative finite volume MPFA-L model" << std::endl;
std::cout<<"##########################################" << std::endl;
@@ -109,7 +109,7 @@ int main(int argc, char** argv)
#if PROBLEM != 1
else if (modelType == "Mimetic")
{
- using ProblemTypeTag = TTAG(MimeticTwoPTestProblem);
+ using ProblemTypeTag = TTAG(MimeticTwoPTestTypeTag);
std::cout<<"##########################################" << std::endl;
std::cout<<"Standard mimetic finite difference model" << std::endl;
std::cout<<"##########################################" << std::endl;
@@ -117,7 +117,7 @@ int main(int argc, char** argv)
}
else if (modelType == "MimeticAdaptive")
{
- using ProblemTypeTag = TTAG(MimeticAdaptiveTwoPTestProblem);
+ using ProblemTypeTag = TTAG(MimeticAdaptiveTwoPTestTypeTag);
std::cout<<"##########################################" << std::endl;
std::cout<<"Adaptive mimetic finite difference model" << std::endl;
std::cout<<"##########################################" << std::endl;
@@ -126,7 +126,7 @@ int main(int argc, char** argv)
#endif
else
{
- using ProblemTypeTag = TTAG(MPFALTwoPTestProblem);
+ using ProblemTypeTag = TTAG(MPFALTwoPTestTypeTag);
std::cout<<"##########################################" << std::endl;
std::cout<<"Unknown model type " << modelType << ", default to" << std::endl;
std::cout<<"Standard finite volume MPFA-L model" << std::endl;
diff --git a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
index af7e6b51e2e54a3e583eee54fece976718b3d938..2b8276defc8553112e3e87bc532f3b8dffb6b66d 100644
--- a/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_3d2pproblem.hh
@@ -58,18 +58,18 @@ class Test3D2PProblem;
//////////
namespace Properties
{
-NEW_TYPE_TAG(ThreeDTwoPTestProblem, INHERITS_FROM(SequentialModel, Test3d2pSpatialParams));
+NEW_TYPE_TAG(ThreeDTwoPTestTypeTag, INHERITS_FROM(SequentialModel, Test3d2pSpatialParams));
// Set the grid type
#if HAVE_DUNE_ALUGRID
-SET_TYPE_PROP(ThreeDTwoPTestProblem, Grid, Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming>);
+SET_TYPE_PROP(ThreeDTwoPTestTypeTag, Grid, Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming>);
#endif
// Set the problem property
-SET_TYPE_PROP(ThreeDTwoPTestProblem, Problem, Test3D2PProblem<TypeTag>);
+SET_TYPE_PROP(ThreeDTwoPTestTypeTag, Problem, Test3D2PProblem<TypeTag>);
// Set the fluid system
-SET_PROP(ThreeDTwoPTestProblem, FluidSystem)
+SET_PROP(ThreeDTwoPTestTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using WettingPhase = FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> >;
@@ -78,11 +78,11 @@ SET_PROP(ThreeDTwoPTestProblem, FluidSystem)
};
#if PROBLEM == 1
-SET_INT_PROP(ThreeDTwoPTestProblem, Formulation, SequentialTwoPCommonIndices::pnSw);
+SET_INT_PROP(ThreeDTwoPTestTypeTag, Formulation, SequentialTwoPCommonIndices::pnSw);
#endif
// Set the spatial parameters
-SET_PROP(ThreeDTwoPTestProblem, SpatialParams)
+SET_PROP(ThreeDTwoPTestTypeTag, SpatialParams)
{
private:
using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
@@ -93,17 +93,17 @@ public:
};
#if PROBLEM == 1
-SET_TYPE_PROP(ThreeDTwoPTestProblem, EvalCflFluxFunction, EvalCflFluxCoats<TypeTag>);
+SET_TYPE_PROP(ThreeDTwoPTestTypeTag, EvalCflFluxFunction, EvalCflFluxCoats<TypeTag>);
#endif
-SET_TYPE_PROP(ThreeDTwoPTestProblem, AdaptionIndicator, GridAdaptionIndicator2PLocal<TypeTag>);
+SET_TYPE_PROP(ThreeDTwoPTestTypeTag, AdaptionIndicator, GridAdaptionIndicator2PLocal<TypeTag>);
-NEW_TYPE_TAG(FVTwoPTestProblem, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, ThreeDTwoPTestProblem));
-NEW_TYPE_TAG(FVAdaptiveTwoPTestProblem, INHERITS_FROM(FVPressureTwoPAdaptive, FVTransportTwoP, IMPESTwoPAdaptive, ThreeDTwoPTestProblem));
-NEW_TYPE_TAG(MPFALTwoPTestProblem, INHERITS_FROM(FvMpfaL3dPressureTwoP, FVTransportTwoP, IMPESTwoP, ThreeDTwoPTestProblem));
-NEW_TYPE_TAG(MPFALAdaptiveTwoPTestProblem, INHERITS_FROM(FvMpfaL3dPressureTwoPAdaptive, FVTransportTwoP, IMPESTwoPAdaptive, ThreeDTwoPTestProblem));
-NEW_TYPE_TAG(MimeticTwoPTestProblem, INHERITS_FROM(MimeticPressureTwoP, FVTransportTwoP, IMPESTwoP, ThreeDTwoPTestProblem));
-NEW_TYPE_TAG(MimeticAdaptiveTwoPTestProblem, INHERITS_FROM(MimeticPressureTwoPAdaptive, FVTransportTwoP, IMPESTwoPAdaptive, ThreeDTwoPTestProblem));
+NEW_TYPE_TAG(FVTwoPTestTypeTag, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, ThreeDTwoPTestTypeTag));
+NEW_TYPE_TAG(FVAdaptiveTwoPTestTypeTag, INHERITS_FROM(FVPressureTwoPAdaptive, FVTransportTwoP, IMPESTwoPAdaptive, ThreeDTwoPTestTypeTag));
+NEW_TYPE_TAG(MPFALTwoPTestTypeTag, INHERITS_FROM(FvMpfaL3dPressureTwoP, FVTransportTwoP, IMPESTwoP, ThreeDTwoPTestTypeTag));
+NEW_TYPE_TAG(MPFALAdaptiveTwoPTestTypeTag, INHERITS_FROM(FvMpfaL3dPressureTwoPAdaptive, FVTransportTwoP, IMPESTwoPAdaptive, ThreeDTwoPTestTypeTag));
+NEW_TYPE_TAG(MimeticTwoPTestTypeTag, INHERITS_FROM(MimeticPressureTwoP, FVTransportTwoP, IMPESTwoP, ThreeDTwoPTestTypeTag));
+NEW_TYPE_TAG(MimeticAdaptiveTwoPTestTypeTag, INHERITS_FROM(MimeticPressureTwoPAdaptive, FVTransportTwoP, IMPESTwoPAdaptive, ThreeDTwoPTestTypeTag));
}
/*!
diff --git a/test/porousmediumflow/2p/sequential/test_impes.cc b/test/porousmediumflow/2p/sequential/test_impes.cc
index 43bbdb1ed5e9c1102665b61e1d5e4f23c30c12fb..151387c81462ef8442aab0524128cc67a6735fab 100644
--- a/test/porousmediumflow/2p/sequential/test_impes.cc
+++ b/test/porousmediumflow/2p/sequential/test_impes.cc
@@ -58,6 +58,6 @@ void usage(const char *progName, const std::string &errorMsg)
////////////////////////
int main(int argc, char** argv)
{
- using ProblemTypeTag = TTAG(IMPESTestProblem);
+ using ProblemTypeTag = TTAG(IMPESTestTypeTag);
return Dumux::start<ProblemTypeTag>(argc, argv, usage);
}
diff --git a/test/porousmediumflow/2p/sequential/test_impesadaptive.cc b/test/porousmediumflow/2p/sequential/test_impesadaptive.cc
index f8c1f03d89623bb654442047c5d838b69084a086..5ea1c7c41ceefed0ab94e0c6f4a8ab8fe22e81a4 100644
--- a/test/porousmediumflow/2p/sequential/test_impesadaptive.cc
+++ b/test/porousmediumflow/2p/sequential/test_impesadaptive.cc
@@ -53,7 +53,7 @@ void usage(const char *progName, const std::string &errorMsg)
int main(int argc, char** argv)
{
- using ProblemTypeTag = TTAG(TestIMPESAdaptiveProblem);
+ using ProblemTypeTag = TTAG(TestIMPESAdaptiveTypeTag);
return Dumux::start<ProblemTypeTag>(argc, argv, usage);
}
#else
diff --git a/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh b/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh
index 24350633506f2da9834b25c00e9ffcfe7c541e61..f2164bdf2efaad66a3a8474f3599bd07eb3aba25 100644
--- a/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_impesadaptiveproblem.hh
@@ -48,19 +48,19 @@ class TestIMPESAdaptiveProblem;
//////////
namespace Properties
{
-NEW_TYPE_TAG(TestIMPESAdaptiveProblem, INHERITS_FROM(FVPressureTwoPAdaptive, FVTransportTwoP, IMPESTwoPAdaptive, TestIMPESAdaptiveSpatialParams));
-NEW_TYPE_TAG(TestIMPESAdaptiveRestartProblem, INHERITS_FROM(TestIMPESAdaptiveProblem));
+NEW_TYPE_TAG(TestIMPESAdaptiveTypeTag, INHERITS_FROM(FVPressureTwoPAdaptive, FVTransportTwoP, IMPESTwoPAdaptive, TestIMPESAdaptiveSpatialParams));
+NEW_TYPE_TAG(TestIMPESAdaptiveRestartTypeTag, INHERITS_FROM(TestIMPESAdaptiveTypeTag));
// Set the grid type
#if HAVE_DUNE_ALUGRID
-SET_TYPE_PROP(TestIMPESAdaptiveProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
+SET_TYPE_PROP(TestIMPESAdaptiveTypeTag, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
#endif
// Set the problem property
-SET_TYPE_PROP(TestIMPESAdaptiveProblem, Problem, TestIMPESAdaptiveProblem<TypeTag>);
+SET_TYPE_PROP(TestIMPESAdaptiveTypeTag, Problem, TestIMPESAdaptiveProblem<TypeTag>);
// Set the fluid system
-SET_PROP(TestIMPESAdaptiveProblem, FluidSystem)
+SET_PROP(TestIMPESAdaptiveTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using WettingPhase = FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> >;
diff --git a/test/porousmediumflow/2p/sequential/test_impesadaptiverestart.cc b/test/porousmediumflow/2p/sequential/test_impesadaptiverestart.cc
index cfc7600c05678636c24274c2a4595018931e7780..eee2b362eb4cb6f8d2204652161daf55283458d0 100644
--- a/test/porousmediumflow/2p/sequential/test_impesadaptiverestart.cc
+++ b/test/porousmediumflow/2p/sequential/test_impesadaptiverestart.cc
@@ -51,7 +51,7 @@ void usage(const char *progName, const std::string &errorMsg)
int main(int argc, char** argv)
{
- using ProblemTypeTag = TTAG(TestIMPESAdaptiveRestartProblem);
+ using ProblemTypeTag = TTAG(TestIMPESAdaptiveRestartTypeTag);
return Dumux::start<ProblemTypeTag>(argc, argv, usage);
}
#else
diff --git a/test/porousmediumflow/2p/sequential/test_impesproblem.hh b/test/porousmediumflow/2p/sequential/test_impesproblem.hh
index c7cf63dc907f588f47e314a8c0575382d94251e3..783c0fcd557bedc2d802479ff136215ed6511cae 100644
--- a/test/porousmediumflow/2p/sequential/test_impesproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_impesproblem.hh
@@ -55,36 +55,36 @@ class IMPESTestProblem;
//////////
namespace Properties
{
-NEW_TYPE_TAG(IMPESTestProblem, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, TestIMPESSpatialParams));
+NEW_TYPE_TAG(IMPESTestTypeTag, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, TestIMPESSpatialParams));
// Set the grid type
-SET_TYPE_PROP(IMPESTestProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(IMPESTestTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(IMPESTestProblem, Problem, IMPESTestProblem<TypeTag>);
+SET_TYPE_PROP(IMPESTestTypeTag, Problem, IMPESTestProblem<TypeTag>);
////////////////////////////////////////////////////////////////////////
//Switch to a p_n-S_w formulation
//
-//SET_INT_PROP(IMPESTestProblem, Formulation, SequentialTwoPCommonIndices::pnsn);
+//SET_INT_PROP(IMPESTestTypeTag, Formulation, SequentialTwoPCommonIndices::pnsn);
//
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
//Switch to a p_global-S_w formulation
//
-//SET_INT_PROP(IMPESTestProblem, Formulation, SequentialTwoPCommonIndices::pGlobalSw);
+//SET_INT_PROP(IMPESTestTypeTag, Formulation, SequentialTwoPCommonIndices::pGlobalSw);
//
//Define the capillary pressure term in the transport equation -> only needed in case of a p_global-S_w formulation!
-//SET_TYPE_PROP(IMPESTestProblem, CapillaryFlux, CapillaryDiffusion<TypeTag>);
+//SET_TYPE_PROP(IMPESTestTypeTag, CapillaryFlux, CapillaryDiffusion<TypeTag>);
//
//Define the gravity term in the transport equation -> only needed in case of a p_global-S_w formulation!
-//SET_TYPE_PROP(IMPESTestProblem, GravityFlux, GravityPart<TypeTag>);
+//SET_TYPE_PROP(IMPESTestTypeTag, GravityFlux, GravityPart<TypeTag>);
//
////////////////////////////////////////////////////////////////////////
// Set the fluid system
-SET_PROP(IMPESTestProblem, FluidSystem)
+SET_PROP(IMPESTestTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using WettingPhase = FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> >;
@@ -92,16 +92,16 @@ SET_PROP(IMPESTestProblem, FluidSystem)
using type = FluidSystems::TwoPImmiscible<Scalar, WettingPhase, NonwettingPhase>;
};
-SET_TYPE_PROP(IMPESTestProblem, EvalCflFluxFunction, EvalCflFluxCoats<TypeTag>);
+SET_TYPE_PROP(IMPESTestTypeTag, EvalCflFluxFunction, EvalCflFluxCoats<TypeTag>);
// set up an additional problem where the AMG backend is used
-NEW_TYPE_TAG(IMPESTestProblemWithAMG, INHERITS_FROM(IMPESTestProblem));
+NEW_TYPE_TAG(IMPESTestWithAMGTypeTag, INHERITS_FROM(IMPESTestTypeTag));
// use the AMG backend for the corresponding test
-SET_TYPE_PROP(IMPESTestProblemWithAMG, LinearSolver, AMGBackend<TypeTag>);
+SET_TYPE_PROP(IMPESTestWithAMGTypeTag, LinearSolver, AMGBackend<TypeTag>);
// Set the grid type
-SET_TYPE_PROP(IMPESTestProblemWithAMG, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(IMPESTestWithAMGTypeTag, Grid, Dune::YaspGrid<2>);
// Set the grid creator
-SET_TYPE_PROP(IMPESTestProblemWithAMG, GridCreator, GridCreator<TypeTag>);
+SET_TYPE_PROP(IMPESTestWithAMGTypeTag, GridCreator, GridCreator<TypeTag>);
}
/*!
diff --git a/test/porousmediumflow/2p/sequential/test_impeswithamg.cc b/test/porousmediumflow/2p/sequential/test_impeswithamg.cc
index ddbfa1a5120b6f93da4d47d71cf257bcbbc904ec..7db91fbee1fe7bbcedb190fa1a799ec7669e842d 100644
--- a/test/porousmediumflow/2p/sequential/test_impeswithamg.cc
+++ b/test/porousmediumflow/2p/sequential/test_impeswithamg.cc
@@ -59,6 +59,6 @@ void usage(const char *progName, const std::string &errorMsg)
////////////////////////
int main(int argc, char** argv)
{
- using ProblemTypeTag = TTAG(IMPESTestProblemWithAMG);
+ using ProblemTypeTag = TTAG(IMPESTestWithAMGTypeTag);
return Dumux::start<ProblemTypeTag>(argc, argv, usage);
}
diff --git a/test/porousmediumflow/2p/sequential/test_mpfa2p.cc b/test/porousmediumflow/2p/sequential/test_mpfa2p.cc
index e69f71c331e5814ed2358be6892404d746475947..d3fead0746860e773e795ad89ee81df12d649f49 100644
--- a/test/porousmediumflow/2p/sequential/test_mpfa2p.cc
+++ b/test/porousmediumflow/2p/sequential/test_mpfa2p.cc
@@ -60,14 +60,14 @@ int main(int argc, char** argv)
using namespace Dumux;
try {
- auto defaultParams = [] (Dune::ParameterTree& p) {GET_PROP(TTAG(MPFATwoPTestProblem), ModelDefaultParameters)::defaultParams(p);};
+ auto defaultParams = [] (Dune::ParameterTree& p) {GET_PROP(TTAG(MPFATwoPTestTypeTag), ModelDefaultParameters)::defaultParams(p);};
Parameters::init(argc, argv, defaultParams, usage);
const auto modelType = getParam<std::string>("ModelType", "MPFAL");
if (modelType == "FV")
{
- using ProblemTypeTag = TTAG(FVTwoPTestProblem);
+ using ProblemTypeTag = TTAG(FVTwoPTestTypeTag);
std::cout<<"##########################################" << std::endl;
std::cout<<"Standard finite volume TPFA model" << std::endl;
std::cout<<"##########################################" << std::endl;
@@ -75,7 +75,7 @@ int main(int argc, char** argv)
}
else if (modelType == "FVAdaptive")
{
- using ProblemTypeTag = TTAG(FVAdaptiveTwoPTestProblem);
+ using ProblemTypeTag = TTAG(FVAdaptiveTwoPTestTypeTag);
std::cout<<"##########################################" << std::endl;
std::cout<<"Adaptive finite volume TPFA model" << std::endl;
std::cout<<"##########################################" << std::endl;
@@ -83,7 +83,7 @@ int main(int argc, char** argv)
}
else if (modelType == "MPFAO")
{
- using ProblemTypeTag = TTAG(MPFAOTwoPTestProblem);
+ using ProblemTypeTag = TTAG(MPFAOTwoPTestTypeTag);
std::cout<<"##########################################" << std::endl;
std::cout<<"Standard finite volume MPFA-O model" << std::endl;
std::cout<<"##########################################" << std::endl;
@@ -91,7 +91,7 @@ int main(int argc, char** argv)
}
else if (modelType == "MPFAL")
{
- using ProblemTypeTag = TTAG(MPFALTwoPTestProblem);
+ using ProblemTypeTag = TTAG(MPFALTwoPTestTypeTag);
std::cout<<"##########################################" << std::endl;
std::cout<<"Unknown model type " << modelType << ", default to" << std::endl;
std::cout<<"Standard finite volume MPFA-L model" << std::endl;
@@ -100,7 +100,7 @@ int main(int argc, char** argv)
}
else if (modelType == "MPFALAdaptive")
{
- using ProblemTypeTag = TTAG(MPFALAdaptiveTwoPTestProblem);
+ using ProblemTypeTag = TTAG(MPFALAdaptiveTwoPTestTypeTag);
std::cout<<"##########################################" << std::endl;
std::cout<<"Adaptive finite volume MPFA-L model" << std::endl;
std::cout<<"##########################################" << std::endl;
@@ -108,7 +108,7 @@ int main(int argc, char** argv)
}
else
{
- using ProblemTypeTag = TTAG(MPFAOTwoPTestProblem);
+ using ProblemTypeTag = TTAG(MPFAOTwoPTestTypeTag);
std::cout<<"##########################################" << std::endl;
std::cout<<"Unknown model type " << modelType << ", default to" << std::endl;
std::cout<<"Standard finite volume MPFA-O model" << std::endl;
diff --git a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
index 1778dd523bbecad29aa59142c9c4ff7ae1e2e1a0..8d27847030e2f851dcb5f09ad789656d4f0b0de1 100644
--- a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
@@ -57,20 +57,20 @@ class MPFATwoPTestProblem;
namespace Properties
{
-NEW_TYPE_TAG(MPFATwoPTestProblem, INHERITS_FROM(SequentialModel, Test2PSpatialParams));
+NEW_TYPE_TAG(MPFATwoPTestTypeTag, INHERITS_FROM(SequentialModel, Test2PSpatialParams));
// Set the grid type
#if HAVE_UG
-SET_TYPE_PROP(MPFATwoPTestProblem, Grid, Dune::UGGrid<2>);
+SET_TYPE_PROP(MPFATwoPTestTypeTag, Grid, Dune::UGGrid<2>);
#else
-SET_TYPE_PROP(MPFATwoPTestProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(MPFATwoPTestTypeTag, Grid, Dune::YaspGrid<2>);
#endif
// Set the problem property
-SET_TYPE_PROP(MPFATwoPTestProblem, Problem, MPFATwoPTestProblem<TypeTag>);
+SET_TYPE_PROP(MPFATwoPTestTypeTag, Problem, MPFATwoPTestProblem<TypeTag>);
// Set the fluid system
-SET_PROP(MPFATwoPTestProblem, FluidSystem)
+SET_PROP(MPFATwoPTestTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using WettingPhase = FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> >;
@@ -83,17 +83,17 @@ SET_PROP(MPFATwoPTestProblem, FluidSystem)
};
#if PROBLEM == 1
-SET_INT_PROP(MPFATwoPTestProblem, Formulation, SequentialTwoPCommonIndices::pnsw);
+SET_INT_PROP(MPFATwoPTestTypeTag, Formulation, SequentialTwoPCommonIndices::pnsw);
#endif
-SET_TYPE_PROP(MPFATwoPTestProblem, EvalCflFluxFunction, EvalCflFluxCoats<TypeTag>);
-SET_TYPE_PROP(MPFATwoPTestProblem, AdaptionIndicator, GridAdaptionIndicator2PLocal<TypeTag>);
+SET_TYPE_PROP(MPFATwoPTestTypeTag, EvalCflFluxFunction, EvalCflFluxCoats<TypeTag>);
+SET_TYPE_PROP(MPFATwoPTestTypeTag, AdaptionIndicator, GridAdaptionIndicator2PLocal<TypeTag>);
-NEW_TYPE_TAG(FVTwoPTestProblem, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, MPFATwoPTestProblem));
-NEW_TYPE_TAG(FVAdaptiveTwoPTestProblem, INHERITS_FROM(FVPressureTwoPAdaptive, FVTransportTwoP, IMPESTwoPAdaptive, MPFATwoPTestProblem));
-NEW_TYPE_TAG(MPFAOTwoPTestProblem, INHERITS_FROM(FvMpfaO2dPressureTwoP, FVTransportTwoP, IMPESTwoP, MPFATwoPTestProblem));
-NEW_TYPE_TAG(MPFALTwoPTestProblem, INHERITS_FROM(FvMpfaL2dPressureTwoP, FVTransportTwoP, IMPESTwoP, MPFATwoPTestProblem));
-NEW_TYPE_TAG(MPFALAdaptiveTwoPTestProblem, INHERITS_FROM(FvMpfaL2dPressureTwoPAdaptive, FVTransportTwoP, IMPESTwoPAdaptive, MPFATwoPTestProblem));
+NEW_TYPE_TAG(FVTwoPTestTypeTag, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, MPFATwoPTestTypeTag));
+NEW_TYPE_TAG(FVAdaptiveTwoPTestTypeTag, INHERITS_FROM(FVPressureTwoPAdaptive, FVTransportTwoP, IMPESTwoPAdaptive, MPFATwoPTestTypeTag));
+NEW_TYPE_TAG(MPFAOTwoPTestTypeTag, INHERITS_FROM(FvMpfaO2dPressureTwoP, FVTransportTwoP, IMPESTwoP, MPFATwoPTestTypeTag));
+NEW_TYPE_TAG(MPFALTwoPTestTypeTag, INHERITS_FROM(FvMpfaL2dPressureTwoP, FVTransportTwoP, IMPESTwoP, MPFATwoPTestTypeTag));
+NEW_TYPE_TAG(MPFALAdaptiveTwoPTestTypeTag, INHERITS_FROM(FvMpfaL2dPressureTwoPAdaptive, FVTransportTwoP, IMPESTwoPAdaptive, MPFATwoPTestTypeTag));
}
diff --git a/test/porousmediumflow/2p/sequential/test_transport.cc b/test/porousmediumflow/2p/sequential/test_transport.cc
index 20b79c5257981d420f9203390ea55fae4e534c50..d62f4f0fdaf7770b16361856088f404ca0c746fc 100644
--- a/test/porousmediumflow/2p/sequential/test_transport.cc
+++ b/test/porousmediumflow/2p/sequential/test_transport.cc
@@ -60,6 +60,6 @@ void usage(const char *progName, const std::string &errorMsg)
////////////////////////
int main(int argc, char** argv)
{
- using ProblemTypeTag = TTAG(TransportTestProblem);
+ using ProblemTypeTag = TTAG(TransportTestTypeTag);
return Dumux::start<ProblemTypeTag>(argc, argv, usage);
}
diff --git a/test/porousmediumflow/2p/sequential/test_transportproblem.hh b/test/porousmediumflow/2p/sequential/test_transportproblem.hh
index 952c957bbad35d66c09150ba9265160fcf205c57..02906a30ed9b78d4002e19edcef4818c1379d3ae 100644
--- a/test/porousmediumflow/2p/sequential/test_transportproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_transportproblem.hh
@@ -48,16 +48,16 @@ class TestTransportProblem;
//////////
namespace Properties
{
-NEW_TYPE_TAG(TransportTestProblem, INHERITS_FROM(FVTransportTwoP, TestTransportSpatialParams));
+NEW_TYPE_TAG(TransportTestTypeTag, INHERITS_FROM(FVTransportTwoP, TestTransportSpatialParams));
// Set the grid type
-SET_TYPE_PROP(TransportTestProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(TransportTestTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(TransportTestProblem, Problem, TestTransportProblem<TypeTag>);
+SET_TYPE_PROP(TransportTestTypeTag, Problem, TestTransportProblem<TypeTag>);
// Set the fluid system
-SET_PROP(TransportTestProblem, FluidSystem)
+SET_PROP(TransportTestTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using WettingPhase = FluidSystems::LiquidPhase<Scalar, Components::Constant<1, Scalar> >;
@@ -65,7 +65,7 @@ SET_PROP(TransportTestProblem, FluidSystem)
using type = FluidSystems::TwoPImmiscible<Scalar, WettingPhase, NonwettingPhase>;
};
-SET_INT_PROP(TransportTestProblem, VelocityFormulation, SequentialTwoPCommonIndices::velocityTotal);
+SET_INT_PROP(TransportTestTypeTag, VelocityFormulation, SequentialTwoPCommonIndices::velocityTotal);
}
/*!
diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/2p2c_comparison_problem.hh b/test/porousmediumflow/2p2c/implicit/mpnccomparison/2p2c_comparison_problem.hh
index be7623bebbe573f844ba7056cc3dae76bb22a201..054396b5e5e1427c9084e7bf38144bcd438ba15f 100644
--- a/test/porousmediumflow/2p2c/implicit/mpnccomparison/2p2c_comparison_problem.hh
+++ b/test/porousmediumflow/2p2c/implicit/mpnccomparison/2p2c_comparison_problem.hh
@@ -49,30 +49,30 @@ class TwoPTwoCComparisonProblem;
namespace Properties
{
-NEW_TYPE_TAG(TwoPTwoCComparisonProblem, INHERITS_FROM(TwoPTwoC, TwoPTwoCComparisonSpatialParams));
-NEW_TYPE_TAG(TwoPTwoCComparisonBoxProblem, INHERITS_FROM(BoxModel, TwoPTwoCComparisonProblem));
-NEW_TYPE_TAG(TwoPTwoCComparisonCCProblem, INHERITS_FROM(CCTpfaModel, TwoPTwoCComparisonProblem));
+NEW_TYPE_TAG(TwoPTwoCComparisonTypeTag, INHERITS_FROM(TwoPTwoC, TwoPTwoCComparisonSpatialParams));
+NEW_TYPE_TAG(TwoPTwoCComparisonBoxTypeTag, INHERITS_FROM(BoxModel, TwoPTwoCComparisonTypeTag));
+NEW_TYPE_TAG(TwoPTwoCComparisonCCTypeTag, INHERITS_FROM(CCTpfaModel, TwoPTwoCComparisonTypeTag));
// Set the grid type
-SET_TYPE_PROP(TwoPTwoCComparisonProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(TwoPTwoCComparisonTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(TwoPTwoCComparisonProblem,
+SET_TYPE_PROP(TwoPTwoCComparisonTypeTag,
Problem,
TwoPTwoCComparisonProblem<TypeTag>);
// Set fluid configuration
-SET_TYPE_PROP(TwoPTwoCComparisonProblem,
+SET_TYPE_PROP(TwoPTwoCComparisonTypeTag,
FluidSystem,
FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), /*useComplexRelations=*/false>);
// decide which type to use for floating values (double / quad)
-SET_TYPE_PROP(TwoPTwoCComparisonProblem, Scalar, double);
-SET_INT_PROP(TwoPTwoCComparisonProblem, Formulation, TwoPTwoCFormulation::pnsw);
+SET_TYPE_PROP(TwoPTwoCComparisonTypeTag, Scalar, double);
+SET_INT_PROP(TwoPTwoCComparisonTypeTag, Formulation, TwoPTwoCFormulation::pnsw);
-SET_BOOL_PROP(TwoPTwoCComparisonProblem, UseMoles, true);
+SET_BOOL_PROP(TwoPTwoCComparisonTypeTag, UseMoles, true);
-SET_TYPE_PROP(TwoPTwoCComparisonProblem, VtkOutputFields, TwoPTwoCMPNCVtkOutputFields<TypeTag>);
+SET_TYPE_PROP(TwoPTwoCComparisonTypeTag, VtkOutputFields, TwoPTwoCMPNCVtkOutputFields<TypeTag>);
}
diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/CMakeLists.txt b/test/porousmediumflow/2p2c/implicit/mpnccomparison/CMakeLists.txt
index b6423cfd07a2bab69c7b27361ca6c29e2243caf5..f8b4901c49bfb033ea6bc4593ab1631446efae1c 100644
--- a/test/porousmediumflow/2p2c/implicit/mpnccomparison/CMakeLists.txt
+++ b/test/porousmediumflow/2p2c/implicit/mpnccomparison/CMakeLists.txt
@@ -2,7 +2,7 @@ add_input_file_links()
dune_add_test(SOURCES test_2p2c_comparison_fv.cc
NAME test_2p2c_comparison_box
- COMPILE_DEFINITIONS TYPETAG=TwoPTwoCComparisonBoxProblem
+ COMPILE_DEFINITIONS TYPETAG=TwoPTwoCComparisonBoxTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/mpnc_2p2c_box-reference.vtu
@@ -11,7 +11,7 @@ dune_add_test(SOURCES test_2p2c_comparison_fv.cc
dune_add_test(SOURCES test_2p2c_comparison_fv.cc
NAME test_2p2c_comparison_tpfa
- COMPILE_DEFINITIONS TYPETAG=TwoPTwoCComparisonCCProblem
+ COMPILE_DEFINITIONS TYPETAG=TwoPTwoCComparisonCCTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/mpnc_2p2c_tpfa-reference.vtu
diff --git a/test/porousmediumflow/2p2c/sequential/test_dec2p2c.cc b/test/porousmediumflow/2p2c/sequential/test_dec2p2c.cc
index 92f3017a6081273c1cf75cb8e0f4a463df1bae72..79b84d3af49aca3ee4fd73eb92428a678b7a75d0 100644
--- a/test/porousmediumflow/2p2c/sequential/test_dec2p2c.cc
+++ b/test/porousmediumflow/2p2c/sequential/test_dec2p2c.cc
@@ -59,6 +59,6 @@ void usage(const char *progName, const std::string &errorMsg)
////////////////////////
int main(int argc, char** argv)
{
- using ProblemTypeTag = TTAG(TestDecTwoPTwoCProblem);
+ using ProblemTypeTag = TTAG(TestDecTwoPTwoCTypeTag);
return Dumux::start<ProblemTypeTag>(argc, argv, usage);
}
diff --git a/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh b/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
index 59ee826bf93e4e1d4f72e5044610ef5429d55051..3d57ec0452717e6bbe0afede2416eb83f7afcd35 100644
--- a/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
@@ -45,31 +45,31 @@ class TestDecTwoPTwoCProblem;
// Specify the properties
namespace Properties
{
-NEW_TYPE_TAG(TestDecTwoPTwoCProblem, INHERITS_FROM(SequentialTwoPTwoC, Test2P2CSpatialParams));
+NEW_TYPE_TAG(TestDecTwoPTwoCTypeTag, INHERITS_FROM(SequentialTwoPTwoC, Test2P2CSpatialParams));
// Set the grid type
-SET_TYPE_PROP(TestDecTwoPTwoCProblem, Grid, Dune::YaspGrid<3>);
+SET_TYPE_PROP(TestDecTwoPTwoCTypeTag, Grid, Dune::YaspGrid<3>);
// Set the problem property
-SET_TYPE_PROP(TestDecTwoPTwoCProblem, Problem, TestDecTwoPTwoCProblem<TypeTag>);
+SET_TYPE_PROP(TestDecTwoPTwoCTypeTag, Problem, TestDecTwoPTwoCProblem<TypeTag>);
// Set the model properties
-SET_TYPE_PROP(TestDecTwoPTwoCProblem, TransportModel, FVTransport2P2C<TypeTag>);
+SET_TYPE_PROP(TestDecTwoPTwoCTypeTag, TransportModel, FVTransport2P2C<TypeTag>);
-SET_TYPE_PROP(TestDecTwoPTwoCProblem, PressureModel,FVPressure2P2C<TypeTag>);
+SET_TYPE_PROP(TestDecTwoPTwoCTypeTag, PressureModel,FVPressure2P2C<TypeTag>);
-SET_INT_PROP(TestDecTwoPTwoCProblem, PressureFormulation, GET_PROP_TYPE(TypeTag, Indices)::pressureN);
+SET_INT_PROP(TestDecTwoPTwoCTypeTag, PressureFormulation, GET_PROP_TYPE(TypeTag, Indices)::pressureN);
// Select fluid system
-SET_PROP(TestDecTwoPTwoCProblem, FluidSystem)
+SET_PROP(TestDecTwoPTwoCTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using type = FluidSystems::H2OAir<Scalar, H2O<Scalar>, /*useComplexRelations=*/true>;
};
-SET_BOOL_PROP(TestDecTwoPTwoCProblem, EnableCapillarity, true);
-SET_INT_PROP(TestDecTwoPTwoCProblem, BoundaryMobility, GET_PROP_TYPE(TypeTag, Indices)::satDependent);
+SET_BOOL_PROP(TestDecTwoPTwoCTypeTag, EnableCapillarity, true);
+SET_INT_PROP(TestDecTwoPTwoCTypeTag, BoundaryMobility, GET_PROP_TYPE(TypeTag, Indices)::satDependent);
}
/*!
diff --git a/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2c.cc b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2c.cc
index 3f8b22d6907491db3c697a96b55ff0852aa66a4f..38c24d8338f743b8a66a1efcd2c6c93aa4a9a203 100644
--- a/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2c.cc
+++ b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2c.cc
@@ -45,7 +45,7 @@ void usage(const char *progname, const std::string &errorMsg = "")
int main(int argc, char** argv)
{
try {
- using TypeTag = TTAG(TestMultTwoPTwoCProblem);
+ using TypeTag = TTAG(TestMultTwoPTwoCTypeTag);
using Grid = GET_PROP_TYPE(TypeTag, Grid);
using Problem = GET_PROP_TYPE(TypeTag, Problem);
using TimeManager = GET_PROP_TYPE(TypeTag, TimeManager);
diff --git a/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
index f9454f15e1642d1d0d264eadee861c502371bd33..6b9e093b22e2936d93f5de73800269ddfe7afc5c 100644
--- a/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
@@ -46,32 +46,32 @@ class TestMultTwoPTwoCProblem;
// Specify the properties
namespace Properties
{
-NEW_TYPE_TAG(TestMultTwoPTwoCProblem, INHERITS_FROM(SequentialTwoPTwoC, Test2P2CSpatialParams));
+NEW_TYPE_TAG(TestMultTwoPTwoCTypeTag, INHERITS_FROM(SequentialTwoPTwoC, Test2P2CSpatialParams));
-SET_TYPE_PROP(TestMultTwoPTwoCProblem, CellData, CellData2P2CMultiPhysics<TypeTag>);
+SET_TYPE_PROP(TestMultTwoPTwoCTypeTag, CellData, CellData2P2CMultiPhysics<TypeTag>);
// Set the grid type
-SET_TYPE_PROP(TestMultTwoPTwoCProblem, Grid, Dune::YaspGrid<3>);
+SET_TYPE_PROP(TestMultTwoPTwoCTypeTag, Grid, Dune::YaspGrid<3>);
// Set the problem property
-SET_TYPE_PROP(TestMultTwoPTwoCProblem, Problem, TestMultTwoPTwoCProblem<TypeTag>);
+SET_TYPE_PROP(TestMultTwoPTwoCTypeTag, Problem, TestMultTwoPTwoCProblem<TypeTag>);
// Set the model properties
-SET_TYPE_PROP(TestMultTwoPTwoCProblem, TransportModel,FVTransport2P2CMultiPhysics<TypeTag>);
+SET_TYPE_PROP(TestMultTwoPTwoCTypeTag, TransportModel,FVTransport2P2CMultiPhysics<TypeTag>);
-SET_TYPE_PROP(TestMultTwoPTwoCProblem, PressureModel, FVPressure2P2CMultiPhysics<TypeTag>);
+SET_TYPE_PROP(TestMultTwoPTwoCTypeTag, PressureModel, FVPressure2P2CMultiPhysics<TypeTag>);
-SET_INT_PROP(TestMultTwoPTwoCProblem, PressureFormulation, GET_PROP_TYPE(TypeTag, Indices)::pressureNw);
+SET_INT_PROP(TestMultTwoPTwoCTypeTag, PressureFormulation, GET_PROP_TYPE(TypeTag, Indices)::pressureNw);
// Select fluid system
-SET_PROP(TestMultTwoPTwoCProblem, FluidSystem)
+SET_PROP(TestMultTwoPTwoCTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using type = FluidSystems::H2OAir<Scalar, H2O<Scalar>, /*useComplexRelations=*/true>;
};
-SET_BOOL_PROP(TestMultTwoPTwoCProblem, EnableCapillarity, true);
-SET_INT_PROP(TestMultTwoPTwoCProblem, BoundaryMobility, GET_PROP_TYPE(TypeTag, Indices)::satDependent);
+SET_BOOL_PROP(TestMultTwoPTwoCTypeTag, EnableCapillarity, true);
+SET_INT_PROP(TestMultTwoPTwoCTypeTag, BoundaryMobility, GET_PROP_TYPE(TypeTag, Indices)::satDependent);
}
/*!
diff --git a/test/porousmediumflow/2pnc/implicit/2pncdiffusionproblem.hh b/test/porousmediumflow/2pnc/implicit/2pncdiffusionproblem.hh
index 33de974b751ee203669a9d572e915d4736aa4fee..74c5dd59f4850c8ef3910d12e55742db45e114ae 100644
--- a/test/porousmediumflow/2pnc/implicit/2pncdiffusionproblem.hh
+++ b/test/porousmediumflow/2pnc/implicit/2pncdiffusionproblem.hh
@@ -45,28 +45,28 @@ class TwoPNCDiffusionProblem;
namespace Properties
{
-NEW_TYPE_TAG(TwoPNCDiffusionProblem, INHERITS_FROM(TwoPNC, TwoPNCDiffusionSpatialParams));
-NEW_TYPE_TAG(TwoPNCDiffusionCCProblem, INHERITS_FROM(CCTpfaModel, TwoPNCDiffusionProblem));
+NEW_TYPE_TAG(TwoPNCDiffusionTypeTag, INHERITS_FROM(TwoPNC, TwoPNCDiffusionSpatialParams));
+NEW_TYPE_TAG(TwoPNCDiffusionCCTypeTag, INHERITS_FROM(CCTpfaModel, TwoPNCDiffusionTypeTag));
// Set the grid type
-SET_TYPE_PROP(TwoPNCDiffusionProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(TwoPNCDiffusionTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(TwoPNCDiffusionProblem, Problem, TwoPNCDiffusionProblem<TypeTag>);
+SET_TYPE_PROP(TwoPNCDiffusionTypeTag, Problem, TwoPNCDiffusionProblem<TypeTag>);
// // Set fluid configuration
-SET_TYPE_PROP(TwoPNCDiffusionProblem,
+SET_TYPE_PROP(TwoPNCDiffusionTypeTag,
FluidSystem,
FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false /*useComplexRelations*/>);
// Define whether mole(true) or mass (false) fractions are used
-SET_BOOL_PROP(TwoPNCDiffusionProblem, UseMoles, true);
+SET_BOOL_PROP(TwoPNCDiffusionTypeTag, UseMoles, true);
//! Here we set FicksLaw or TwoPNCDiffusionsLaw
-SET_TYPE_PROP(TwoPNCDiffusionProblem, MolecularDiffusionType, DIFFUSIONTYPE);
+SET_TYPE_PROP(TwoPNCDiffusionTypeTag, MolecularDiffusionType, DIFFUSIONTYPE);
//! Set the default formulation to pw-Sn: This can be over written in the problem.
-SET_INT_PROP(TwoPNCDiffusionProblem, Formulation, TwoPNCFormulation::pwsn);
+SET_INT_PROP(TwoPNCDiffusionTypeTag, Formulation, TwoPNCFormulation::pwsn);
}
diff --git a/test/porousmediumflow/2pnc/implicit/CMakeLists.txt b/test/porousmediumflow/2pnc/implicit/CMakeLists.txt
index 6b5d5ba73229a4cf3451254e458ed665e50ed17d..aebb4f6969382df8359ee7d9577f4a34a9492e64 100644
--- a/test/porousmediumflow/2pnc/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/2pnc/implicit/CMakeLists.txt
@@ -21,7 +21,7 @@ dune_add_test(NAME test_2pnc_tpfa
dune_add_test(NAME test_cc2pnc_maxwellstefan
SOURCES test_cc2pnc_diffusion.cc
- COMPILE_DEFINITIONS TYPETAG=TwoPNCDiffusionProblem DIFFUSIONTYPE=MaxwellStefansLaw<TypeTag>
+ COMPILE_DEFINITIONS TYPETAG=TwoPNCDiffusionTypeTag DIFFUSIONTYPE=MaxwellStefansLaw<TypeTag>
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/2pncdiffusioncc-reference.vtu
@@ -30,7 +30,7 @@ dune_add_test(NAME test_cc2pnc_maxwellstefan
dune_add_test(NAME test_cc2pnc_fickslaw
SOURCES test_cc2pnc_diffusion.cc
- COMPILE_DEFINITIONS TYPETAG=TwoPNCDiffusionProblem DIFFUSIONTYPE=FicksLaw<TypeTag>
+ COMPILE_DEFINITIONS TYPETAG=TwoPNCDiffusionTypeTag DIFFUSIONTYPE=FicksLaw<TypeTag>
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/2pncdiffusioncc-reference.vtu
diff --git a/test/porousmediumflow/2pnc/implicit/test_cc2pnc_diffusion.cc b/test/porousmediumflow/2pnc/implicit/test_cc2pnc_diffusion.cc
index 3c71a516d4586be1d6a48d65f420f6833fc451c9..88ee0bfbbe0af2dbe61d95e6dfecece4ffa6c211 100644
--- a/test/porousmediumflow/2pnc/implicit/test_cc2pnc_diffusion.cc
+++ b/test/porousmediumflow/2pnc/implicit/test_cc2pnc_diffusion.cc
@@ -79,7 +79,7 @@ int main(int argc, char** argv) try
using namespace Dumux;
// define the type tag for this problem
- using TypeTag = TTAG(TwoPNCDiffusionCCProblem);
+ using TypeTag = TTAG(TwoPNCDiffusionCCTypeTag);
// initialize MPI, finalize is done automatically on exit
const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
diff --git a/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdproblem.hh b/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdproblem.hh
index 8fd14728f0697459536a1d9cd1e4ca50bb3fdf8b..e623cad20ecb1ecd504ffb49dee93f6f83ea11f0 100644
--- a/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdproblem.hh
+++ b/test/porousmediumflow/3pwateroil/implicit/3pwateroilsagdproblem.hh
@@ -43,23 +43,23 @@ class SagdProblem;
namespace Properties
{
-NEW_TYPE_TAG(SagdProblem, INHERITS_FROM(ThreePWaterOilNI, SagdSpatialParams));
-NEW_TYPE_TAG(ThreePWaterOilSagdBoxProblem, INHERITS_FROM(BoxModel, SagdProblem));
+NEW_TYPE_TAG(SagdTypeTag, INHERITS_FROM(ThreePWaterOilNI, SagdSpatialParams));
+NEW_TYPE_TAG(ThreePWaterOilSagdBoxTypeTag, INHERITS_FROM(BoxModel, SagdTypeTag));
// Set the grid type
-SET_TYPE_PROP(SagdProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(SagdTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(SagdProblem, Problem, Dumux::SagdProblem<TypeTag>);
+SET_TYPE_PROP(SagdTypeTag, Problem, Dumux::SagdProblem<TypeTag>);
// Set the fluid system
-SET_TYPE_PROP(SagdProblem,
+SET_TYPE_PROP(SagdTypeTag,
FluidSystem,
Dumux::FluidSystems::H2OHeavyOil<typename GET_PROP_TYPE(TypeTag, Scalar)>);
-SET_BOOL_PROP(SagdProblem, OnlyGasPhaseCanDisappear, true);
+SET_BOOL_PROP(SagdTypeTag, OnlyGasPhaseCanDisappear, true);
-SET_BOOL_PROP(SagdProblem, UseMoles, true);
+SET_BOOL_PROP(SagdTypeTag, UseMoles, true);
}
diff --git a/test/porousmediumflow/3pwateroil/implicit/CMakeLists.txt b/test/porousmediumflow/3pwateroil/implicit/CMakeLists.txt
index f902e222a3cbd0a145eab5d0d81da4add741f612..a001f6a18d52054e6b243a2fc824cee0e5042cb7 100644
--- a/test/porousmediumflow/3pwateroil/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/3pwateroil/implicit/CMakeLists.txt
@@ -2,7 +2,7 @@ add_input_file_links()
dune_add_test(NAME test_box3pwateroil
SOURCES test_box3pwateroil.cc
- COMPILE_DEFINITIONS TYPETAG=ThreePWaterOilSagdBoxProblem
+ COMPILE_DEFINITIONS TYPETAG=ThreePWaterOilSagdBoxTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/3pwateroilbox-reference.vtu
diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/CMakeLists.txt
index b385e900529a7af019a12c75f330ee13256940b1..177341d63a709fb7cd557edf0376e72d4aea8a9c 100644
--- a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/CMakeLists.txt
+++ b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/CMakeLists.txt
@@ -2,7 +2,7 @@ add_input_file_links()
dune_add_test(NAME test_mpnc_comparison_box
SOURCES test_mpnc_comparison_fv.cc
- COMPILE_DEFINITIONS TYPETAG=MPNCComparisonBoxProblem
+ COMPILE_DEFINITIONS TYPETAG=MPNCComparisonBoxTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/mpnc_2p2c_box-reference.vtu
@@ -11,7 +11,7 @@ dune_add_test(NAME test_mpnc_comparison_box
dune_add_test(NAME test_mpnc_comparison_tpfa
SOURCES test_mpnc_comparison_fv.cc
- COMPILE_DEFINITIONS TYPETAG=MPNCComparisonCCProblem
+ COMPILE_DEFINITIONS TYPETAG=MPNCComparisonCCTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/mpnc_2p2c_tpfa-reference.vtu
diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/mpnc_comparison_problem.hh b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/mpnc_comparison_problem.hh
index 99a7f7bb451d6d2d451220a7c1a2d2cd5196ba2d..1a8a78ce95022408e5c90a5b27737726f9e27cc2 100644
--- a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/mpnc_comparison_problem.hh
+++ b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/mpnc_comparison_problem.hh
@@ -50,30 +50,30 @@ class MPNCComparisonProblem;
namespace Properties
{
-NEW_TYPE_TAG(MPNCComparisonProblem, INHERITS_FROM(MPNC, MPNCComparisonSpatialParams));
-NEW_TYPE_TAG(MPNCComparisonBoxProblem, INHERITS_FROM(BoxModel, MPNCComparisonProblem));
-NEW_TYPE_TAG(MPNCComparisonCCProblem, INHERITS_FROM(CCTpfaModel, MPNCComparisonProblem));
+NEW_TYPE_TAG(MPNCComparisonTypeTag, INHERITS_FROM(MPNC, MPNCComparisonSpatialParams));
+NEW_TYPE_TAG(MPNCComparisonBoxTypeTag, INHERITS_FROM(BoxModel, MPNCComparisonTypeTag));
+NEW_TYPE_TAG(MPNCComparisonCCTypeTag, INHERITS_FROM(CCTpfaModel, MPNCComparisonTypeTag));
// Set the grid type
-SET_TYPE_PROP(MPNCComparisonProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(MPNCComparisonTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(MPNCComparisonProblem,
+SET_TYPE_PROP(MPNCComparisonTypeTag,
Problem,
MPNCComparisonProblem<TypeTag>);
// Set fluid configuration
-SET_TYPE_PROP(MPNCComparisonProblem,
+SET_TYPE_PROP(MPNCComparisonTypeTag,
FluidSystem,
FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), /*useComplexRelations=*/false>);
// decide which type to use for floating values (double / quad)
-SET_TYPE_PROP(MPNCComparisonProblem, Scalar, double);
+SET_TYPE_PROP(MPNCComparisonTypeTag, Scalar, double);
-SET_BOOL_PROP(MPNCComparisonProblem, EnableMolecularDiffusion, true);
+SET_BOOL_PROP(MPNCComparisonTypeTag, EnableMolecularDiffusion, true);
-SET_BOOL_PROP(MPNCComparisonProblem, UseMoles, true);
-SET_TYPE_PROP(MPNCComparisonProblem, VtkOutputFields, TwoPTwoCMPNCVtkOutputFields<TypeTag>);
+SET_BOOL_PROP(MPNCComparisonTypeTag, UseMoles, true);
+SET_TYPE_PROP(MPNCComparisonTypeTag, VtkOutputFields, TwoPTwoCMPNCVtkOutputFields<TypeTag>);
}
diff --git a/test/porousmediumflow/mpnc/implicit/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/CMakeLists.txt
index 276f04953f999fffe9abba6aa79f53973d91847f..0c400f8bdf9354975585bd38b268900f2958b4b7 100644
--- a/test/porousmediumflow/mpnc/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/mpnc/implicit/CMakeLists.txt
@@ -3,7 +3,7 @@ add_input_file_links()
dune_add_test(NAME test_mpnc_box
SOURCES test_mpnc_obstacle_fv.cc
- COMPILE_DEFINITIONS TYPETAG=ObstacleBoxProblem
+ COMPILE_DEFINITIONS TYPETAG=ObstacleBoxTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/obstaclebox-reference.vtu
@@ -12,7 +12,7 @@ dune_add_test(NAME test_mpnc_box
dune_add_test(NAME test_mpnc_tpfa
SOURCES test_mpnc_obstacle_fv.cc
- COMPILE_DEFINITIONS TYPETAG=ObstacleCCProblem
+ COMPILE_DEFINITIONS TYPETAG=ObstacleCCTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/obstaclecc-reference.vtu
@@ -21,7 +21,7 @@ dune_add_test(NAME test_mpnc_tpfa
# build target for the full kinetic test problem
dune_add_test(NAME test_mpnckinetic_box
SOURCES test_boxmpnckinetic.cc
- COMPILE_DEFINITIONS TYPETAG=EvaporationAtmosphereBoxProblem
+ COMPILE_DEFINITIONS TYPETAG=EvaporationAtmosphereBoxTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/evaporationatmosphere-reference.vtu
@@ -32,7 +32,7 @@ dune_add_test(NAME test_mpnckinetic_box
dune_add_test(COMPILE_ONLY # since it currently fails miserably with very different results on different machines
NAME test_mpncthermalnonequil_box
SOURCES test_boxmpncthermalnonequil.cc
- COMPILE_DEFINITIONS TYPETAG=CombustionProblemOneComponentBoxProblem
+ COMPILE_DEFINITIONS TYPETAG=CombustionOneComponentBoxTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/combustion-reference.vtp
diff --git a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
index 59a80669e08f9b6fd5758fc91326e1a986d9ca6e..91f9d57adaab3feedddecce8714301ed975b7a47 100644
--- a/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
+++ b/test/porousmediumflow/mpnc/implicit/combustionproblem1c.hh
@@ -46,35 +46,35 @@ class CombustionProblemOneComponent;
namespace Properties
{
-NEW_TYPE_TAG(CombustionProblemOneComponent, INHERITS_FROM(MPNCNonequil, CombustionSpatialParams));
-NEW_TYPE_TAG(CombustionProblemOneComponentBoxProblem, INHERITS_FROM(BoxModel, CombustionProblemOneComponent));
+NEW_TYPE_TAG(CombustionOneComponentTypeTag, INHERITS_FROM(MPNCNonequil, CombustionSpatialParams));
+NEW_TYPE_TAG(CombustionOneComponentBoxTypeTag, INHERITS_FROM(BoxModel, CombustionOneComponentTypeTag));
// Set the grid type
-SET_TYPE_PROP(CombustionProblemOneComponent, Grid, Dune::OneDGrid);
+SET_TYPE_PROP(CombustionOneComponentTypeTag, Grid, Dune::OneDGrid);
// Set the problem property
-SET_TYPE_PROP(CombustionProblemOneComponent,
+SET_TYPE_PROP(CombustionOneComponentTypeTag,
Problem,
CombustionProblemOneComponent<TypeTag>);
-SET_TYPE_PROP(CombustionProblemOneComponent,
+SET_TYPE_PROP(CombustionOneComponentTypeTag,
FluidSystem,
FluidSystems::PureWaterSimpleFluidSystem<typename GET_PROP_TYPE(TypeTag, Scalar), /*useComplexRelations=*/false>);
//! Set the default pressure formulation: either pw first or pn first
-SET_INT_PROP(CombustionProblemOneComponent,
+SET_INT_PROP(CombustionOneComponentTypeTag,
PressureFormulation,
MpNcPressureFormulation::mostWettingFirst);
// Set the type used for scalar values
-SET_TYPE_PROP(CombustionProblemOneComponent, Scalar, double );
+SET_TYPE_PROP(CombustionOneComponentTypeTag, Scalar, double );
// quad / double
// Specify whether diffusion is enabled
-SET_BOOL_PROP(CombustionProblemOneComponent, EnableMolecularDiffusion, false);
+SET_BOOL_PROP(CombustionOneComponentTypeTag, EnableMolecularDiffusion, false);
//! Franz Lindners simple lumping
-SET_PROP(CombustionProblemOneComponent, ThermalConductivityModel)
+SET_PROP(CombustionOneComponentTypeTag, ThermalConductivityModel)
{
private:
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
@@ -83,7 +83,7 @@ public:
using type = ThermalConductivitySimpleFluidLumping<TypeTag, Scalar, Indices>;
};
-SET_PROP(CombustionProblemOneComponent, FluidState)
+SET_PROP(CombustionOneComponentTypeTag, FluidState)
{
private:
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
@@ -94,12 +94,12 @@ public:
//#################
//changes from the default settings which also assume chemical non-equilibrium
//set the number of energyequations we want to use
-SET_INT_PROP(CombustionProblemOneComponent, NumEnergyEqFluid, 1);
-SET_INT_PROP(CombustionProblemOneComponent, NumEnergyEqSolid, 1);
+SET_INT_PROP(CombustionOneComponentTypeTag, NumEnergyEqFluid, 1);
+SET_INT_PROP(CombustionOneComponentTypeTag, NumEnergyEqSolid, 1);
// by default chemical non equilibrium is enabled in the nonequil model, switch that off here
-SET_BOOL_PROP(CombustionProblemOneComponent, EnableChemicalNonEquilibrium, false);
-SET_INT_PROP(CombustionProblemOneComponent, NumEqBalance, GET_PROP_VALUE(TypeTag, NumPhases)+GET_PROP_VALUE(TypeTag, NumPhases));
+SET_BOOL_PROP(CombustionOneComponentTypeTag, EnableChemicalNonEquilibrium, false);
+SET_INT_PROP(CombustionOneComponentTypeTag, NumEqBalance, GET_PROP_VALUE(TypeTag, NumPhases)+GET_PROP_VALUE(TypeTag, NumPhases));
//#################
}
diff --git a/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh b/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
index 0ecec664225ce30a0307ab8e29af20ec02ea2faf..92f40e485d1cfee111366e29c1cd5bdf6d0376ca 100644
--- a/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
+++ b/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
@@ -64,30 +64,30 @@ class EvaporationAtmosphereProblem;
namespace Properties
{
-NEW_TYPE_TAG(EvaporationAtmosphereProblem,
+NEW_TYPE_TAG(EvaporationAtmosphereTypeTag,
INHERITS_FROM(MPNCNonequil, EvaporationAtmosphereSpatialParams));
-NEW_TYPE_TAG(EvaporationAtmosphereBoxProblem, INHERITS_FROM(BoxModel, EvaporationAtmosphereProblem));
+NEW_TYPE_TAG(EvaporationAtmosphereBoxTypeTag, INHERITS_FROM(BoxModel, EvaporationAtmosphereTypeTag));
// Set the grid type
-SET_TYPE_PROP(EvaporationAtmosphereProblem, Grid, Dune::YaspGrid<2, Dune::TensorProductCoordinates<typename GET_PROP_TYPE(TypeTag, Scalar), 2> >);
+SET_TYPE_PROP(EvaporationAtmosphereTypeTag, Grid, Dune::YaspGrid<2, Dune::TensorProductCoordinates<typename GET_PROP_TYPE(TypeTag, Scalar), 2> >);
// Set the problem property
-SET_TYPE_PROP(EvaporationAtmosphereProblem,
+SET_TYPE_PROP(EvaporationAtmosphereTypeTag,
Problem,
EvaporationAtmosphereProblem<TypeTag>);
// Set fluid configuration
-SET_TYPE_PROP(EvaporationAtmosphereProblem,
+SET_TYPE_PROP(EvaporationAtmosphereTypeTag,
FluidSystem,
FluidSystems::H2ON2Kinetic<typename GET_PROP_TYPE(TypeTag, Scalar), /*useComplexRelations=*/false>);
//! Set the default pressure formulation: either pw first or pn first
-SET_INT_PROP(EvaporationAtmosphereProblem,
+SET_INT_PROP(EvaporationAtmosphereTypeTag,
PressureFormulation,
MpNcPressureFormulation::leastWettingFirst);
// Set the type used for scalar values
-SET_TYPE_PROP(EvaporationAtmosphereProblem, Scalar, double);
+SET_TYPE_PROP(EvaporationAtmosphereTypeTag, Scalar, double);
}
/*!
diff --git a/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh b/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
index e7537ee9763e7bde0ebe4d1e961822ffb7e58d27..7beefdc96f1774d418fd89f1f11aa6c9bbf9b53e 100644
--- a/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
+++ b/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
@@ -53,25 +53,25 @@ class ObstacleProblem;
namespace Properties
{
-NEW_TYPE_TAG(ObstacleProblem, INHERITS_FROM(MPNC, ObstacleSpatialParams));
-NEW_TYPE_TAG(ObstacleBoxProblem, INHERITS_FROM(BoxModel, ObstacleProblem));
-NEW_TYPE_TAG(ObstacleCCProblem, INHERITS_FROM(CCTpfaModel, ObstacleProblem));
+NEW_TYPE_TAG(ObstacleTypeTag, INHERITS_FROM(MPNC, ObstacleSpatialParams));
+NEW_TYPE_TAG(ObstacleBoxTypeTag, INHERITS_FROM(BoxModel, ObstacleTypeTag));
+NEW_TYPE_TAG(ObstacleCCTypeTag, INHERITS_FROM(CCTpfaModel, ObstacleTypeTag));
// Set the grid type
-SET_TYPE_PROP(ObstacleProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(ObstacleTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(ObstacleProblem,
+SET_TYPE_PROP(ObstacleTypeTag,
Problem,
ObstacleProblem<TypeTag>);
// Set fluid configuration
-SET_TYPE_PROP(ObstacleProblem,
+SET_TYPE_PROP(ObstacleTypeTag,
FluidSystem,
FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), /*useComplexRelations=*/false>);
// decide which type to use for floating values (double / quad)
-SET_TYPE_PROP(ObstacleProblem, Scalar, double);
+SET_TYPE_PROP(ObstacleTypeTag, Scalar, double);
}
diff --git a/test/porousmediumflow/richards/implicit/CMakeLists.txt b/test/porousmediumflow/richards/implicit/CMakeLists.txt
index 617f3250d6aff838933cd58f2428264369b7d64b..8f664a66270d74eae4479e918a7407dc4774af77 100644
--- a/test/porousmediumflow/richards/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/richards/implicit/CMakeLists.txt
@@ -1,10 +1,10 @@
add_input_file_links()
add_executable(test_richards_tpfa EXCLUDE_FROM_ALL test_richardslens_fv.cc)
-target_compile_definitions(test_richards_tpfa PUBLIC TYPETAG=RichardsLensCCProblem)
+target_compile_definitions(test_richards_tpfa PUBLIC TYPETAG=RichardsLensCCTypeTag)
add_executable(test_richards_box EXCLUDE_FROM_ALL test_richardslens_fv.cc)
-target_compile_definitions(test_richards_box PUBLIC TYPETAG=RichardsLensBoxProblem)
+target_compile_definitions(test_richards_box PUBLIC TYPETAG=RichardsLensBoxTypeTag)
if(MPI_FOUND)
dune_add_test(NAME test_richards_box_parallel
@@ -42,7 +42,7 @@ dune_add_test(TARGET test_richards_tpfa
# comparison to analytical solution - only with cc
dune_add_test(SOURCES test_ccrichardsanalytical.cc
NAME test_ccrichardsanalytical
- COMPILE_DEFINITIONS TYPETAG=RichardsAnalyticalCCProblem
+ COMPILE_DEFINITIONS TYPETAG=RichardsAnalyticalCCTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/richardsanalyticalcc-reference.vtu
@@ -51,7 +51,7 @@ dune_add_test(SOURCES test_ccrichardsanalytical.cc
# non-isothermal tests
dune_add_test(SOURCES test_richardsniconvection_fv.cc
NAME test_boxrichardsniconvection
- COMPILE_DEFINITIONS TYPETAG=RichardsNIConvectionBoxProblem
+ COMPILE_DEFINITIONS TYPETAG=RichardsNIConvectionBoxTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/richardsniconvectionbox-reference.vtu
@@ -61,7 +61,7 @@ dune_add_test(SOURCES test_richardsniconvection_fv.cc
dune_add_test(SOURCES test_richardsniconvection_fv.cc
NAME test_ccrichardsniconvection
- COMPILE_DEFINITIONS TYPETAG=RichardsNIConvectionCCProblem
+ COMPILE_DEFINITIONS TYPETAG=RichardsNIConvectionCCTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/richardsniconvectioncc-reference.vtu
@@ -70,7 +70,7 @@ dune_add_test(SOURCES test_richardsniconvection_fv.cc
dune_add_test(SOURCES test_richardsniconduction_fv.cc
NAME test_boxrichardsniconduction
- COMPILE_DEFINITIONS TYPETAG=RichardsNIConductionBoxProblem
+ COMPILE_DEFINITIONS TYPETAG=RichardsNIConductionBoxTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/richardsniconductionbox-reference.vtu
@@ -80,7 +80,7 @@ dune_add_test(SOURCES test_richardsniconduction_fv.cc
dune_add_test(SOURCES test_richardsniconduction_fv.cc
NAME test_ccrichardsniconduction
- COMPILE_DEFINITIONS TYPETAG=RichardsNIConductionCCProblem
+ COMPILE_DEFINITIONS TYPETAG=RichardsNIConductionCCTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/richardsniconductioncc-reference.vtu
diff --git a/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh b/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
index 386e469ca006688cf68d950ce3099a284223f2ff..40ab15c70acaf13629c41df9d286f12159b02b7a 100644
--- a/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
@@ -58,15 +58,15 @@ class RichardsAnalyticalProblem;
//////////
namespace Properties
{
-NEW_TYPE_TAG(RichardsAnalyticalProblem, INHERITS_FROM(Richards, RichardsAnalyticalSpatialParams));
-NEW_TYPE_TAG(RichardsAnalyticalBoxProblem, INHERITS_FROM(BoxModel, RichardsAnalyticalProblem));
-NEW_TYPE_TAG(RichardsAnalyticalCCProblem, INHERITS_FROM(CCTpfaModel, RichardsAnalyticalProblem));
+NEW_TYPE_TAG(RichardsAnalyticalTypeTag, INHERITS_FROM(Richards, RichardsAnalyticalSpatialParams));
+NEW_TYPE_TAG(RichardsAnalyticalBoxTypeTag, INHERITS_FROM(BoxModel, RichardsAnalyticalTypeTag));
+NEW_TYPE_TAG(RichardsAnalyticalCCTypeTag, INHERITS_FROM(CCTpfaModel, RichardsAnalyticalTypeTag));
// Use 2d YaspGrid
-SET_TYPE_PROP(RichardsAnalyticalProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(RichardsAnalyticalTypeTag, Grid, Dune::YaspGrid<2>);
// Set the physical problem to be solved
-SET_TYPE_PROP(RichardsAnalyticalProblem, Problem, RichardsAnalyticalProblem<TypeTag>);
+SET_TYPE_PROP(RichardsAnalyticalTypeTag, Problem, RichardsAnalyticalProblem<TypeTag>);
} // end namespace Dumux
/*!
diff --git a/test/porousmediumflow/richards/implicit/richardslensproblem.hh b/test/porousmediumflow/richards/implicit/richardslensproblem.hh
index 7fd5a143019770103302e4d2df63c62b222f78a9..64079c5b034d5dae59f94b4696d04aced33e8ddb 100644
--- a/test/porousmediumflow/richards/implicit/richardslensproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardslensproblem.hh
@@ -51,15 +51,15 @@ class RichardsLensProblem;
// Specify the properties for the lens problem
namespace Properties
{
-NEW_TYPE_TAG(RichardsLensProblem, INHERITS_FROM(Richards, RichardsLensSpatialParams));
-NEW_TYPE_TAG(RichardsLensBoxProblem, INHERITS_FROM(BoxModel, RichardsLensProblem));
-NEW_TYPE_TAG(RichardsLensCCProblem, INHERITS_FROM(CCTpfaModel, RichardsLensProblem));
+NEW_TYPE_TAG(RichardsLensTypeTag, INHERITS_FROM(Richards, RichardsLensSpatialParams));
+NEW_TYPE_TAG(RichardsLensBoxTypeTag, INHERITS_FROM(BoxModel, RichardsLensTypeTag));
+NEW_TYPE_TAG(RichardsLensCCTypeTag, INHERITS_FROM(CCTpfaModel, RichardsLensTypeTag));
// Use 2d YaspGrid
-SET_TYPE_PROP(RichardsLensProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(RichardsLensTypeTag, Grid, Dune::YaspGrid<2>);
// Set the physical problem to be solved
-SET_TYPE_PROP(RichardsLensProblem, Problem, RichardsLensProblem<TypeTag>);
+SET_TYPE_PROP(RichardsLensTypeTag, Problem, RichardsLensProblem<TypeTag>);
} // end namespace Dumux
/*!
diff --git a/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh b/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
index a2591ef4927423ff5d411f5a7249cd0d0c239474..eb57f3ba572eabbc06fc6c5c6585e90c7370911a 100644
--- a/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
@@ -48,22 +48,22 @@ class RichardsNIConductionProblem;
namespace Properties
{
-NEW_TYPE_TAG(RichardsNIConductionProblem, INHERITS_FROM(RichardsNI, RichardsNISpatialParams));
-NEW_TYPE_TAG(RichardsNIConductionBoxProblem, INHERITS_FROM(BoxModel, RichardsNIConductionProblem));
-NEW_TYPE_TAG(RichardsNIConductionCCProblem, INHERITS_FROM(CCTpfaModel, RichardsNIConductionProblem));
+NEW_TYPE_TAG(RichardsNIConductionTypeTag, INHERITS_FROM(RichardsNI, RichardsNISpatialParams));
+NEW_TYPE_TAG(RichardsNIConductionBoxTypeTag, INHERITS_FROM(BoxModel, RichardsNIConductionTypeTag));
+NEW_TYPE_TAG(RichardsNIConductionCCTypeTag, INHERITS_FROM(CCTpfaModel, RichardsNIConductionTypeTag));
// Set the grid type
-SET_TYPE_PROP(RichardsNIConductionProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(RichardsNIConductionTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(RichardsNIConductionProblem, Problem,
+SET_TYPE_PROP(RichardsNIConductionTypeTag, Problem,
RichardsNIConductionProblem<TypeTag>);
// Set the fluid system
-SET_TYPE_PROP(RichardsNIConductionProblem, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
+SET_TYPE_PROP(RichardsNIConductionTypeTag, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
// Set the spatial parameters
-SET_TYPE_PROP(RichardsNIConductionProblem,
+SET_TYPE_PROP(RichardsNIConductionTypeTag,
SpatialParams,
RichardsNISpatialParams<TypeTag>);
}
diff --git a/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh b/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
index cfeedd06f892b3c8b9877903738f3e1f0ba66aa2..578786b9bf50830d8bb99e9665bc90d340f3932b 100644
--- a/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
@@ -50,22 +50,22 @@ class RichardsNIConvectionProblem;
namespace Properties
{
-NEW_TYPE_TAG(RichardsNIConvectionProblem, INHERITS_FROM(RichardsNI, RichardsNISpatialParams));
-NEW_TYPE_TAG(RichardsNIConvectionBoxProblem, INHERITS_FROM(BoxModel, RichardsNIConvectionProblem));
-NEW_TYPE_TAG(RichardsNIConvectionCCProblem, INHERITS_FROM(CCTpfaModel, RichardsNIConvectionProblem));
+NEW_TYPE_TAG(RichardsNIConvectionTypeTag, INHERITS_FROM(RichardsNI, RichardsNISpatialParams));
+NEW_TYPE_TAG(RichardsNIConvectionBoxTypeTag, INHERITS_FROM(BoxModel, RichardsNIConvectionTypeTag));
+NEW_TYPE_TAG(RichardsNIConvectionCCTypeTag, INHERITS_FROM(CCTpfaModel, RichardsNIConvectionTypeTag));
// Set the grid type
-SET_TYPE_PROP(RichardsNIConvectionProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(RichardsNIConvectionTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(RichardsNIConvectionProblem, Problem,
+SET_TYPE_PROP(RichardsNIConvectionTypeTag, Problem,
RichardsNIConvectionProblem<TypeTag>);
// Set the fluid system
-SET_TYPE_PROP(RichardsNIConvectionProblem, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
+SET_TYPE_PROP(RichardsNIConvectionTypeTag, FluidSystem, FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
// Set the spatial parameters
-SET_TYPE_PROP(RichardsNIConvectionProblem,
+SET_TYPE_PROP(RichardsNIConvectionTypeTag,
SpatialParams,
RichardsNISpatialParams<TypeTag>);
}
diff --git a/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.cc b/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.cc
index 0c8fdd55f15f392387aecac12e53f5879d5ca6d4..e5c0bd42a0de3bd93cf9cd07821540b9f0a36049 100644
--- a/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.cc
+++ b/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.cc
@@ -82,7 +82,7 @@ int main(int argc, char** argv) try
using namespace Dumux;
// define the type tag for this problem
- using TypeTag = TTAG(RichardsAnalyticalCCProblem);
+ using TypeTag = TTAG(RichardsAnalyticalCCTypeTag);
// initialize MPI, finalize is done automatically on exit
const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
diff --git a/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt b/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt
index c2f3f74b34d8081009200e4abb6b63ac7346faa7..06b461dc6671bb786faef48bc8ef3b0a893e6904 100644
--- a/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt
@@ -2,7 +2,7 @@ add_input_file_links()
dune_add_test(SOURCES test_richardsnc_fv.cc
NAME test_richardsnc_box
- COMPILE_DEFINITIONS TYPETAG=RichardsWellTracerBoxProblem
+ COMPILE_DEFINITIONS TYPETAG=RichardsWellTracerBoxTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/richardswelltracerbox-reference.vtu
@@ -11,7 +11,7 @@ dune_add_test(SOURCES test_richardsnc_fv.cc
dune_add_test(SOURCES test_richardsnc_fv.cc
NAME test_richardsnc_tpfa
- COMPILE_DEFINITIONS TYPETAG=RichardsWellTracerCCProblem
+ COMPILE_DEFINITIONS TYPETAG=RichardsWellTracerCCTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/richardswelltracercc-reference.vtu
diff --git a/test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh b/test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh
index 6fafc3690b87527766f022c333f328c901eee19b..b91f35ab157b037905c665c2855f9826a91eb359 100644
--- a/test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh
+++ b/test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh
@@ -48,18 +48,18 @@ class RichardsWellTracerProblem;
// Specify the properties for the lens problem
namespace Properties
{
-NEW_TYPE_TAG(RichardsWellTracerProblem, INHERITS_FROM(RichardsNC, RichardsWellTracerSpatialParams));
-NEW_TYPE_TAG(RichardsWellTracerBoxProblem, INHERITS_FROM(BoxModel, RichardsWellTracerProblem));
-NEW_TYPE_TAG(RichardsWellTracerCCProblem, INHERITS_FROM(CCTpfaModel, RichardsWellTracerProblem));
+NEW_TYPE_TAG(RichardsWellTracerTypeTag, INHERITS_FROM(RichardsNC, RichardsWellTracerSpatialParams));
+NEW_TYPE_TAG(RichardsWellTracerBoxTypeTag, INHERITS_FROM(BoxModel, RichardsWellTracerTypeTag));
+NEW_TYPE_TAG(RichardsWellTracerCCTypeTag, INHERITS_FROM(CCTpfaModel, RichardsWellTracerTypeTag));
// Use 2d YaspGrid
-SET_TYPE_PROP(RichardsWellTracerProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(RichardsWellTracerTypeTag, Grid, Dune::YaspGrid<2>);
// Set the physical problem to be solved
-SET_TYPE_PROP(RichardsWellTracerProblem, Problem, RichardsWellTracerProblem<TypeTag>);
+SET_TYPE_PROP(RichardsWellTracerTypeTag, Problem, RichardsWellTracerProblem<TypeTag>);
// Set the physical problem to be solved
-SET_TYPE_PROP(RichardsWellTracerProblem, PointSource, SolDependentPointSource<TypeTag>);
+SET_TYPE_PROP(RichardsWellTracerTypeTag, PointSource, SolDependentPointSource<TypeTag>);
}
diff --git a/test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh b/test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh
index 338747d1306b21a60f7eacd28ebe30e22db8e6cd..0813e395811fc7950e1bfc5908049dcc41200fb4 100644
--- a/test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh
+++ b/test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh
@@ -45,27 +45,27 @@ class OnePTestProblem;
namespace Properties
{
-NEW_TYPE_TAG(IncompressibleTestProblem, INHERITS_FROM(CCTpfaModel, OneP));
+NEW_TYPE_TAG(IncompressibleTestTypeTag, INHERITS_FROM(CCTpfaModel, OneP));
// Set the grid type
-SET_TYPE_PROP(IncompressibleTestProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(IncompressibleTestTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem type
-SET_TYPE_PROP(IncompressibleTestProblem, Problem, OnePTestProblem<TypeTag>);
-SET_TYPE_PROP(IncompressibleTestProblem, SpatialParams, OnePTestSpatialParams<TypeTag>);
-SET_TYPE_PROP(IncompressibleTestProblem, LocalResidual, OnePIncompressibleLocalResidual<TypeTag>);
+SET_TYPE_PROP(IncompressibleTestTypeTag, Problem, OnePTestProblem<TypeTag>);
+SET_TYPE_PROP(IncompressibleTestTypeTag, SpatialParams, OnePTestSpatialParams<TypeTag>);
+SET_TYPE_PROP(IncompressibleTestTypeTag, LocalResidual, OnePIncompressibleLocalResidual<TypeTag>);
// the fluid system
-SET_PROP(IncompressibleTestProblem, FluidSystem)
+SET_PROP(IncompressibleTestTypeTag, FluidSystem)
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using type = FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> >;
};
// Enable caching
-SET_BOOL_PROP(IncompressibleTestProblem, EnableGridVolumeVariablesCache, true);
-SET_BOOL_PROP(IncompressibleTestProblem, EnableGridFluxVariablesCache, true);
-SET_BOOL_PROP(IncompressibleTestProblem, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(IncompressibleTestTypeTag, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(IncompressibleTestTypeTag, EnableGridFluxVariablesCache, true);
+SET_BOOL_PROP(IncompressibleTestTypeTag, EnableFVGridGeometryCache, true);
} // end namespace Properties
diff --git a/test/porousmediumflow/tracer/1ptracer/test_cctracer.cc b/test/porousmediumflow/tracer/1ptracer/test_cctracer.cc
index 9c5cb8cd661aba3136dacc65383c192abe3ec62d..9187fa02573ac558b7da740ad22f752ceebe81e9 100644
--- a/test/porousmediumflow/tracer/1ptracer/test_cctracer.cc
+++ b/test/porousmediumflow/tracer/1ptracer/test_cctracer.cc
@@ -51,8 +51,8 @@ int main(int argc, char** argv) try
using namespace Dumux;
//! define the type tags for this problem
- using OnePTypeTag = TTAG(IncompressibleTestProblem);
- using TracerTypeTag = TTAG(TracerTestCCProblem);
+ using OnePTypeTag = TTAG(IncompressibleTestTypeTag);
+ using TracerTypeTag = TTAG(TracerTestCCTypeTag);
//! initialize MPI, finalize is done automatically on exit
const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
diff --git a/test/porousmediumflow/tracer/1ptracer/tracertestproblem.hh b/test/porousmediumflow/tracer/1ptracer/tracertestproblem.hh
index 9f834139181b8cfc41dec696fce9760ad7394fbc..809268cd475e75a69a9e807f1b516bc7bf57faf4 100644
--- a/test/porousmediumflow/tracer/1ptracer/tracertestproblem.hh
+++ b/test/porousmediumflow/tracer/1ptracer/tracertestproblem.hh
@@ -44,26 +44,26 @@ class TracerTestProblem;
namespace Properties
{
-NEW_TYPE_TAG(TracerTestProblem, INHERITS_FROM(Tracer));
-NEW_TYPE_TAG(TracerTestCCProblem, INHERITS_FROM(CCTpfaModel, TracerTestProblem));
+NEW_TYPE_TAG(TracerTestTypeTag, INHERITS_FROM(Tracer));
+NEW_TYPE_TAG(TracerTestCCTypeTag, INHERITS_FROM(CCTpfaModel, TracerTestTypeTag));
// enable caching
-SET_BOOL_PROP(TracerTestProblem, EnableGridVolumeVariablesCache, true);
-SET_BOOL_PROP(TracerTestProblem, EnableGridFluxVariablesCache, true);
-SET_BOOL_PROP(TracerTestProblem, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(TracerTestTypeTag, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(TracerTestTypeTag, EnableGridFluxVariablesCache, true);
+SET_BOOL_PROP(TracerTestTypeTag, EnableFVGridGeometryCache, true);
// Set the grid type
-SET_TYPE_PROP(TracerTestProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(TracerTestTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(TracerTestProblem, Problem, TracerTestProblem<TypeTag>);
+SET_TYPE_PROP(TracerTestTypeTag, Problem, TracerTestProblem<TypeTag>);
// Set the spatial parameters
-SET_TYPE_PROP(TracerTestProblem, SpatialParams, TracerTestSpatialParams<TypeTag>);
+SET_TYPE_PROP(TracerTestTypeTag, SpatialParams, TracerTestSpatialParams<TypeTag>);
// Define whether mole(true) or mass (false) fractions are used
-SET_BOOL_PROP(TracerTestProblem, UseMoles, false);
-SET_BOOL_PROP(TracerTestCCProblem, SolutionDependentMolecularDiffusion, false);
+SET_BOOL_PROP(TracerTestTypeTag, UseMoles, false);
+SET_BOOL_PROP(TracerTestCCTypeTag, SolutionDependentMolecularDiffusion, false);
//! A simple fluid system with one tracer component
template<class TypeTag>
@@ -110,7 +110,7 @@ public:
{ return 0.0; }
};
-SET_TYPE_PROP(TracerTestProblem, FluidSystem, TracerFluidSystem<TypeTag>);
+SET_TYPE_PROP(TracerTestTypeTag, FluidSystem, TracerFluidSystem<TypeTag>);
} // end namespace Properties
diff --git a/test/porousmediumflow/tracer/multicomp/CMakeLists.txt b/test/porousmediumflow/tracer/multicomp/CMakeLists.txt
index a7b2e68e70ea0db68461119deff645ba97036dec..bbb5cb5bf64961fa0bbb8517e550941e9c2ab371 100644
--- a/test/porousmediumflow/tracer/multicomp/CMakeLists.txt
+++ b/test/porousmediumflow/tracer/multicomp/CMakeLists.txt
@@ -3,7 +3,7 @@ add_input_file_links()
# tracer tests
dune_add_test(NAME test_maxwellstefan_tpfa
SOURCES test_tracer_maxwellstefan.cc
- COMPILE_DEFINITIONS TYPETAG=MaxwellStefanTestCCProblem
+ COMPILE_DEFINITIONS TYPETAG=MaxwellStefanTestCCTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/cctracermaxwellstefan-reference.vtu
@@ -12,7 +12,7 @@ dune_add_test(NAME test_maxwellstefan_tpfa
dune_add_test(NAME test_maxwellstefan_box
SOURCES test_tracer_maxwellstefan.cc
- COMPILE_DEFINITIONS TYPETAG=MaxwellStefanTestBoxProblem
+ COMPILE_DEFINITIONS TYPETAG=MaxwellStefanTestBoxTypeTag
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/boxtracermaxwellstefan-reference.vtu
diff --git a/test/porousmediumflow/tracer/multicomp/maxwellstefantestproblem.hh b/test/porousmediumflow/tracer/multicomp/maxwellstefantestproblem.hh
index a4398626fe2edd130c13d2f6b3c6bdcb54ad360d..5ad843104d20e92372ea8797f37f0cea3523f9a1 100644
--- a/test/porousmediumflow/tracer/multicomp/maxwellstefantestproblem.hh
+++ b/test/porousmediumflow/tracer/multicomp/maxwellstefantestproblem.hh
@@ -44,24 +44,24 @@ class MaxwellStefanTestProblem;
namespace Properties
{
-NEW_TYPE_TAG(MaxwellStefanTestProblem, INHERITS_FROM(Tracer));
-NEW_TYPE_TAG(MaxwellStefanTestCCProblem, INHERITS_FROM(CCTpfaModel, MaxwellStefanTestProblem));
-NEW_TYPE_TAG(MaxwellStefanTestBoxProblem, INHERITS_FROM(BoxModel, MaxwellStefanTestProblem));
+NEW_TYPE_TAG(MaxwellStefanTestTypeTag, INHERITS_FROM(Tracer));
+NEW_TYPE_TAG(MaxwellStefanTestCCTypeTag, INHERITS_FROM(CCTpfaModel, MaxwellStefanTestTypeTag));
+NEW_TYPE_TAG(MaxwellStefanTestBoxTypeTag, INHERITS_FROM(BoxModel, MaxwellStefanTestTypeTag));
// Set the grid type
-SET_TYPE_PROP(MaxwellStefanTestProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(MaxwellStefanTestTypeTag, Grid, Dune::YaspGrid<2>);
// Set the problem property
-SET_TYPE_PROP(MaxwellStefanTestProblem, Problem, MaxwellStefanTestProblem<TypeTag>);
+SET_TYPE_PROP(MaxwellStefanTestTypeTag, Problem, MaxwellStefanTestProblem<TypeTag>);
// Set the spatial parameters
-SET_TYPE_PROP(MaxwellStefanTestProblem, SpatialParams, MaxwellStefanTestSpatialParams<TypeTag>);
+SET_TYPE_PROP(MaxwellStefanTestTypeTag, SpatialParams, MaxwellStefanTestSpatialParams<TypeTag>);
// Define whether mole(true) or mass (false) fractions are used
-SET_BOOL_PROP(MaxwellStefanTestProblem, UseMoles, true);
+SET_BOOL_PROP(MaxwellStefanTestTypeTag, UseMoles, true);
//! Here we set FicksLaw or MaxwellStefansLaw
-SET_TYPE_PROP(MaxwellStefanTestProblem, MolecularDiffusionType, MaxwellStefansLaw<TypeTag>);
+SET_TYPE_PROP(MaxwellStefanTestTypeTag, MolecularDiffusionType, MaxwellStefansLaw<TypeTag>);
//! A simple fluid system with one MaxwellStefan component
template<class TypeTag>
@@ -157,7 +157,7 @@ public:
}
};
-SET_TYPE_PROP(MaxwellStefanTestProblem, FluidSystem, H2N2CO2FluidSystem<TypeTag>);
+SET_TYPE_PROP(MaxwellStefanTestTypeTag, FluidSystem, H2N2CO2FluidSystem<TypeTag>);
} // end namespace Properties
diff --git a/tutorial/ex2/README.md b/tutorial/ex2/README.md
index 4387d3404dec9ee9dbe9f3b14aba65177d7ebf01..642ee974778c1f6cd7b8dcf199829320090f9e85 100644
--- a/tutorial/ex2/README.md
+++ b/tutorial/ex2/README.md
@@ -121,13 +121,13 @@ Most types in DuMuX are properties that can be changed just like the material la
```c++
// note that every property struct knows about TypeTag
-SET_PROP(Injection2p2cProblem, LocalResidual)
+SET_PROP(Injection2p2cTypeTag, LocalResidual)
{
using type = MyCompositionalLocalResidual<TypeTag>;
};
// or using the convenience macro
-SET_TYPE_PROP(Injection2p2cProblem, LocalResidual,
+SET_TYPE_PROP(Injection2p2cTypeTag, LocalResidual,
MyCompositionalLocalResidual<TypeTag>);
```
diff --git a/tutorial/ex3/2p2cproblem.hh b/tutorial/ex3/2p2cproblem.hh
index 79877993b7d806c4e1232ba5150d907f33b0ba34..0dc70f7ab9854b03091b4baaa6b8a88bbbb6f793 100644
--- a/tutorial/ex3/2p2cproblem.hh
+++ b/tutorial/ex3/2p2cproblem.hh
@@ -45,23 +45,23 @@ template <class TypeTag> class ExerciseThreeProblemTwoPTwoC;
namespace Properties {
// Create a new type tag for the problem
-NEW_TYPE_TAG(ExerciseThreeProblemTwoPTwoC, INHERITS_FROM(TwoPTwoC, ExerciseThreeSpatialParams));
-NEW_TYPE_TAG(ExerciseThreeProblemBoxTwoPTwoC, INHERITS_FROM(BoxModel, ExerciseThreeProblemTwoPTwoC));
+NEW_TYPE_TAG(ExerciseThreeTwoPTwoCTypeTag, INHERITS_FROM(TwoPTwoC, ExerciseThreeSpatialParams));
+NEW_TYPE_TAG(ExerciseThreeBoxTwoPTwoCTypeTag, INHERITS_FROM(BoxModel, ExerciseThreeTwoPTwoCTypeTag));
// Set the "Problem" property
-SET_TYPE_PROP(ExerciseThreeProblemTwoPTwoC, Problem, ExerciseThreeProblemTwoPTwoC<TypeTag>);
+SET_TYPE_PROP(ExerciseThreeTwoPTwoCTypeTag, Problem, ExerciseThreeProblemTwoPTwoC<TypeTag>);
// Set grid and the grid creator to be used
#if HAVE_DUNE_ALUGRID
-SET_TYPE_PROP(ExerciseThreeProblemTwoPTwoC, Grid, Dune::ALUGrid</*dim=*/2, 2, Dune::cube, Dune::nonconforming>);
+SET_TYPE_PROP(ExerciseThreeTwoPTwoCTypeTag, Grid, Dune::ALUGrid</*dim=*/2, 2, Dune::cube, Dune::nonconforming>);
#elif HAVE_UG
-SET_TYPE_PROP(ExerciseThreeProblemTwoPTwoC, Grid, Dune::UGGrid<2>);
+SET_TYPE_PROP(ExerciseThreeTwoPTwoCTypeTag, Grid, Dune::UGGrid<2>);
#else
-SET_TYPE_PROP(ExerciseThreeProblemTwoPTwoC, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(ExerciseThreeTwoPTwoCTypeTag, Grid, Dune::YaspGrid<2>);
#endif // HAVE_DUNE_ALUGRID
// The fluid system property
-SET_PROP(ExerciseThreeProblemTwoPTwoC, FluidSystem)
+SET_PROP(ExerciseThreeTwoPTwoCTypeTag, FluidSystem)
{
private:
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
diff --git a/tutorial/ex3/2pproblem.hh b/tutorial/ex3/2pproblem.hh
index 972f72dd572f1b85db4af55c3089889f2aae6f5c..bce958cfba62933b0b94d41acc60c2b4b7a75096 100644
--- a/tutorial/ex3/2pproblem.hh
+++ b/tutorial/ex3/2pproblem.hh
@@ -56,23 +56,23 @@ template <class TypeTag> class ExerciseThreeProblemTwoP;
namespace Properties {
// Create a new type tag for the problem
-NEW_TYPE_TAG(ExerciseThreeProblemTwoP, INHERITS_FROM(TwoP, ExerciseThreeSpatialParams));
-NEW_TYPE_TAG(ExerciseThreeProblemBoxTwoP, INHERITS_FROM(BoxModel, ExerciseThreeProblemTwoP));
+NEW_TYPE_TAG(ExerciseThreeTwoPTypeTag, INHERITS_FROM(TwoP, ExerciseThreeSpatialParams));
+NEW_TYPE_TAG(ExerciseThreeBoxTwoPTypeTag, INHERITS_FROM(BoxModel, ExerciseThreeTwoPTypeTag));
// Set the "Problem" property
-SET_TYPE_PROP(ExerciseThreeProblemTwoP, Problem, ExerciseThreeProblemTwoP<TypeTag>);
+SET_TYPE_PROP(ExerciseThreeTwoPTypeTag, Problem, ExerciseThreeProblemTwoP<TypeTag>);
// Set grid and the grid creator to be used
#if HAVE_DUNE_ALUGRID
-SET_TYPE_PROP(ExerciseThreeProblemTwoP, Grid, Dune::ALUGrid</*dim=*/2, 2, Dune::cube, Dune::nonconforming>);
+SET_TYPE_PROP(ExerciseThreeTwoPTypeTag, Grid, Dune::ALUGrid</*dim=*/2, 2, Dune::cube, Dune::nonconforming>);
#elif HAVE_UG
-SET_TYPE_PROP(ExerciseThreeProblemTwoP, Grid, Dune::UGGrid<2>);
+SET_TYPE_PROP(ExerciseThreeTwoPTypeTag, Grid, Dune::UGGrid<2>);
#else
-SET_TYPE_PROP(ExerciseThreeProblemTwoP, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(ExerciseThreeTwoPTypeTag, Grid, Dune::YaspGrid<2>);
#endif // HAVE_DUNE_ALUGRID
// we use the immiscible fluid system here
-SET_PROP(ExerciseThreeProblemTwoP, FluidSystem)
+SET_PROP(ExerciseThreeTwoPTypeTag, FluidSystem)
{
private:
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
diff --git a/tutorial/ex3/CMakeLists.txt b/tutorial/ex3/CMakeLists.txt
index 4fd2fe372dde1d7286709ea4d70cfc0002e99453..547219a8a774b89215433498a441df88463ae40b 100644
--- a/tutorial/ex3/CMakeLists.txt
+++ b/tutorial/ex3/CMakeLists.txt
@@ -2,14 +2,14 @@
#part a: 2pproblem
dune_add_test(NAME exercise3_a
SOURCES exercise3.cc
- COMPILE_DEFINITIONS TYPETAG=ExerciseThreeProblemBoxTwoP
+ COMPILE_DEFINITIONS TYPETAG=ExerciseThreeBoxTwoPTypeTag
COMPILE_ONLY # for testing purposes, ignore for the exercise
CMD_ARGS exercise3_a.input)
#part b: 2p2cproblem
dune_add_test(NAME exercise3_b
SOURCES exercise3.cc
- COMPILE_DEFINITIONS TYPETAG=ExerciseThreeProblemBoxTwoPTwoC
+ COMPILE_DEFINITIONS TYPETAG=ExerciseThreeBoxTwoPTwoCTypeTag
COMPILE_ONLY # for testing purposes, ignore for the exercise
CMD_ARGS exercise3_b.input)
diff --git a/tutorial/ex3/README.md b/tutorial/ex3/README.md
index 96f817b6a2b23b6c0ce4839881181732ddba02d3..f8e88b1cc89282775bf20c8908271bd43db75fec 100644
--- a/tutorial/ex3/README.md
+++ b/tutorial/ex3/README.md
@@ -44,7 +44,7 @@ In this part of the exercise we will consider a system consisting of two immisci
Additionally we derive from the _ExerciseThreeSpatialParams_ _TypeTag_ in order to set all the types related to the spatial parameters also for our new _TypeTag_ _ExerciseThreeProblem_. In this case, only one property is set for _ExerciseThreeSpatialParams_ (see lines 43 to 60 in `spatialparams.hh`). Alternatively, we could have defined this also here in the problem without defining a new type tag for the spatial parameters. However, in case you want to define several properties related to the spatial parameters it is good practice to define a separate _TypeTag_ and derive from this, as it is done here.
```c++
-NEW_TYPE_TAG(ExerciseThreeProblem, INHERITS_FROM(BoxTwoP, ExerciseThreeSpatialParams));
+NEW_TYPE_TAG(ExerciseThreeTypeTag, INHERITS_FROM(BoxTwoP, ExerciseThreeSpatialParams));
```
As wetting phase we want to use water and we want to precompute tables on which the properties are then interpolated in order to save computational time. Thus, in a first step we have to include the following headers:
@@ -80,7 +80,7 @@ which creates a _liquid phase_ from a given component. Finally, using all of the
```c++
// we use the immiscible fluid system here
-SET_PROP(ExerciseThreeProblem, FluidSystem)
+SET_PROP(ExerciseThreeTypeTag, FluidSystem)
{
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -136,7 +136,7 @@ Uncomment the line for the corresponding executable in the `CMakeLists.txt` file
```cmake
dune_add_test(NAME exercise3_a
SOURCES exercise3.cc
- COMPILE_DEFINITIONS TYPETAG=ExerciseThreeProblemBoxTwoP
+ COMPILE_DEFINITIONS TYPETAG=ExerciseThreeBoxTwoPTypeTag
CMD_ARGS exercise3_a.input)
```
@@ -173,7 +173,7 @@ The problem file for this part of the exercise is `2p2cproblem.hh`. We now want
```c++
// Create a new type tag for the problem
-NEW_TYPE_TAG(ExerciseThreeProblem, INHERITS_FROM(BoxTwoPTwoC, ExerciseThreeSpatialParams));
+NEW_TYPE_TAG(ExerciseThreeTypeTag, INHERITS_FROM(BoxTwoPTwoC, ExerciseThreeSpatialParams));
```
The new fluid system is to be implemented in the file `fluidsystems/h2omycompressiblecomponent.hh`. This is already included in the problem and the fluid system property is set accordingly.
@@ -185,7 +185,7 @@ The new fluid system is to be implemented in the file `fluidsystems/h2omycompres
```c++
// The fluid system property
-SET_PROP(ExerciseThreeProblem, FluidSystem)
+SET_PROP(ExerciseThreeTypeTag, FluidSystem)
{
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -215,7 +215,7 @@ Implement this dependency in the _density()_ method in the fluid system. In orde
```cmake
dune_add_test(NAME exercise3_b
SOURCES exercise3.cc
- COMPILE_DEFINITIONS TYPETAG=ExerciseThreeProblemBoxTwoPTwoC
+ COMPILE_DEFINITIONS TYPETAG=ExerciseThreeBoxTwoPTwoCTypeTag
CMD_ARGS exercise3_b.input)
```
diff --git a/tutorial/ex3/exercise3.cc b/tutorial/ex3/exercise3.cc
index f5c9b5d039613f7af989a113c6e7b575f1c97a3b..7111c6a3e0144e77a8e28c78e50b46fcdc631388 100644
--- a/tutorial/ex3/exercise3.cc
+++ b/tutorial/ex3/exercise3.cc
@@ -90,8 +90,8 @@ int main(int argc, char** argv) try
// define the type tag for this problem
// TYPETAG is set in CMakeLists.txt as compile time definition
- // alternatively you could write `using TypeTag = TTAG(ExerciseThreeProblemBoxTwoP);`
- // then, for the 2p2c problem you have to change this line to `using TypeTag = TTAG(ExerciseThreeProblemBoxTwoP);`
+ // alternatively you could write `using TypeTag = TTAG(ExerciseThreeBoxTwoPTypeTag);`
+ // then, for the 2p2c problem you have to change this line to `using TypeTag = TTAG(ExerciseThreeBoxTwoPTypeTag);`
// and recompile the executable
using TypeTag = TTAG(TYPETAG);