[exercise runtimeparams]

removed TypeTag ending

exercises/exercise-runtimeparams/exercise_runtimeparams.cc

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

exercises/exercise-runtimeparams/injection2pproblem.hh

@@ -42,26 +42,26 @@ namespace Properties {
 // define the TypeTag for this problem with a cell-centered two-point flux approximation spatial discretization.
 // Create new type tags
 namespace TTag {
-struct Injection2pTypeTag { using InheritsFrom = std::tuple<TwoP>; };
-struct Injection2pCCTypeTag { using InheritsFrom = std::tuple<Injection2pTypeTag, CCTpfaModel>; };
+struct Injection2p { using InheritsFrom = std::tuple<TwoP>; };
+struct Injection2pCC { using InheritsFrom = std::tuple<Injection2p, CCTpfaModel>; };
 } // end namespace TTag
 
 // Set the grid type
 template<class TypeTag>
-struct Grid<TypeTag, TTag::Injection2pTypeTag> { using type = Dune::YaspGrid<2>; };
+struct Grid<TypeTag, TTag::Injection2p> { using type = Dune::YaspGrid<2>; };
 
 // Set the problem property
 template<class TypeTag>
-struct Problem<TypeTag, TTag::Injection2pTypeTag> { using type = InjectionProblem2P<TypeTag>; };
+struct Problem<TypeTag, TTag::Injection2p> { using type = InjectionProblem2P<TypeTag>; };
 
 // Set the spatial parameters
-SET_TYPE_PROP(Injection2pTypeTag, SpatialParams,
+SET_TYPE_PROP(Injection2p, SpatialParams,
               InjectionSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>,
                                      GetPropType<TypeTag, Properties::Scalar>>);
 
 // Set fluid configuration
 template<class TypeTag>
-struct FluidSystem<TypeTag, TTag::Injection2pTypeTag> { using type = FluidSystems::H2ON2<GetPropType<TypeTag, Properties::Scalar>, FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/ true> >; };
+struct FluidSystem<TypeTag, TTag::Injection2p> { using type = FluidSystems::H2ON2<GetPropType<TypeTag, Properties::Scalar>, FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/ true> >; };
 } // end namespace Properties
 
 /*!

exercises/solution/exercise-runtimeparams/exercise_runtimeparams_solution.cc

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

exercises/solution/exercise-runtimeparams/injection2pproblem.hh

@@ -42,26 +42,26 @@ namespace Properties {
 // define the TypeTag for this problem with a cell-centered two-point flux approximation spatial discretization.
 // Create new type tags
 namespace TTag {
-struct Injection2pTypeTag { using InheritsFrom = std::tuple<TwoP>; };
-struct Injection2pCCTypeTag { using InheritsFrom = std::tuple<Injection2pTypeTag, CCTpfaModel>; };
+struct Injection2p { using InheritsFrom = std::tuple<TwoP>; };
+struct Injection2pCC { using InheritsFrom = std::tuple<Injection2p, CCTpfaModel>; };
 } // end namespace TTag
 
 // Set the grid type
 template<class TypeTag>
-struct Grid<TypeTag, TTag::Injection2pTypeTag> { using type = Dune::YaspGrid<2>; };
+struct Grid<TypeTag, TTag::Injection2p> { using type = Dune::YaspGrid<2>; };
 
 // Set the problem property
 template<class TypeTag>
-struct Problem<TypeTag, TTag::Injection2pTypeTag> { using type = InjectionProblem2P<TypeTag>; };
+struct Problem<TypeTag, TTag::Injection2p> { using type = InjectionProblem2P<TypeTag>; };
 
 // Set the spatial parameters
-SET_TYPE_PROP(Injection2pTypeTag, SpatialParams,
+SET_TYPE_PROP(Injection2p, SpatialParams,
               InjectionSpatialParams<GetPropType<TypeTag, Properties::FVGridGeometry>,
                                      GetPropType<TypeTag, Properties::Scalar>>);
 
 // Set fluid configuration
 template<class TypeTag>
-struct FluidSystem<TypeTag, TTag::Injection2pTypeTag> { using type = FluidSystems::H2ON2<GetPropType<TypeTag, Properties::Scalar>, FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/ true>>; };
+struct FluidSystem<TypeTag, TTag::Injection2p> { using type = FluidSystems::H2ON2<GetPropType<TypeTag, Properties::Scalar>, FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/ true>>; };
 } // end namespace Properties
 
 /*!