Commit 09388d80 authored by Timo Koch's avatar Timo Koch
Browse files

[cleanup][tracer] Cleanup tracer volume variables class

parent 32287b0f
...@@ -35,6 +35,8 @@ namespace Dumux { ...@@ -35,6 +35,8 @@ namespace Dumux {
* \ingroup TracerModel * \ingroup TracerModel
* \brief Contains the quantities which are constant within a * \brief Contains the quantities which are constant within a
* finite volume for the tracer model. * finite volume for the tracer model.
* \todo: We need a scalar, vector, tensor type -> Scalar + dimWorld should be good template params
* Furthermore, we need the fluid system and stuff like useMoles -> ModelTraits?
*/ */
template <class TypeTag> template <class TypeTag>
class TracerVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag> class TracerVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
...@@ -42,20 +44,14 @@ class TracerVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag> ...@@ -42,20 +44,14 @@ class TracerVolumeVariables : public PorousMediumFlowVolumeVariables<TypeTag>
using ParentType = PorousMediumFlowVolumeVariables<TypeTag>; using ParentType = PorousMediumFlowVolumeVariables<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar); using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView); using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Implementation = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry)::LocalView;
using SubControlVolume = typename FVElementGeometry::SubControlVolume;
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem); using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles); static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static constexpr int dimWorld = GridView::dimensionworld; static constexpr int dimWorld = GridView::dimensionworld;
static constexpr int numComponents = GET_PROP_VALUE(TypeTag, NumComponents); static constexpr int numComponents = FluidSystem::numComponents;
using GlobalPosition = Dune::FieldVector<Scalar,dimWorld>; using GlobalPosition = Dune::FieldVector<Scalar,dimWorld>;
using Element = typename GridView::template Codim<0>::Entity;
public: public:
...@@ -68,7 +64,8 @@ public: ...@@ -68,7 +64,8 @@ public:
* \param element An element which contains part of the control volume * \param element An element which contains part of the control volume
* \param scv The sub-control volume * \param scv The sub-control volume
*/ */
template<class ElementSolution> template<class ElementSolution, class Problem,
class Element, class SubControlVolume>
void update(const ElementSolution &elemSol, void update(const ElementSolution &elemSol,
const Problem &problem, const Problem &problem,
const Element &element, const Element &element,
......
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