Commit a71cc138 authored by Martin Schneider's avatar Martin Schneider
Browse files

[TTag] Missing TTag

parent 97ae6f0f
...@@ -71,7 +71,7 @@ struct ReplaceCompEqIdx<TypeTag, TTag::DarcyOnePNC> { static constexpr int value ...@@ -71,7 +71,7 @@ struct ReplaceCompEqIdx<TypeTag, TTag::DarcyOnePNC> { static constexpr int value
//! Use a model with constant tortuosity for the effective diffusivity //! Use a model with constant tortuosity for the effective diffusivity
template<class TypeTag> template<class TypeTag>
struct EffectiveDiffusivityModel<TypeTag, DarcyOnePNC> struct EffectiveDiffusivityModel<TypeTag, TTag::DarcyOnePNC>
{ using type = DiffusivityConstantTortuosity<GetPropType<TypeTag, Properties::Scalar>>; }; { using type = DiffusivityConstantTortuosity<GetPropType<TypeTag, Properties::Scalar>>; };
// Set the grid type // Set the grid type
template<class TypeTag> template<class TypeTag>
......
...@@ -36,6 +36,7 @@ namespace Dumux { ...@@ -36,6 +36,7 @@ namespace Dumux {
template<class FVGridGeometry, class Scalar> template<class FVGridGeometry, class Scalar>
class OnePTestSpatialParams class OnePTestSpatialParams
: public FVSpatialParamsOneP<FVGridGeometry, Scalar, OnePTestSpatialParams<FVGridGeometry, Scalar>> : public FVSpatialParamsOneP<FVGridGeometry, Scalar, OnePTestSpatialParams<FVGridGeometry, Scalar>>
{
using GridView = typename FVGridGeometry::GridView; using GridView = typename FVGridGeometry::GridView;
using Element = typename GridView::template Codim<0>::Entity; using Element = typename GridView::template Codim<0>::Entity;
using FVElementGeometry = typename FVGridGeometry::LocalView; using FVElementGeometry = typename FVGridGeometry::LocalView;
......
...@@ -54,16 +54,16 @@ namespace Dumux { ...@@ -54,16 +54,16 @@ namespace Dumux {
namespace Properties { namespace Properties {
template<class TypeTag> 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>; using type = Dumux::StokesDarcyCouplingManager<Traits>;
}; };
template<class TypeTag> 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>; using type = Dumux::StokesDarcyCouplingManager<Traits>;
}; };
...@@ -85,8 +85,8 @@ int main(int argc, char** argv) try ...@@ -85,8 +85,8 @@ int main(int argc, char** argv) try
Parameters::init(argc, argv); Parameters::init(argc, argv);
// Define the sub problem type tags // Define the sub problem type tags
using StokesTypeTag = Properties::TTag::StokesOnePTypeTag; using StokesTypeTag = Properties::TTag::StokesOneP;
using DarcyTypeTag = Properties::TTag::DarcyOnePTypeTag; using DarcyTypeTag = Properties::TTag::DarcyOneP;
#if EXNUMBER < 3 #if EXNUMBER < 3
// try to create a grid (from the given grid file or the input file) // try to create a grid (from the given grid file or the input file)
......
...@@ -82,8 +82,6 @@ template<class TypeTag> ...@@ -82,8 +82,6 @@ template<class TypeTag>
struct EnableGridFluxVariablesCache<TypeTag, TTag::StokesOneP> { static constexpr bool value = true; }; struct EnableGridFluxVariablesCache<TypeTag, TTag::StokesOneP> { static constexpr bool value = true; };
template<class TypeTag> template<class TypeTag>
struct EnableGridVolumeVariablesCache<TypeTag, TTag::StokesOneP> { static constexpr bool value = true; }; struct EnableGridVolumeVariablesCache<TypeTag, TTag::StokesOneP> { static constexpr bool value = true; };
>>>>>>> 812d3cb... [macros] Replace macros for solutions using the script
} }
/*! /*!
......
...@@ -48,6 +48,7 @@ class DarcySubProblem; ...@@ -48,6 +48,7 @@ class DarcySubProblem;
namespace Properties namespace Properties
{ {
// Create new type tags // Create new type tags
namespace TTag {
struct DarcyOneP { using InheritsFrom = std::tuple<OneP, CCTpfaModel>; }; struct DarcyOneP { using InheritsFrom = std::tuple<OneP, CCTpfaModel>; };
} // end namespace TTag } // end namespace TTag
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment