From a71cc1387ce133c46cf6633eb7be3e7acf0cabde Mon Sep 17 00:00:00 2001
From: Martin Schneider <martin.schneider@iws.uni-stuttgart.de>
Date: Fri, 21 Dec 2018 13:07:42 +0100
Subject: [PATCH] [TTag] Missing TTag
---
.../models/ex_models_pmproblem.hh | 2 +-
exercises/exercise-mainfile/1pspatialparams.hh | 1 +
.../interface/ex_interface_coupling_ff-pm.cc | 12 ++++++------
.../interface/ex_interface_ffproblem.hh | 2 --
.../interface/ex_interface_pmproblem.hh | 1 +
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/exercises/exercise-coupling-ff-pm/models/ex_models_pmproblem.hh b/exercises/exercise-coupling-ff-pm/models/ex_models_pmproblem.hh
index 29402f3e..f25401bf 100644
--- a/exercises/exercise-coupling-ff-pm/models/ex_models_pmproblem.hh
+++ b/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>
diff --git a/exercises/exercise-mainfile/1pspatialparams.hh b/exercises/exercise-mainfile/1pspatialparams.hh
index d15c8b53..a7df1fd5 100644
--- a/exercises/exercise-mainfile/1pspatialparams.hh
+++ b/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;
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_coupling_ff-pm.cc b/exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_coupling_ff-pm.cc
index 31e5c53d..868ccc96 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_coupling_ff-pm.cc
+++ b/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)
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_ffproblem.hh b/exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_ffproblem.hh
index 0043c69b..79e7c8ea 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_ffproblem.hh
+++ b/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
-
}
/*!
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_pmproblem.hh b/exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_pmproblem.hh
index 4bd156f4..9649b0e9 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_pmproblem.hh
+++ b/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
--
GitLab