Skip to content
Snippets Groups Projects
Commit de864e41 authored by Dennis Gläser's avatar Dennis Gläser Committed by Timo Koch
Browse files

[implicit][spatialparams] Add problem to constructors

parent 78257cde
No related branches found
No related tags found
1 merge request!617[WIP] Next
......@@ -49,6 +49,7 @@ class ImplicitSpatialParams: public ImplicitSpatialParamsOneP<TypeTag>
{
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) Implementation;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, SubControlVolume) SubControlVolume;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
......@@ -62,8 +63,8 @@ class ImplicitSpatialParams: public ImplicitSpatialParamsOneP<TypeTag>
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
public:
ImplicitSpatialParams(const GridView &gridView)
:ImplicitSpatialParamsOneP<TypeTag>(gridView)
ImplicitSpatialParams(const Problem &problem, const GridView &gridView)
:ImplicitSpatialParamsOneP<TypeTag>(problem, gridView)
{ }
/*!
......
......@@ -53,6 +53,7 @@ template<class TypeTag>
class ImplicitSpatialParamsOneP
{
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) Implementation;
......@@ -67,8 +68,9 @@ class ImplicitSpatialParamsOneP
typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
public:
ImplicitSpatialParamsOneP(const GridView &gridView)
{ }
ImplicitSpatialParamsOneP(const Problem problem, const GridView &gridView)
: problemPtr_(&problem)
{}
/*!
* \brief Averages the intrinsic permeability (Scalar).
......@@ -208,12 +210,19 @@ public:
}
}
const Problem& problem_()
{
return *problemPtr_;
}
private:
Implementation &asImp_()
{ return *static_cast<Implementation*>(this); }
const Implementation &asImp_() const
{ return *static_cast<const Implementation*>(this); }
const Problem *problemPtr_;
};
} // namespace Dumux
......
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