Commit fd7da590 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

[propertysystem] replace macro NEW_TYPE_TAG

parent c8b5073c
......@@ -32,8 +32,10 @@
namespace Dumux {
namespace Properties {
namespace TTag {
//! Type tag for numeric models.
NEW_TYPE_TAG(GridProperties);
struct GridProperties {};
}
//! Use the leaf grid view if not defined otherwise
SET_TYPE_PROP(GridProperties, GridView, typename GET_PROP_TYPE(TypeTag, Grid)::LeafGridView);
......
......@@ -38,7 +38,9 @@ namespace Dumux {
namespace Properties {
//! Type tag for numeric models.
NEW_TYPE_TAG(ModelProperties);
namespace TTag {
struct ModelProperties {};
}
//! Set the default type of scalar values to double
SET_TYPE_PROP(ModelProperties, Scalar, double);
......
......@@ -47,7 +47,10 @@ namespace Dumux {
namespace Properties {
//! Type tag for the box scheme.
NEW_TYPE_TAG(BoxModel, INHERITS_FROM(FiniteVolumeModel));
// Create new type tags
namespace TTag {
struct BoxModel { using InheritsFrom = std::tuple<FiniteVolumeModel>; };
} // end namespace TTag
//! Set the default for the global finite volume geometry
SET_PROP(BoxModel, FVGridGeometry)
......
......@@ -52,7 +52,10 @@ namespace Dumux {
namespace Properties {
//! Type tag for the cell-centered mpfa scheme.
NEW_TYPE_TAG(CCMpfaModel, INHERITS_FROM(FiniteVolumeModel));
// Create new type tags
namespace TTag {
struct CCMpfaModel { using InheritsFrom = std::tuple<FiniteVolumeModel>; };
} // end namespace TTag
//! Set the index set type used on the dual grid nodes
SET_PROP(CCMpfaModel, DualGridNodalIndexSet)
......
......@@ -46,7 +46,10 @@ namespace Dumux {
namespace Properties {
//! Type tag for the cell-centered tpfa scheme.
NEW_TYPE_TAG(CCTpfaModel, INHERITS_FROM(FiniteVolumeModel));
// Create new type tags
namespace TTag {
struct CCTpfaModel { using InheritsFrom = std::tuple<FiniteVolumeModel>; };
} // end namespace TTag
//! Set the default for the global finite volume geometry
SET_PROP(CCTpfaModel, FVGridGeometry)
......
......@@ -38,7 +38,10 @@ namespace Dumux {
namespace Properties {
//! Type tag for finite-volume schemes.
NEW_TYPE_TAG(FiniteVolumeModel, INHERITS_FROM(GridProperties));
// Create new type tags
namespace TTag {
struct FiniteVolumeModel { using InheritsFrom = std::tuple<GridProperties>; };
} // end namespace TTag
//! The grid variables
SET_PROP(FiniteVolumeModel, GridVariables)
......
......@@ -49,7 +49,10 @@ namespace Properties
{
//! Type tag for the staggered scheme specialized for free flow.
NEW_TYPE_TAG(StaggeredFreeFlowModel, INHERITS_FROM(StaggeredModel));
// Create new type tags
namespace TTag {
struct StaggeredFreeFlowModel { using InheritsFrom = std::tuple<StaggeredModel>; };
} // end namespace TTag
/*!
* \brief Set the number of equations on the faces to 1. We only consider scalar values because the velocity vector
......
......@@ -56,7 +56,10 @@ class CCElementBoundaryTypes;
namespace Properties
{
//! Type tag for the staggered scheme.
NEW_TYPE_TAG(StaggeredModel, INHERITS_FROM(FiniteVolumeModel));
// Create new type tags
namespace TTag {
struct StaggeredModel { using InheritsFrom = std::tuple<FiniteVolumeModel>; };
} // end namespace TTag
//! Set the default global face variables cache vector class
SET_PROP(StaggeredModel, GridFaceVariables)
......
......@@ -46,8 +46,11 @@ namespace Properties {
// Type tags
//////////////////////////////////////////////////////////////////
// Create new type tags
namespace TTag {
//! The type tags for the single-phase, multi-component isothermal k-epsilon model
NEW_TYPE_TAG(KEpsilonNC, INHERITS_FROM(NavierStokesNC));
struct KEpsilonNC { using InheritsFrom = std::tuple<NavierStokesNC>; };
} // end namespace TTag
///////////////////////////////////////////////////////////////////////////
// default property values
......@@ -130,8 +133,11 @@ SET_TYPE_PROP(KEpsilonNC, IOFields, FreeflowNCIOFields<KEpsilonIOFields, true/*t
// Property values for non-isothermal multi-component k-epsilon model
//////////////////////////////////////////////////////////////////////////
// Create new type tags
namespace TTag {
//! The type tags for the single-phase, multi-component non-isothermal k-epsilon models
NEW_TYPE_TAG(KEpsilonNCNI, INHERITS_FROM(NavierStokesNCNI));
struct KEpsilonNCNI { using InheritsFrom = std::tuple<NavierStokesNCNI>; };
} // end namespace TTag
//! The model traits of the non-isothermal model
SET_PROP(KEpsilonNCNI, ModelTraits)
......
......@@ -46,8 +46,11 @@ namespace Properties {
// Type tags
//////////////////////////////////////////////////////////////////
// Create new type tags
namespace TTag {
//! The type tags for the single-phase, multi-component isothermal k-omega model
NEW_TYPE_TAG(KOmegaNC, INHERITS_FROM(NavierStokesNC));
struct KOmegaNC { using InheritsFrom = std::tuple<NavierStokesNC>; };
} // end namespace TTag
///////////////////////////////////////////////////////////////////////////
// default property values
......@@ -148,8 +151,11 @@ SET_TYPE_PROP(KOmegaNC, IOFields, FreeflowNCIOFields<KOmegaIOFields, true/*turbu
// Property values for non-isothermal multi-component k-omega model
//////////////////////////////////////////////////////////////////////////
// Create new type tags
namespace TTag {
//! The type tags for the single-phase, multi-component non-isothermal k-omega models
NEW_TYPE_TAG(KOmegaNCNI, INHERITS_FROM(NavierStokesNCNI));
struct KOmegaNCNI { using InheritsFrom = std::tuple<NavierStokesNCNI>; };
} // end namespace TTag
//! The model traits of the non-isothermal model
SET_PROP(KOmegaNCNI, ModelTraits)
......
......@@ -46,8 +46,11 @@ namespace Properties {
// Type tags
//////////////////////////////////////////////////////////////////
// Create new type tags
namespace TTag {
//! The type tags for the single-phase, multi-component isothermal low-Re k-epsilon model
NEW_TYPE_TAG(LowReKEpsilonNC, INHERITS_FROM(NavierStokesNC));
struct LowReKEpsilonNC { using InheritsFrom = std::tuple<NavierStokesNC>; };
} // end namespace TTag
///////////////////////////////////////////////////////////////////////////
// default property values
......@@ -135,8 +138,11 @@ SET_TYPE_PROP(LowReKEpsilonNC, IOFields, FreeflowNCIOFields<LowReKEpsilonIOField
// Property values for non-isothermal multi-component low-Re k-epsilon model
//////////////////////////////////////////////////////////////////////////
// Create new type tags
namespace TTag {
//! The type tags for the single-phase, multi-component non-isothermal low-Re k-epsilon models
NEW_TYPE_TAG(LowReKEpsilonNCNI, INHERITS_FROM(NavierStokesNCNI));
struct LowReKEpsilonNCNI { using InheritsFrom = std::tuple<NavierStokesNCNI>; };
} // end namespace TTag
//! The model traits of the non-isothermal model
SET_PROP(LowReKEpsilonNCNI, ModelTraits)
......
......@@ -113,11 +113,14 @@ namespace Properties {
// Type tags
//////////////////////////////////////////////////////////////////
// Create new type tags
namespace TTag {
//! The type tag for the single-phase, multi-component isothermal free-flow model
NEW_TYPE_TAG(NavierStokesNC, INHERITS_FROM(FreeFlow));
struct NavierStokesNC { using InheritsFrom = std::tuple<FreeFlow>; };
//! The type tag for the single-phase, multi-component non-isothermal free-flow model
NEW_TYPE_TAG(NavierStokesNCNI, INHERITS_FROM(NavierStokesNC));
struct NavierStokesNCNI { using InheritsFrom = std::tuple<NavierStokesNC>; };
} // end namespace TTag
///////////////////////////////////////////////////////////////////////////
// default property values
......
......@@ -46,8 +46,11 @@ namespace Properties {
// Type tags
//////////////////////////////////////////////////////////////////
// Create new type tags
namespace TTag {
//! The type tags for the single-phase, multi-component isothermal one-equation model
NEW_TYPE_TAG(OneEqNC, INHERITS_FROM(NavierStokesNC));
struct OneEqNC { using InheritsFrom = std::tuple<NavierStokesNC>; };
} // end namespace TTag
///////////////////////////////////////////////////////////////////////////
// default property values
......@@ -146,8 +149,11 @@ SET_TYPE_PROP(OneEqNC, IOFields, FreeflowNCIOFields<OneEqIOFields, true/*turbule
// Property values for non-isothermal multi-component one-equation model
//////////////////////////////////////////////////////////////////////////
// Create new type tags
namespace TTag {
//! The type tags for the single-phase, multi-component non-isothermal one-equation models
NEW_TYPE_TAG(OneEqNCNI, INHERITS_FROM(NavierStokesNCNI));
struct OneEqNCNI { using InheritsFrom = std::tuple<NavierStokesNCNI>; };
} // end namespace TTag
//! The model traits of the non-isothermal model
SET_PROP(OneEqNCNI, ModelTraits)
......
......@@ -46,8 +46,11 @@ namespace Properties {
// Type tags
//////////////////////////////////////////////////////////////////
// Create new type tags
namespace TTag {
//! The type tags for the single-phase, multi-component isothermal ZeroEq model
NEW_TYPE_TAG(ZeroEqNC, INHERITS_FROM(NavierStokesNC));
struct ZeroEqNC { using InheritsFrom = std::tuple<NavierStokesNC>; };
} // end namespace TTag
///////////////////////////////////////////////////////////////////////////
// default property values
......@@ -105,8 +108,11 @@ SET_TYPE_PROP(ZeroEqNC, IOFields, FreeflowNCIOFields<RANSIOFields, true/*turbule
// Property values for non-isothermal multi-component ZeroEq model
//////////////////////////////////////////////////////////////////////////
// Create new type tags
namespace TTag {
//! The type tags for the single-phase, multi-component non-isothermal ZeroEq models
NEW_TYPE_TAG(ZeroEqNCNI, INHERITS_FROM(NavierStokesNCNI));
struct ZeroEqNCNI { using InheritsFrom = std::tuple<NavierStokesNCNI>; };
} // end namespace TTag
//! The model traits of the non-isothermal model
SET_PROP(ZeroEqNCNI, ModelTraits)
......
......@@ -136,11 +136,14 @@ namespace Properties {
// Type tags
//////////////////////////////////////////////////////////////////
// Create new type tags
namespace TTag {
//! The type tag for the single-phase, isothermal Navier-Stokes model
NEW_TYPE_TAG(NavierStokes, INHERITS_FROM(FreeFlow));
struct NavierStokes { using InheritsFrom = std::tuple<FreeFlow>; };
//! The type tag for the corresponding non-isothermal model
NEW_TYPE_TAG(NavierStokesNI, INHERITS_FROM(NavierStokes));
struct NavierStokesNI { using InheritsFrom = std::tuple<NavierStokes>; };
} // end namespace TTag
///////////////////////////////////////////////////////////////////////////
// default property values for the isothermal single phase model
......
......@@ -34,7 +34,10 @@ namespace Dumux {
namespace Properties {
//! Type tag for free-flow models
NEW_TYPE_TAG(FreeFlow, INHERITS_FROM(ModelProperties));
// Create new type tags
namespace TTag {
struct FreeFlow { using InheritsFrom = std::tuple<ModelProperties>; };
} // end namespace TTag
//! Use Fourier's Law as default heat conduction type
SET_TYPE_PROP(FreeFlow, HeatConductionType, FouriersLaw<TypeTag>);
......
......@@ -54,8 +54,11 @@ namespace Properties {
// Type tags
//////////////////////////////////////////////////////////////////
// Create new type tags
namespace TTag {
//! The type tag for the single-phase, isothermal Reynolds-Averaged Navier-Stokes model
NEW_TYPE_TAG(RANS, INHERITS_FROM(NavierStokes));
struct RANS { using InheritsFrom = std::tuple<NavierStokes>; };
} // end namespace TTag
///////////////////////////////////////////////////////////////////////////
// default property values for the isothermal single phase model
......@@ -90,8 +93,11 @@ SET_TYPE_PROP(RANS, IOFields, RANSIOFields);
// Property values for non-isothermal Reynolds-averaged Navier-Stokes model
//////////////////////////////////////////////////////////////////
// Create new type tags
namespace TTag {
//! The type tag for the single-phase, isothermal Reynolds-Averaged Navier-Stokes model
NEW_TYPE_TAG(RANSNI, INHERITS_FROM(RANS));
struct RANSNI { using InheritsFrom = std::tuple<RANS>; };
} // end namespace TTag
//! The model traits of the non-isothermal model
SET_PROP(RANSNI, ModelTraits)
......
......@@ -119,8 +119,11 @@ struct OneEqModelTraits : RANSModelTraits<dimension>
// default property values for the isothermal Spalart-Allmaras model
///////////////////////////////////////////////////////////////////////////
// Create new type tags
namespace TTag {
//! The type tag for the single-phase, isothermal Spalart-Allmaras model
NEW_TYPE_TAG(OneEq, INHERITS_FROM(RANS));
struct OneEq { using InheritsFrom = std::tuple<RANS>; };
} // end namespace TTag
//!< states some specifics of the isothermal Spalart-Allmaras model
SET_PROP(OneEq, ModelTraits)
......@@ -176,8 +179,11 @@ SET_TYPE_PROP(OneEq, IOFields, OneEqIOFields);
// default property values for the non-isothermal Spalart-Allmaras model
//////////////////////////////////////////////////////////////////
// Create new type tags
namespace TTag {
//! The type tag for the single-phase, isothermal Spalart-Allmaras model
NEW_TYPE_TAG(OneEqNI, INHERITS_FROM(RANSNI));
struct OneEqNI { using InheritsFrom = std::tuple<RANSNI>; };
} // end namespace TTag
//! The model traits of the non-isothermal model
SET_PROP(OneEqNI, ModelTraits)
......
......@@ -105,8 +105,11 @@ struct KEpsilonModelTraits : RANSModelTraits<dimension>
// default property values for the isothermal k-epsilon model
///////////////////////////////////////////////////////////////////////////
// Create new type tags
namespace TTag {
//! The type tag for the single-phase, isothermal k-epsilon model
NEW_TYPE_TAG(KEpsilon, INHERITS_FROM(RANS));
struct KEpsilon { using InheritsFrom = std::tuple<RANS>; };
} // end namespace TTag
//!< states some specifics of the isothermal k-epsilon model
SET_PROP(KEpsilon, ModelTraits)
......@@ -162,8 +165,11 @@ SET_TYPE_PROP(KEpsilon, IOFields, KEpsilonIOFields);
// default property values for the non-isothermal k-epsilon model
//////////////////////////////////////////////////////////////////
// Create new type tags
namespace TTag {
//! The type tag for the single-phase, isothermal k-epsilon model
NEW_TYPE_TAG(KEpsilonNI, INHERITS_FROM(RANSNI));
struct KEpsilonNI { using InheritsFrom = std::tuple<RANSNI>; };
} // end namespace TTag
//! The model traits of the non-isothermal model
SET_PROP(KEpsilonNI, ModelTraits)
......
......@@ -112,8 +112,11 @@ struct KOmegaModelTraits : RANSModelTraits<dimension>
// default property values for the isothermal k-omega single phase model
///////////////////////////////////////////////////////////////////////////
// Create new type tags
namespace TTag {
//! The type tag for the single-phase, isothermal k-omega model
NEW_TYPE_TAG(KOmega, INHERITS_FROM(RANS));
struct KOmega { using InheritsFrom = std::tuple<RANS>; };
} // end namespace TTag
//! states some specifics of the isothermal k-omega model
SET_PROP(KOmega, ModelTraits)
......@@ -170,8 +173,11 @@ SET_TYPE_PROP(KOmega, IOFields, KOmegaIOFields);
///////////////////////////////////////////////////////////////////////////
// Create new type tags
namespace TTag {
//! The type tag for the single-phase, non-isothermal k-omega 2-Eq. model
NEW_TYPE_TAG(KOmegaNI, INHERITS_FROM(RANSNI));
struct KOmegaNI { using InheritsFrom = std::tuple<RANSNI>; };
} // end namespace TTag
//! The model traits of the non-isothermal model
SET_PROP(KOmegaNI, ModelTraits)
......
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