[TTag] Missing TTag

exercises/exercise-coupling-ff-pm/models/ex_models_pmproblem.hh

@@ -71,7 +71,7 @@ struct ReplaceCompEqIdx<TypeTag, TTag::DarcyOnePNC> { static constexpr int value
 
 //! Use a model with constant tortuosity for the effective diffusivity
 template<class TypeTag>
-struct EffectiveDiffusivityModel<TypeTag, DarcyOnePNC>
+struct EffectiveDiffusivityModel<TypeTag, TTag::DarcyOnePNC>
 { using type = DiffusivityConstantTortuosity<GetPropType<TypeTag, Properties::Scalar>>; };
 // Set the grid type
 template<class TypeTag>

exercises/exercise-mainfile/1pspatialparams.hh

@@ -36,6 +36,7 @@ namespace Dumux {
 template<class FVGridGeometry, class Scalar>
 class OnePTestSpatialParams
 : public FVSpatialParamsOneP<FVGridGeometry, Scalar, OnePTestSpatialParams<FVGridGeometry, Scalar>>
+{
     using GridView = typename FVGridGeometry::GridView;
     using Element = typename GridView::template Codim<0>::Entity;
     using FVElementGeometry = typename FVGridGeometry::LocalView;

exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_coupling_ff-pm.cc

@@ -54,16 +54,16 @@ namespace Dumux {
 namespace Properties {
 
 template<class TypeTag>
-struct CouplingManager<TypeTag, TTag::StokesOnePTypeTag>
+struct CouplingManager<TypeTag, TTag::StokesOneP>
 {
-    using Traits = StaggeredMultiDomainTraits<TypeTag, TypeTag, Properties::TTag::DarcyOnePTypeTag>;
+    using Traits = StaggeredMultiDomainTraits<TypeTag, TypeTag, Properties::TTag::DarcyOneP>;
     using type = Dumux::StokesDarcyCouplingManager<Traits>;
 };
 
 template<class TypeTag>
-struct CouplingManager<TypeTag, TTag::DarcyOnePTypeTag>
+struct CouplingManager<TypeTag, TTag::DarcyOneP>
 {
-    using Traits = StaggeredMultiDomainTraits<Properties::TTag::StokesOnePTypeTag, Properties::TTag::StokesOnePTypeTag, TypeTag>;
+    using Traits = StaggeredMultiDomainTraits<Properties::TTag::StokesOneP, Properties::TTag::StokesOneP, TypeTag>;
     using type = Dumux::StokesDarcyCouplingManager<Traits>;
 };
 
@@ -85,8 +85,8 @@ int main(int argc, char** argv) try
     Parameters::init(argc, argv);
 
     // Define the sub problem type tags
-    using StokesTypeTag = Properties::TTag::StokesOnePTypeTag;
-    using DarcyTypeTag = Properties::TTag::DarcyOnePTypeTag;
+    using StokesTypeTag = Properties::TTag::StokesOneP;
+    using DarcyTypeTag = Properties::TTag::DarcyOneP;
 
 #if EXNUMBER < 3
     // try to create a grid (from the given grid file or the input file)

exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_ffproblem.hh

@@ -82,8 +82,6 @@ template<class TypeTag>
 struct EnableGridFluxVariablesCache<TypeTag, TTag::StokesOneP> { static constexpr bool value = true; };
 template<class TypeTag>
 struct EnableGridVolumeVariablesCache<TypeTag, TTag::StokesOneP> { static constexpr bool value = true; };
->>>>>>> 812d3cb... [macros] Replace macros for solutions using the script
-
 }
 
 /*!

exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_pmproblem.hh

@@ -48,6 +48,7 @@ class DarcySubProblem;
 namespace Properties
 {
 // Create new type tags
+namespace TTag {
 struct DarcyOneP { using InheritsFrom = std::tuple<OneP, CCTpfaModel>; };
 } // end namespace TTag