[test][1p] Remove redundant TypeTag suffix

test/porousmediumflow/1p/implicit/1ptestproblem.hh

@@ -50,15 +50,15 @@ namespace Properties {
 
 // Create new type tags
 namespace TTag {
-struct OnePTestTypeTag { using InheritsFrom = std::tuple<OneP>; };
-struct OnePTestBoxTypeTag { using InheritsFrom = std::tuple<OnePTestTypeTag, BoxModel>; };
-struct OnePTestCCTpfaTypeTag { using InheritsFrom = std::tuple<OnePTestTypeTag, CCTpfaModel>; };
-struct OnePTestCCMpfaTypeTag { using InheritsFrom = std::tuple<OnePTestTypeTag, CCMpfaModel>; };
+struct OnePTest { using InheritsFrom = std::tuple<OneP>; };
+struct OnePTestBox { using InheritsFrom = std::tuple<OnePTest, BoxModel>; };
+struct OnePTestCCTpfa { using InheritsFrom = std::tuple<OnePTest, CCTpfaModel>; };
+struct OnePTestCCMpfa { using InheritsFrom = std::tuple<OnePTest, CCMpfaModel>; };
 } // end namespace TTag
 
 // Specialize the fluid system type for this type tag
 template<class TypeTag>
-struct FluidSystem<TypeTag, TTag::OnePTestTypeTag>
+struct FluidSystem<TypeTag, TTag::OnePTest>
 {
     using Scalar = GetPropType<TypeTag, Scalar>;
     using type = FluidSystems::OnePLiquid<Scalar, Components::SimpleH2O<Scalar> >;
@@ -66,17 +66,17 @@ struct FluidSystem<TypeTag, TTag::OnePTestTypeTag>
 
 // Specialize the grid type for this type tag
 template<class TypeTag>
-struct Grid<TypeTag, TTag::OnePTestTypeTag>
+struct Grid<TypeTag, TTag::OnePTest>
 { using type = Dune::YaspGrid<2>; };
 
 // Specialize the problem type for this type tag
 template<class TypeTag>
-struct Problem<TypeTag, TTag::OnePTestTypeTag>
+struct Problem<TypeTag, TTag::OnePTest>
 { using type = OnePTestProblem<TypeTag>; };
 
 // Specialize the spatial params type for this type tag
 template<class TypeTag>
-struct SpatialParams<TypeTag, TTag::OnePTestTypeTag>
+struct SpatialParams<TypeTag, TTag::OnePTest>
 {
     using FVGridGeometry = GetPropType<TypeTag, FVGridGeometry>;
     using Scalar = GetPropType<TypeTag, Scalar>;
@@ -86,7 +86,7 @@ struct SpatialParams<TypeTag, TTag::OnePTestTypeTag>
 #ifdef FORCHHEIMER
 // Specialize the advection type for this type tag
 template<class TypeTag>
-struct AdvectionType<TypeTag, TTag::OnePTestTypeTag>
+struct AdvectionType<TypeTag, TTag::OnePTest>
 { using type = ForchheimersLaw<TypeTag>; };
 #endif
 

test/porousmediumflow/1p/implicit/CMakeLists.txt

@@ -12,7 +12,7 @@ dune_symlink_to_source_files(FILES "tubesconvergencetest.py")
 # isothermal tests
 dune_add_test(NAME test_1pcctpfa
               SOURCES test_1pfv.cc
-              COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfaTypeTag
+              COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
                         --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
@@ -21,7 +21,7 @@ dune_add_test(NAME test_1pcctpfa
 
 dune_add_test(NAME test_1pccmpfa
               SOURCES test_1pfv.cc
-              COMPILE_DEFINITIONS TYPETAG=OnePTestCCMpfaTypeTag
+              COMPILE_DEFINITIONS TYPETAG=OnePTestCCMpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
                         --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
@@ -30,7 +30,7 @@ dune_add_test(NAME test_1pccmpfa
 
 dune_add_test(NAME test_1pbox
               SOURCES test_1pfv.cc
-              COMPILE_DEFINITIONS TYPETAG=OnePTestBoxTypeTag
+              COMPILE_DEFINITIONS TYPETAG=OnePTestBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
                         --files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox-reference.vtu
@@ -39,7 +39,7 @@ dune_add_test(NAME test_1pbox
 
 dune_add_test(NAME test_1pforchheimercctpfa
               SOURCES test_1pfv.cc
-              COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfaTypeTag FORCHHEIMER=1
+              COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfa FORCHHEIMER=1
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
                         --files ${CMAKE_SOURCE_DIR}/test/references/1pforchheimercctpfa.vtu
@@ -50,7 +50,7 @@ dune_add_test(NAME test_1pforchheimercctpfa
 # 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=OnePTestCCTpfaTypeTag
+              COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfa
               CMAKE_GUARD HAVE_GSTAT)
 
 # non-isothermal tests