Skip to content
Snippets Groups Projects
Commit 4a62d46e authored by Timo Koch's avatar Timo Koch
Browse files

[properties] Qualify class in Dumux namespace to avoid clash with property of same name

parent 238d287f
No related branches found
No related tags found
2 merge requests!1269[1pncmin tests changed],!1211[properties] Add property system implementation without macros and variadic templates
...@@ -46,7 +46,7 @@ private: ...@@ -46,7 +46,7 @@ private:
using GridView = typename GET_PROP_TYPE(TypeTag, GridView); using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using GlobalPosition = typename Dune::FieldVector<typename GridView::ctype, GridView::dimensionworld>; using GlobalPosition = typename Dune::FieldVector<typename GridView::ctype, GridView::dimensionworld>;
public: public:
using type = PointSource<GlobalPosition, SourceValues>; using type = Dumux::PointSource<GlobalPosition, SourceValues>;
}; };
//! Use the point source helper using the bounding box tree as a default //! Use the point source helper using the bounding box tree as a default
......
...@@ -61,7 +61,7 @@ SET_BOOL_PROP(FiniteVolumeModel, EnableGridVolumeVariablesCache, false); ...@@ -61,7 +61,7 @@ SET_BOOL_PROP(FiniteVolumeModel, EnableGridVolumeVariablesCache, false);
SET_BOOL_PROP(FiniteVolumeModel, EnableGridFluxVariablesCache, false); SET_BOOL_PROP(FiniteVolumeModel, EnableGridFluxVariablesCache, false);
//! Boundary types at a single degree of freedom //! Boundary types at a single degree of freedom
SET_TYPE_PROP(FiniteVolumeModel, BoundaryTypes, BoundaryTypes<GET_PROP_TYPE(TypeTag, ModelTraits)::numEq()>); SET_TYPE_PROP(FiniteVolumeModel, BoundaryTypes, Dumux::BoundaryTypes<GET_PROP_TYPE(TypeTag, ModelTraits)::numEq()>);
// TODO: bundle SolutionVector, JacobianMatrix // TODO: bundle SolutionVector, JacobianMatrix
// in LinearAlgebra traits // in LinearAlgebra traits
......
...@@ -90,7 +90,7 @@ SET_PROP(StaggeredModel, StaggeredFaceSolution) ...@@ -90,7 +90,7 @@ SET_PROP(StaggeredModel, StaggeredFaceSolution)
private: private:
using FaceSolutionVector = typename GET_PROP_TYPE(TypeTag, FaceSolutionVector); using FaceSolutionVector = typename GET_PROP_TYPE(TypeTag, FaceSolutionVector);
public: public:
using type = StaggeredFaceSolution<FaceSolutionVector>; using type = Dumux::StaggeredFaceSolution<FaceSolutionVector>;
}; };
//! Set the grid variables (volume, flux and face variables) //! Set the grid variables (volume, flux and face variables)
...@@ -124,7 +124,7 @@ SET_TYPE_PROP(StaggeredModel, ...@@ -124,7 +124,7 @@ SET_TYPE_PROP(StaggeredModel,
GET_PROP_VALUE(TypeTag, NumEqFace)>); GET_PROP_VALUE(TypeTag, NumEqFace)>);
//! Boundary types at a single degree of freedom //! Boundary types at a single degree of freedom
SET_TYPE_PROP(StaggeredModel, BoundaryTypes, BoundaryTypes<GET_PROP_TYPE(TypeTag, ModelTraits)::numEq()>); SET_TYPE_PROP(StaggeredModel, BoundaryTypes, Dumux::BoundaryTypes<GET_PROP_TYPE(TypeTag, ModelTraits)::numEq()>);
// TODO: bundle SolutionVector, JacobianMatrix // TODO: bundle SolutionVector, JacobianMatrix
// in LinearAlgebra traits // in LinearAlgebra traits
......
...@@ -144,7 +144,7 @@ public: ...@@ -144,7 +144,7 @@ public:
SET_PROP(NonEquilibrium, NusseltFormulation) SET_PROP(NonEquilibrium, NusseltFormulation)
{ {
public: public:
static constexpr NusseltFormulation value = NusseltFormulation::WakaoKaguei; static constexpr Dumux::NusseltFormulation value = Dumux::NusseltFormulation::WakaoKaguei;
}; };
/*! /*!
...@@ -154,7 +154,7 @@ public: ...@@ -154,7 +154,7 @@ public:
SET_PROP(NonEquilibrium, SherwoodFormulation) SET_PROP(NonEquilibrium, SherwoodFormulation)
{ {
public: public:
static constexpr SherwoodFormulation value = SherwoodFormulation::WakaoKaguei; static constexpr Dumux::SherwoodFormulation value = Dumux::SherwoodFormulation::WakaoKaguei;
}; };
} //end namespace Properties } //end namespace Properties
......
...@@ -71,7 +71,7 @@ SET_BOOL_PROP(PorousMediumFlow, SolutionDependentMolecularDiffusion, true); ...@@ -71,7 +71,7 @@ SET_BOOL_PROP(PorousMediumFlow, SolutionDependentMolecularDiffusion, true);
SET_BOOL_PROP(PorousMediumFlow, SolutionDependentHeatConduction, true); SET_BOOL_PROP(PorousMediumFlow, SolutionDependentHeatConduction, true);
//! The default implementation of the energy balance equation for flow problems in porous media. //! The default implementation of the energy balance equation for flow problems in porous media.
SET_TYPE_PROP(PorousMediumFlow, EnergyLocalResidual, EnergyLocalResidual<TypeTag> ); SET_TYPE_PROP(PorousMediumFlow, EnergyLocalResidual, Dumux::EnergyLocalResidual<TypeTag> );
//! Velocity output //! Velocity output
SET_TYPE_PROP(PorousMediumFlow, VelocityOutput, SET_TYPE_PROP(PorousMediumFlow, VelocityOutput,
......
...@@ -214,7 +214,7 @@ SET_TYPE_PROP(SequentialModel, Variables, VariableClass<TypeTag>); ...@@ -214,7 +214,7 @@ SET_TYPE_PROP(SequentialModel, Variables, VariableClass<TypeTag>);
SET_TYPE_PROP(SequentialModel, PrimaryVariables, typename GET_PROP(TypeTag, SolutionTypes)::PrimaryVariables); SET_TYPE_PROP(SequentialModel, PrimaryVariables, typename GET_PROP(TypeTag, SolutionTypes)::PrimaryVariables);
//! Set the default type for the time manager //! Set the default type for the time manager
SET_TYPE_PROP(SequentialModel, TimeManager, TimeManager<TypeTag>); SET_TYPE_PROP(SequentialModel, TimeManager, Dumux::TimeManager<TypeTag>);
/*! /*!
* \brief Boundary types at a single degree of freedom. * \brief Boundary types at a single degree of freedom.
...@@ -223,7 +223,7 @@ SET_PROP(SequentialModel, BoundaryTypes) ...@@ -223,7 +223,7 @@ SET_PROP(SequentialModel, BoundaryTypes)
{ private: { private:
enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) }; enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
public: public:
using type = BoundaryTypes<numEq>; using type = Dumux::BoundaryTypes<numEq>;
}; };
//! do not specific any model-specific default parameters here //! do not specific any model-specific default parameters here
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment