Remove TypeTag from Problem-specific TypeTag definitions.

dumux/porousmediumflow/sequential/gridadaptproperties.hh

@@ -43,7 +43,7 @@ class GridAdapt;
 namespace Properties
 {
 //! Grid adaption type tag for all sequential models.
-NEW_TYPE_TAG(GridAdaptTypeTag);
+NEW_TYPE_TAG(GridAdapt);
 
 //! Defines if the grid is h-adaptive
 NEW_PROP_TAG( AdaptiveGrid);
@@ -64,17 +64,17 @@ NEW_PROP_TAG(GridAdaptRefineThreshold);
 NEW_PROP_TAG(GridAdaptCoarsenThreshold);
 
 //no adaptive grid
-SET_BOOL_PROP(GridAdaptTypeTag, AdaptiveGrid, false);
+SET_BOOL_PROP(GridAdapt, AdaptiveGrid, false);
 
 //Set default class for adaptation initialization indicator
-SET_TYPE_PROP(GridAdaptTypeTag,  AdaptionInitializationIndicator, GridAdaptInitializationIndicatorDefault<TypeTag>);
+SET_TYPE_PROP(GridAdapt,  AdaptionInitializationIndicator, GridAdaptInitializationIndicatorDefault<TypeTag>);
 //Set default class for adaptation
-SET_TYPE_PROP(GridAdaptTypeTag,  GridAdaptModel, GridAdapt<TypeTag, GET_PROP_VALUE(TypeTag, AdaptiveGrid)>);
+SET_TYPE_PROP(GridAdapt,  GridAdaptModel, GridAdapt<TypeTag, GET_PROP_VALUE(TypeTag, AdaptiveGrid)>);
 
 
 //standard setting
-SET_SCALAR_PROP(GridAdaptTypeTag, GridAdaptRefineThreshold, 0.0);
-SET_SCALAR_PROP(GridAdaptTypeTag, GridAdaptCoarsenThreshold, 0.0);
+SET_SCALAR_PROP(GridAdapt, GridAdaptRefineThreshold, 0.0);
+SET_SCALAR_PROP(GridAdapt, GridAdaptCoarsenThreshold, 0.0);
 } // namespace Properties
 } // namespace Dumux
 

dumux/porousmediumflow/sequential/properties.hh

@@ -46,7 +46,7 @@ namespace Properties
 //////////////////////////////////////////////////////////////////
 
 //! Create a type tag for all sequential models
-NEW_TYPE_TAG(SequentialModel, INHERITS_FROM(ModelProperties, GridAdaptTypeTag, GridProperties));
+NEW_TYPE_TAG(SequentialModel, INHERITS_FROM(ModelProperties, GridAdapt, GridProperties));
 
 //////////////////////////////////////////////////////////////////
 // Property tags

test/common/propertysystem/test_propertysystem.cc

@@ -54,7 +54,7 @@ struct Grid { };
 struct CCTpfaDisc { using InheritsFrom = std::tuple<Grid, Base>; };
 struct BoxDisc { using InheritsFrom = std::tuple<Grid, Base>; };
 struct OnePModel { using InheritsFrom = std::tuple<Base>; };
-struct OnePTestTypeTag { using InheritsFrom = std::tuple<OnePModel, BoxDisc>; };
+struct OnePTest { using InheritsFrom = std::tuple<OnePModel, BoxDisc>; };
 
 } // end namespace TTag
 
@@ -66,7 +66,7 @@ template<class TypeTag>
 struct Scalar<TypeTag, TTag::OnePModel> { using type = double; };
 
 template<class TypeTag>
-struct Scalar<TypeTag, TTag::OnePTestTypeTag> { using type = int; };
+struct Scalar<TypeTag, TTag::OnePTest> { using type = int; };
 
 template<class TypeTag>
 struct CoordinateType<TypeTag, TTag::Grid> { using type = GetPropType<TypeTag, Scalar>; };
