Commit 30b3b84e authored by Felix Weinhardt's avatar Felix Weinhardt
Browse files

[exercise-fractures]

removed TypeTag ending
parent ef9cf2c5
......@@ -69,7 +69,7 @@ From the matrix side, the coupling works a bit different. Since the fracture dom
// create the type tag node for the matrix sub-problem
// Create new type tags
namespace TTag {
struct MatrixProblemTypeTag { using InheritsFrom = std::tuple<CCTpfaFacetCouplingModel, TwoP>; };
struct MatrixProblem { using InheritsFrom = std::tuple<CCTpfaFacetCouplingModel, TwoP>; };
} // end namespace TTag
```
......
......@@ -50,8 +50,8 @@
// Define some types for this test so that we can set them as properties below and
// reuse them again in the main function with only one single definition of them here
using MatrixTypeTag = Dumux::Properties::TTag::MatrixProblemTypeTag;
using FractureTypeTag = Dumux::Properties::TTag::FractureProblemTypeTag;
using MatrixTypeTag = Dumux::Properties::TTag::MatrixProblem;
using FractureTypeTag = Dumux::Properties::TTag::FractureProblem;
using MatrixFVGridGeometry = Dumux::GetPropType<MatrixTypeTag, Dumux::Properties::FVGridGeometry>;
using FractureFVGridGeometry = Dumux::GetPropType<FractureTypeTag, Dumux::Properties::FVGridGeometry>;
using TheMultiDomainTraits = Dumux::MultiDomainTraits<MatrixTypeTag, FractureTypeTag>;
......@@ -63,10 +63,10 @@ namespace Dumux {
namespace Properties {
template<class TypeTag>
struct CouplingManager<TypeTag, TTag::MatrixProblemTypeTag> { using type = TheCouplingManager; };
struct CouplingManager<TypeTag, TTag::MatrixProblem> { using type = TheCouplingManager; };
template<class TypeTag>
struct CouplingManager<TypeTag, TTag::FractureProblemTypeTag> { using type = TheCouplingManager; };
struct CouplingManager<TypeTag, TTag::FractureProblem> { using type = TheCouplingManager; };
} // end namespace Properties
} // end namespace Dumux
......
......@@ -51,20 +51,20 @@ namespace Properties {
// Create new type tag node
namespace TTag {
struct FractureProblemTypeTag { using InheritsFrom = std::tuple<CCTpfaModel, TwoP>; };
struct FractureProblem { using InheritsFrom = std::tuple<CCTpfaModel, TwoP>; };
} // end namespace TTag
// Set the grid type
template<class TypeTag>
struct Grid<TypeTag, TTag::FractureProblemTypeTag> { using type = Dune::FoamGrid<1, 2>; };
struct Grid<TypeTag, TTag::FractureProblem> { using type = Dune::FoamGrid<1, 2>; };
// Set the problem type
template<class TypeTag>
struct Problem<TypeTag, TTag::FractureProblemTypeTag> { using type = FractureSubProblem<TypeTag>; };
struct Problem<TypeTag, TTag::FractureProblem> { using type = FractureSubProblem<TypeTag>; };
// set the spatial params
template<class TypeTag>
struct SpatialParams<TypeTag, TTag::FractureProblemTypeTag>
struct SpatialParams<TypeTag, TTag::FractureProblem>
{
using type = FractureSpatialParams< GetPropType<TypeTag, Properties::FVGridGeometry>,
GetPropType<TypeTag, Properties::Scalar> >;
......@@ -72,7 +72,7 @@ struct SpatialParams<TypeTag, TTag::FractureProblemTypeTag>
// the fluid system
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::FractureProblemTypeTag>
struct FluidSystem<TypeTag, TTag::FractureProblem>
{
using type = Dumux::FluidSystems::H2ON2< GetPropType<TypeTag, Properties::Scalar>,
FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/true> >;
......
......@@ -59,20 +59,20 @@ namespace Properties {
// create the type tag node
namespace TTag {
struct MatrixProblemTypeTag { using InheritsFrom = std::tuple<CCTpfaFacetCouplingModel, TwoP>; };
struct MatrixProblem { using InheritsFrom = std::tuple<CCTpfaFacetCouplingModel, TwoP>; };
} // end namespace TTag
// Set the grid type
template<class TypeTag>
struct Grid<TypeTag, TTag::MatrixProblemTypeTag> { using type = Dune::ALUGrid<2, 2, Dune::simplex, Dune::conforming>; };
struct Grid<TypeTag, TTag::MatrixProblem> { using type = Dune::ALUGrid<2, 2, Dune::simplex, Dune::conforming>; };
// Set the problem type
template<class TypeTag>
struct Problem<TypeTag, TTag::MatrixProblemTypeTag> { using type = MatrixSubProblem<TypeTag>; };
struct Problem<TypeTag, TTag::MatrixProblem> { using type = MatrixSubProblem<TypeTag>; };
// set the spatial params
template<class TypeTag>
struct SpatialParams<TypeTag, TTag::MatrixProblemTypeTag>
struct SpatialParams<TypeTag, TTag::MatrixProblem>
{
using type = MatrixSpatialParams< GetPropType<TypeTag, Properties::FVGridGeometry>,
GetPropType<TypeTag, Properties::Scalar> >;
......@@ -80,7 +80,7 @@ struct SpatialParams<TypeTag, TTag::MatrixProblemTypeTag>
// the fluid system
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::MatrixProblemTypeTag>
struct FluidSystem<TypeTag, TTag::MatrixProblem>
{
using type = Dumux::FluidSystems::H2ON2< GetPropType<TypeTag, Properties::Scalar>,
FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/true> >;
......
......@@ -50,8 +50,8 @@
// Define some types for this test so that we can set them as properties below and
// reuse them again in the main function with only one single definition of them here
using MatrixTypeTag = Dumux::Properties::TTag::MatrixProblemTypeTag;
using FractureTypeTag = Dumux::Properties::TTag::FractureProblemTypeTag;
using MatrixTypeTag = Dumux::Properties::TTag::MatrixProblem;
using FractureTypeTag = Dumux::Properties::TTag::FractureProblem;
using MatrixFVGridGeometry = Dumux::GetPropType<MatrixTypeTag, Dumux::Properties::FVGridGeometry>;
using FractureFVGridGeometry = Dumux::GetPropType<FractureTypeTag, Dumux::Properties::FVGridGeometry>;
using TheMultiDomainTraits = Dumux::MultiDomainTraits<MatrixTypeTag, FractureTypeTag>;
......@@ -63,10 +63,10 @@ namespace Dumux {
namespace Properties {
template<class TypeTag>
struct CouplingManager<TypeTag, TTag::MatrixProblemTypeTag> { using type = TheCouplingManager; };
struct CouplingManager<TypeTag, TTag::MatrixProblem> { using type = TheCouplingManager; };
template<class TypeTag>
struct CouplingManager<TypeTag, TTag::FractureProblemTypeTag> { using type = TheCouplingManager; };
struct CouplingManager<TypeTag, TTag::FractureProblem> { using type = TheCouplingManager; };
} // end namespace Properties
} // end namespace Dumux
......
......@@ -51,20 +51,20 @@ namespace Properties {
// Create new type tag node
namespace TTag {
struct FractureProblemTypeTag { using InheritsFrom = std::tuple<CCTpfaModel, TwoP>; };
struct FractureProblem { using InheritsFrom = std::tuple<CCTpfaModel, TwoP>; };
} // end namespace TTag
// Set the grid type
template<class TypeTag>
struct Grid<TypeTag, TTag::FractureProblemTypeTag> { using type = Dune::FoamGrid<1, 2>; };
struct Grid<TypeTag, TTag::FractureProblem> { using type = Dune::FoamGrid<1, 2>; };
// Set the problem type
template<class TypeTag>
struct Problem<TypeTag, TTag::FractureProblemTypeTag> { using type = FractureSubProblem<TypeTag>; };
struct Problem<TypeTag, TTag::FractureProblem> { using type = FractureSubProblem<TypeTag>; };
// set the spatial params
template<class TypeTag>
struct SpatialParams<TypeTag, TTag::FractureProblemTypeTag>
struct SpatialParams<TypeTag, TTag::FractureProblem>
{
using type = FractureSpatialParams< GetPropType<TypeTag, Properties::FVGridGeometry>,
GetPropType<TypeTag, Properties::Scalar> >;
......@@ -72,7 +72,7 @@ struct SpatialParams<TypeTag, TTag::FractureProblemTypeTag>
// the fluid system
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::FractureProblemTypeTag>
struct FluidSystem<TypeTag, TTag::FractureProblem>
{
using type = Dumux::FluidSystems::H2ON2< GetPropType<TypeTag, Properties::Scalar>,
FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/true> >;
......
......@@ -59,20 +59,20 @@ namespace Properties {
// create the type tag node
namespace TTag {
struct MatrixProblemTypeTag { using InheritsFrom = std::tuple<CCTpfaFacetCouplingModel, TwoP>; };
struct MatrixProblem { using InheritsFrom = std::tuple<CCTpfaFacetCouplingModel, TwoP>; };
} // end namespace TTag
// Set the grid type
template<class TypeTag>
struct Grid<TypeTag, TTag::MatrixProblemTypeTag> { using type = Dune::ALUGrid<2, 2, Dune::simplex, Dune::conforming>; };
struct Grid<TypeTag, TTag::MatrixProblem> { using type = Dune::ALUGrid<2, 2, Dune::simplex, Dune::conforming>; };
// Set the problem type
template<class TypeTag>
struct Problem<TypeTag, TTag::MatrixProblemTypeTag> { using type = MatrixSubProblem<TypeTag>; };
struct Problem<TypeTag, TTag::MatrixProblem> { using type = MatrixSubProblem<TypeTag>; };
// set the spatial params
template<class TypeTag>
struct SpatialParams<TypeTag, TTag::MatrixProblemTypeTag>
struct SpatialParams<TypeTag, TTag::MatrixProblem>
{
using type = MatrixSpatialParams< GetPropType<TypeTag, Properties::FVGridGeometry>,
GetPropType<TypeTag, Properties::Scalar> >;
......@@ -80,7 +80,7 @@ struct SpatialParams<TypeTag, TTag::MatrixProblemTypeTag>
// the fluid system
template<class TypeTag>
struct FluidSystem<TypeTag, TTag::MatrixProblemTypeTag>
struct FluidSystem<TypeTag, TTag::MatrixProblem>
{
using type = Dumux::FluidSystems::H2ON2< GetPropType<TypeTag, Properties::Scalar>,
FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/true> >;
......
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