@@ -86,9 +86,9 @@ int main(int argc, char* argv[]) try
             DUNE_THROW(Dune::InvalidStateException, "Property Scalar in TTag::Base should be float but is " << Dune::className<Scalar>());
     }
     {
-        using Scalar = GetPropType<TTag::OnePTestTypeTag, Scalar>;
+        using Scalar = GetPropType<TTag::OnePTest, Scalar>;
         if (!std::is_same<Scalar, int>::value)
-            DUNE_THROW(Dune::InvalidStateException, "Property Scalar in TTag::OnePTestTypeTag should be int but is " << Dune::className<Scalar>());
+            DUNE_THROW(Dune::InvalidStateException, "Property Scalar in TTag::OnePTest should be int but is " << Dune::className<Scalar>());
     }
     {
         using Scalar = GetPropType<TTag::OnePModel, Scalar>;
@@ -96,9 +96,9 @@ int main(int argc, char* argv[]) try
         DUNE_THROW(Dune::InvalidStateException, "Property Scalar in TTag::OnePModel should be double but is " << Dune::className<Scalar>());
     }
     {
-        using CoordinateType = GetPropType<TTag::OnePTestTypeTag, CoordinateType>;
+        using CoordinateType = GetPropType<TTag::OnePTest, CoordinateType>;
         if (!std::is_same<CoordinateType, int>::value)
-            DUNE_THROW(Dune::InvalidStateException, "Property CoordinateType in TTag::OnePTestTypeTag should be int but is " << Dune::className<CoordinateType>());
+            DUNE_THROW(Dune::InvalidStateException, "Property CoordinateType in TTag::OnePTest should be int but is " << Dune::className<CoordinateType>());
     }
     {
         using CoordinateType = GetPropType<TTag::CCTpfaDisc, CoordinateType>;

test/freeflow/navierstokes/angelitestproblem.hh

@@ -41,10 +41,10 @@ class AngeliTestProblem;
 
 namespace Properties
 {
-NEW_TYPE_TAG(AngeliTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
+NEW_TYPE_TAG(AngeliTest, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
 
 // the fluid system
-SET_PROP(AngeliTestTypeTag, FluidSystem)
+SET_PROP(AngeliTest, FluidSystem)
 {
 private:
     using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
@@ -53,15 +53,15 @@ public:
 };
 
 // Set the grid type
-SET_TYPE_PROP(AngeliTestTypeTag, Grid, Dune::YaspGrid<2, Dune::EquidistantOffsetCoordinates<typename GET_PROP_TYPE(TypeTag, Scalar), 2> >);
+SET_TYPE_PROP(AngeliTest, Grid, Dune::YaspGrid<2, Dune::EquidistantOffsetCoordinates<typename GET_PROP_TYPE(TypeTag, Scalar), 2> >);
 
 // Set the problem property
-SET_TYPE_PROP(AngeliTestTypeTag, Problem, Dumux::AngeliTestProblem<TypeTag> );
+SET_TYPE_PROP(AngeliTest, Problem, Dumux::AngeliTestProblem<TypeTag> );
 
-SET_BOOL_PROP(AngeliTestTypeTag, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(AngeliTest, EnableFVGridGeometryCache, true);
 
-SET_BOOL_PROP(AngeliTestTypeTag, EnableGridFluxVariablesCache, true);
-SET_BOOL_PROP(AngeliTestTypeTag, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(AngeliTest, EnableGridFluxVariablesCache, true);
+SET_BOOL_PROP(AngeliTest, EnableGridVolumeVariablesCache, true);
 
 }
 

test/freeflow/navierstokes/channeltestproblem.hh

@@ -42,13 +42,13 @@ class ChannelTestProblem;
 namespace Properties
 {
 #if !NONISOTHERMAL
-NEW_TYPE_TAG(ChannelTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
+NEW_TYPE_TAG(ChannelTest, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
 #else
-NEW_TYPE_TAG(ChannelTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNI));
+NEW_TYPE_TAG(ChannelTest, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNI));
 #endif
 
 // the fluid system
-SET_PROP(ChannelTestTypeTag, FluidSystem)
+SET_PROP(ChannelTest, FluidSystem)
 {
     using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
 #if NONISOTHERMAL
@@ -59,15 +59,15 @@ SET_PROP(ChannelTestTypeTag, FluidSystem)
 };
 
 // Set the grid type
-SET_TYPE_PROP(ChannelTestTypeTag, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(ChannelTest, Grid, Dune::YaspGrid<2>);
 
 // Set the problem property
-SET_TYPE_PROP(ChannelTestTypeTag, Problem, Dumux::ChannelTestProblem<TypeTag> );
+SET_TYPE_PROP(ChannelTest, Problem, Dumux::ChannelTestProblem<TypeTag> );
 
-SET_BOOL_PROP(ChannelTestTypeTag, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(ChannelTest, EnableFVGridGeometryCache, true);
 
-SET_BOOL_PROP(ChannelTestTypeTag, EnableGridFluxVariablesCache, true);
-SET_BOOL_PROP(ChannelTestTypeTag, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(ChannelTest, EnableGridFluxVariablesCache, true);
+SET_BOOL_PROP(ChannelTest, EnableGridVolumeVariablesCache, true);
 }
 
 /*!

test/freeflow/navierstokes/closedsystemtestproblem.hh

@@ -40,25 +40,25 @@ class ClosedSystemTestProblem;
 
 namespace Properties
 {
-NEW_TYPE_TAG(ClosedSystemTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
+NEW_TYPE_TAG(ClosedSystemTest, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
 
 // the fluid system
-SET_PROP(ClosedSystemTestTypeTag, FluidSystem)
+SET_PROP(ClosedSystemTest, FluidSystem)
 {
     using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
     using type = FluidSystems::OnePLiquid<Scalar, Components::Constant<1, Scalar> >;
 };
 
 // Set the grid type
-SET_TYPE_PROP(ClosedSystemTestTypeTag, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(ClosedSystemTest, Grid, Dune::YaspGrid<2>);
 
 // Set the problem property
-SET_TYPE_PROP(ClosedSystemTestTypeTag, Problem, Dumux::ClosedSystemTestProblem<TypeTag> );
+SET_TYPE_PROP(ClosedSystemTest, Problem, Dumux::ClosedSystemTestProblem<TypeTag> );
 
-SET_BOOL_PROP(ClosedSystemTestTypeTag, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(ClosedSystemTest, EnableFVGridGeometryCache, true);
 
-SET_BOOL_PROP(ClosedSystemTestTypeTag, EnableGridFluxVariablesCache, true);
-SET_BOOL_PROP(ClosedSystemTestTypeTag, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(ClosedSystemTest, EnableGridFluxVariablesCache, true);
+SET_BOOL_PROP(ClosedSystemTest, EnableGridVolumeVariablesCache, true);
 
 }
 

test/freeflow/navierstokes/doneatestproblem.hh

@@ -46,25 +46,25 @@ class DoneaTestProblem;
 
 namespace Properties
 {
-NEW_TYPE_TAG(DoneaTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
+NEW_TYPE_TAG(DoneaTest, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
 
 // the fluid system
-SET_PROP(DoneaTestTypeTag, FluidSystem)
+SET_PROP(DoneaTest, FluidSystem)
 {
     using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
     using type = FluidSystems::OnePLiquid<Scalar, Components::Constant<1, Scalar> >;
 };
 
 // Set the grid type
-SET_TYPE_PROP(DoneaTestTypeTag, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(DoneaTest, Grid, Dune::YaspGrid<2>);
 
 // Set the problem property
-SET_TYPE_PROP(DoneaTestTypeTag, Problem, Dumux::DoneaTestProblem<TypeTag> );
+SET_TYPE_PROP(DoneaTest, Problem, Dumux::DoneaTestProblem<TypeTag> );
 
-SET_BOOL_PROP(DoneaTestTypeTag, EnableFVGridGeometryCache, ENABLECACHING);
-SET_BOOL_PROP(DoneaTestTypeTag, EnableGridFluxVariablesCache, ENABLECACHING);
-SET_BOOL_PROP(DoneaTestTypeTag, EnableGridVolumeVariablesCache, ENABLECACHING);
-SET_BOOL_PROP(DoneaTestTypeTag, EnableGridFaceVariablesCache, ENABLECACHING);
+SET_BOOL_PROP(DoneaTest, EnableFVGridGeometryCache, ENABLECACHING);
+SET_BOOL_PROP(DoneaTest, EnableGridFluxVariablesCache, ENABLECACHING);
+SET_BOOL_PROP(DoneaTest, EnableGridVolumeVariablesCache, ENABLECACHING);
+SET_BOOL_PROP(DoneaTest, EnableGridFaceVariablesCache, ENABLECACHING);
 }
 
 /*!

test/freeflow/navierstokes/kovasznaytestproblem.hh

@@ -41,25 +41,25 @@ class KovasznayTestProblem;
 
 namespace Properties
 {
-NEW_TYPE_TAG(KovasznayTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
+NEW_TYPE_TAG(KovasznayTest, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
 
 // the fluid system
-SET_PROP(KovasznayTestTypeTag, FluidSystem)
+SET_PROP(KovasznayTest, FluidSystem)
 {
     using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
     using type = FluidSystems::OnePLiquid<Scalar, Components::Constant<1, Scalar> >;
 };
 
 // Set the grid type
-SET_TYPE_PROP(KovasznayTestTypeTag, Grid, Dune::YaspGrid<2, Dune::EquidistantOffsetCoordinates<typename GET_PROP_TYPE(TypeTag, Scalar), 2> >);
+SET_TYPE_PROP(KovasznayTest, Grid, Dune::YaspGrid<2, Dune::EquidistantOffsetCoordinates<typename GET_PROP_TYPE(TypeTag, Scalar), 2> >);
 
 // Set the problem property
-SET_TYPE_PROP(KovasznayTestTypeTag, Problem, Dumux::KovasznayTestProblem<TypeTag> );
+SET_TYPE_PROP(KovasznayTest, Problem, Dumux::KovasznayTestProblem<TypeTag> );
 
-SET_BOOL_PROP(KovasznayTestTypeTag, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(KovasznayTest, EnableFVGridGeometryCache, true);
 
-SET_BOOL_PROP(KovasznayTestTypeTag, EnableGridFluxVariablesCache, true);
-SET_BOOL_PROP(KovasznayTestTypeTag, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(KovasznayTest, EnableGridFluxVariablesCache, true);
+SET_BOOL_PROP(KovasznayTest, EnableGridVolumeVariablesCache, true);
 }
 
 /*!

test/freeflow/navierstokes/navierstokesanalyticproblem.hh

@@ -44,27 +44,27 @@ class NavierStokesAnalyticProblem;
 
 namespace Properties
 {
-NEW_TYPE_TAG(NavierStokesAnalyticTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
+NEW_TYPE_TAG(NavierStokesAnalytic, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
 
 // the fluid system
-SET_PROP(NavierStokesAnalyticTypeTag, FluidSystem)
+SET_PROP(NavierStokesAnalytic, FluidSystem)
 {
     using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
     using type = FluidSystems::OnePLiquid<Scalar, Components::Constant<1, Scalar> >;
 };
 
 // Set the grid type
-SET_TYPE_PROP(NavierStokesAnalyticTypeTag, Grid, Dune::YaspGrid<1>);
+SET_TYPE_PROP(NavierStokesAnalytic, Grid, Dune::YaspGrid<1>);
 
 // Set the problem property
-SET_TYPE_PROP(NavierStokesAnalyticTypeTag, Problem, Dumux::NavierStokesAnalyticProblem<TypeTag> );
+SET_TYPE_PROP(NavierStokesAnalytic, Problem, Dumux::NavierStokesAnalyticProblem<TypeTag> );
 
-SET_BOOL_PROP(NavierStokesAnalyticTypeTag, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(NavierStokesAnalytic, EnableFVGridGeometryCache, true);
 
-SET_BOOL_PROP(NavierStokesAnalyticTypeTag, EnableGridFluxVariablesCache, true);
-SET_BOOL_PROP(NavierStokesAnalyticTypeTag, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(NavierStokesAnalytic, EnableGridFluxVariablesCache, true);
+SET_BOOL_PROP(NavierStokesAnalytic, EnableGridVolumeVariablesCache, true);
 
-SET_BOOL_PROP(NavierStokesAnalyticTypeTag, NormalizePressure, false);
+SET_BOOL_PROP(NavierStokesAnalytic, NormalizePressure, false);
 }
 
 /*!

test/freeflow/navierstokes/stokeschannel3dproblem.hh

@@ -51,10 +51,10 @@ class ThreeDChannelTestProblem;
 
 namespace Properties
 {
-NEW_TYPE_TAG(ThreeDChannelTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
+NEW_TYPE_TAG(ThreeDChannelTest, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokes));
 
 // the fluid system
-SET_PROP(ThreeDChannelTestTypeTag, FluidSystem)
+SET_PROP(ThreeDChannelTest, FluidSystem)
 {
     using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
     using type = FluidSystems::OnePLiquid<Scalar, Components::Constant<1, Scalar> >;
@@ -62,17 +62,17 @@ SET_PROP(ThreeDChannelTestTypeTag, FluidSystem)
 
 // Set the grid type
 #if DIM_3D
-SET_TYPE_PROP(ThreeDChannelTestTypeTag, Grid, Dune::YaspGrid<3>);
+SET_TYPE_PROP(ThreeDChannelTest, Grid, Dune::YaspGrid<3>);
 #else
-SET_TYPE_PROP(ThreeDChannelTestTypeTag, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(ThreeDChannelTest, Grid, Dune::YaspGrid<2>);
 #endif
 
 // Set the problem property
-SET_TYPE_PROP(ThreeDChannelTestTypeTag, Problem, ThreeDChannelTestProblem<TypeTag> );
+SET_TYPE_PROP(ThreeDChannelTest, Problem, ThreeDChannelTestProblem<TypeTag> );
 
-SET_BOOL_PROP(ThreeDChannelTestTypeTag, EnableFVGridGeometryCache, true);
-SET_BOOL_PROP(ThreeDChannelTestTypeTag, EnableGridFluxVariablesCache, true);
-SET_BOOL_PROP(ThreeDChannelTestTypeTag, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(ThreeDChannelTest, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(ThreeDChannelTest, EnableGridFluxVariablesCache, true);
+SET_BOOL_PROP(ThreeDChannelTest, EnableGridVolumeVariablesCache, true);
 }
 
 /*!

test/freeflow/navierstokes/test_angeli.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(AngeliTestTypeTag);
+    using TypeTag = TTAG(AngeliTest);
 
     // initialize MPI, finalize is done automatically on exit
     const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);

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(ChannelTestTypeTag);
+    using TypeTag = TTAG(ChannelTest);
 
     // initialize MPI, finalize is done automatically on exit
     const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);

test/freeflow/navierstokes/test_closedsystem.cc

@@ -88,7 +88,7 @@ int main(int argc, char** argv) try
     using namespace Dumux;
 
     // define the type tag for this problem
-    using TypeTag = TTAG(ClosedSystemTestTypeTag);
+    using TypeTag = TTAG(ClosedSystemTest);
 
     // initialize MPI, finalize is done automatically on exit
     const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);

test/freeflow/navierstokes/test_donea.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(DoneaTestTypeTag);
+    using TypeTag = TTAG(DoneaTest);
 
     // initialize MPI, finalize is done automatically on exit
     const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);

test/freeflow/navierstokes/test_kovasznay.cc

@@ -88,7 +88,7 @@ int main(int argc, char** argv) try
     using namespace Dumux;
 
     // define the type tag for this problem
-    using TypeTag = TTAG(KovasznayTestTypeTag);
+    using TypeTag = TTAG(KovasznayTest);
 
     // initialize MPI, finalize is done automatically on exit
     const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);

test/freeflow/navierstokes/test_navierstokes_1d.cc

@@ -77,7 +77,7 @@ int main(int argc, char** argv) try
     using namespace Dumux;
 
     // define the type tag for this problem
-    using TypeTag = TTAG(NavierStokesAnalyticTypeTag);
+    using TypeTag = TTAG(NavierStokesAnalytic);
 
     // initialize MPI, finalize is done automatically on exit
     const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);

test/freeflow/navierstokes/test_stokes_channel_3d.cc

@@ -83,7 +83,7 @@ int main(int argc, char** argv) try
     using namespace Dumux;
 
     // define the type tag for this problem
-    using TypeTag = TTAG(ThreeDChannelTestTypeTag);
+    using TypeTag = TTAG(ThreeDChannelTest);
 
     // initialize MPI, finalize is done automatically on exit
     const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);

test/freeflow/navierstokesnc/channeltestproblem.hh

@@ -47,37 +47,37 @@ class ChannelNCTestProblem;
 namespace Properties {
 
 #if !NONISOTHERMAL
-NEW_TYPE_TAG(ChannelNCTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNC));
+NEW_TYPE_TAG(ChannelNCTest, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNC));
 #else
-NEW_TYPE_TAG(ChannelNCTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNCNI));
+NEW_TYPE_TAG(ChannelNCTest, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNCNI));
 #endif
 
 // Select the fluid system
-SET_PROP(ChannelNCTestTypeTag, FluidSystem)
+SET_PROP(ChannelNCTest, FluidSystem)
 {
     using H2OAir = FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)>;
     static constexpr int phaseIdx = H2OAir::liquidPhaseIdx;
     using type = FluidSystems::OnePAdapter<H2OAir, phaseIdx>;
 };
 
-SET_INT_PROP(ChannelNCTestTypeTag, ReplaceCompEqIdx, 0);
+SET_INT_PROP(ChannelNCTest, ReplaceCompEqIdx, 0);
 
 // Set the grid type
-SET_TYPE_PROP(ChannelNCTestTypeTag, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(ChannelNCTest, Grid, Dune::YaspGrid<2>);
 
 // Set the problem property
-SET_TYPE_PROP(ChannelNCTestTypeTag, Problem, Dumux::ChannelNCTestProblem<TypeTag> );
+SET_TYPE_PROP(ChannelNCTest, Problem, Dumux::ChannelNCTestProblem<TypeTag> );
 
-SET_BOOL_PROP(ChannelNCTestTypeTag, EnableFVGridGeometryCache, ENABLECACHING);
-SET_BOOL_PROP(ChannelNCTestTypeTag, EnableGridFluxVariablesCache, ENABLECACHING);
-SET_BOOL_PROP(ChannelNCTestTypeTag, EnableGridVolumeVariablesCache, ENABLECACHING);
-SET_BOOL_PROP(ChannelNCTestTypeTag, EnableGridFaceVariablesCache, ENABLECACHING);
+SET_BOOL_PROP(ChannelNCTest, EnableFVGridGeometryCache, ENABLECACHING);
+SET_BOOL_PROP(ChannelNCTest, EnableGridFluxVariablesCache, ENABLECACHING);
+SET_BOOL_PROP(ChannelNCTest, EnableGridVolumeVariablesCache, ENABLECACHING);
+SET_BOOL_PROP(ChannelNCTest, EnableGridFaceVariablesCache, ENABLECACHING);
 
 // Use mole fraction formulation
 #if USE_MASS
-SET_BOOL_PROP(ChannelNCTestTypeTag, UseMoles, false);
+SET_BOOL_PROP(ChannelNCTest, UseMoles, false);
 #else
-SET_BOOL_PROP(ChannelNCTestTypeTag, UseMoles, true);
+SET_BOOL_PROP(ChannelNCTest, UseMoles, true);
 #endif
 
 }

test/freeflow/navierstokesnc/densityflowproblem.hh

@@ -42,30 +42,30 @@ class DensityDrivenFlowProblem;
 
 namespace Properties {
 
-NEW_TYPE_TAG(DensityDrivenFlowTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNC));
+NEW_TYPE_TAG(DensityDrivenFlow, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNC));
 
 // Select the fluid system
-SET_PROP(DensityDrivenFlowTypeTag, FluidSystem)
+SET_PROP(DensityDrivenFlow, FluidSystem)
 {
     using H2OAir = FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)>;
     static constexpr int phaseIdx = H2OAir::liquidPhaseIdx;
     using type = FluidSystems::OnePAdapter<H2OAir, phaseIdx>;
 };
 
-SET_INT_PROP(DensityDrivenFlowTypeTag, ReplaceCompEqIdx, 0);
+SET_INT_PROP(DensityDrivenFlow, ReplaceCompEqIdx, 0);
 
 // Set the grid type
-SET_TYPE_PROP(DensityDrivenFlowTypeTag, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(DensityDrivenFlow, Grid, Dune::YaspGrid<2>);
 
 // Set the problem property
-SET_TYPE_PROP(DensityDrivenFlowTypeTag, Problem, Dumux::DensityDrivenFlowProblem<TypeTag> );
+SET_TYPE_PROP(DensityDrivenFlow, Problem, Dumux::DensityDrivenFlowProblem<TypeTag> );
 
-SET_BOOL_PROP(DensityDrivenFlowTypeTag, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(DensityDrivenFlow, EnableFVGridGeometryCache, true);
 
-SET_BOOL_PROP(DensityDrivenFlowTypeTag, EnableGridFluxVariablesCache, true);
-SET_BOOL_PROP(DensityDrivenFlowTypeTag, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(DensityDrivenFlow, EnableGridFluxVariablesCache, true);
+SET_BOOL_PROP(DensityDrivenFlow, EnableGridVolumeVariablesCache, true);
 
-SET_BOOL_PROP(DensityDrivenFlowTypeTag, UseMoles, true);
+SET_BOOL_PROP(DensityDrivenFlow, UseMoles, true);
 }
 
 /*!

test/freeflow/navierstokesnc/msfreeflowtestproblem.hh

@@ -44,26 +44,26 @@ class MaxwellStefanNCTestProblem;
 
 namespace Properties {
 
-NEW_TYPE_TAG(MaxwellStefanNCTestTypeTag, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNC));
+NEW_TYPE_TAG(MaxwellStefanNCTest, INHERITS_FROM(StaggeredFreeFlowModel, NavierStokesNC));
 
-SET_INT_PROP(MaxwellStefanNCTestTypeTag, ReplaceCompEqIdx, 0);
+SET_INT_PROP(MaxwellStefanNCTest, ReplaceCompEqIdx, 0);
 
 // Set the grid type
-SET_TYPE_PROP(MaxwellStefanNCTestTypeTag, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(MaxwellStefanNCTest, Grid, Dune::YaspGrid<2>);
 
 // Set the problem property
-SET_TYPE_PROP(MaxwellStefanNCTestTypeTag, Problem, Dumux::MaxwellStefanNCTestProblem<TypeTag> );
+SET_TYPE_PROP(MaxwellStefanNCTest, Problem, Dumux::MaxwellStefanNCTestProblem<TypeTag> );
 
-SET_BOOL_PROP(MaxwellStefanNCTestTypeTag, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(MaxwellStefanNCTest, EnableFVGridGeometryCache, true);
 
-SET_BOOL_PROP(MaxwellStefanNCTestTypeTag, EnableGridFluxVariablesCache, true);
-SET_BOOL_PROP(MaxwellStefanNCTestTypeTag, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(MaxwellStefanNCTest, EnableGridFluxVariablesCache, true);
+SET_BOOL_PROP(MaxwellStefanNCTest, EnableGridVolumeVariablesCache, true);
 
-SET_BOOL_PROP(MaxwellStefanNCTestTypeTag, UseMoles, true);
+SET_BOOL_PROP(MaxwellStefanNCTest, UseMoles, true);
 
 
 //! Here we set FicksLaw or MaxwellStefansLaw
-SET_TYPE_PROP(MaxwellStefanNCTestTypeTag, MolecularDiffusionType, MaxwellStefansLaw<TypeTag>);
+SET_TYPE_PROP(MaxwellStefanNCTest, MolecularDiffusionType, MaxwellStefansLaw<TypeTag>);
 
 
 /*!
@@ -181,7 +181,7 @@ public:
     }
 };
 
-SET_TYPE_PROP(MaxwellStefanNCTestTypeTag, FluidSystem, MaxwellStefanFluidSystem<TypeTag>);
+SET_TYPE_PROP(MaxwellStefanNCTest, FluidSystem, MaxwellStefanFluidSystem<TypeTag>);
 
 } //end namespace Property
 /*!