Skip to content
Snippets Groups Projects
Commit 0772d902 authored by Sina Ackermann's avatar Sina Ackermann Committed by Kilian Weishaupt
Browse files

[staggeredGrid][nonisothermal] Adapt volumevariables

parent f209f32c
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
dumux/freeflow/staggered/volumevariables.hh
+ 172
− 17
View file @ 0772d902
......@@ -32,27 +32,41 @@
namespace Dumux
{
// forward declaration
template <class TypeTag, bool enableEnergyBalance>
class NavierStokesVolumeVariablesImplementation;
/*!
* \ingroup ImplicitVolumeVariables
* \brief Base class for the model specific class which provides
* access to all volume averaged quantities for the free flow.
* The volume variables base class
* is specialized for isothermal and non-isothermal models.
*/
template <class TypeTag>
using NavierStokesVolumeVariables = NavierStokesVolumeVariablesImplementation<TypeTag, GET_PROP_VALUE(TypeTag, EnableEnergyBalanceStokes)>;
/*!
* \ingroup NavierStokesModel
* \ingroup ImplicitVolumeVariables
* \brief Contains the quantities which are constant within a
* \brief Isothermal base class, contains the quantities which are constant within a
* finite volume in the one-phase model.
*/
template <class TypeTag>
class NavierStokesVolumeVariables : public ImplicitVolumeVariables<TypeTag>
class NavierStokesVolumeVariablesImplementation<TypeTag, false>
{
using ParentType = ImplicitVolumeVariables<TypeTag>;
using Implementation = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
static constexpr bool isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox);
static const int phaseIdx = Indices::phaseIdx;
public:
......@@ -66,11 +80,19 @@ public:
const Element &element,
const SubControlVolume& scv)
{
ParentType::update(elemSol, problem, element, scv);
priVars_ = extractDofPriVars(elemSol, scv);
extrusionFactor_ = problem.extrusionFactor(element, scv, elemSol);
completeFluidState(elemSol, problem, element, scv, fluidState_);
};
/*!
* \brief Returns the primary variables at the dof associated with a given scv.
*/
static const PrimaryVariables& extractDofPriVars(const ElementSolutionVector& elemSol,
const SubControlVolume& scv)
{ return elemSol[0]; }
/*!
* \copydoc ImplicitModel::completeFluidState
*/
......@@ -80,7 +102,7 @@ public:
const SubControlVolume& scv,
FluidState& fluidState)
{
Scalar t = ParentType::temperature(elemSol, problem, element, scv);
Scalar t = problem.temperatureAtPos(scv.dofPosition());
fluidState.setTemperature(t);
fluidState.setSaturation(/*phaseIdx=*/0, 1.);
......@@ -99,12 +121,20 @@ public:
value = FluidSystem::viscosity(fluidState, paramCache, /*phaseIdx=*/0);
fluidState.setViscosity(/*phaseIdx=*/0, value);
// compute and set the enthalpy
value = ParentType::enthalpy(fluidState, paramCache, /*phaseIdx=*/0);
fluidState.setEnthalpy(/*phaseIdx=*/0, value);
}
/*!
* \brief Return how much the sub-control volume is extruded.
*
* This means the factor by which a lower-dimensional (1D or 2D)
* entity needs to be expanded to get a full dimensional cell. The
* default is 1.0 which means that 1D problems are actually
* thought as pipes with a cross section of 1 m^2 and 2D problems
* are assumed to extend 1 m to the back.
*/
Scalar extrusionFactor() const
{ return extrusionFactor_; }
/*!
* \brief Return temperature \f$\mathrm{[K]}\f$ inside the sub-control volume.
*
......@@ -135,6 +165,28 @@ public:
Scalar density(int phaseIdx = 0) const
{ return fluidState_.density(phaseIdx); }
/*!
* \brief Returns the mass density of a given phase within the
* control volume.
*
* \param phaseIdx The phase index
*/
Scalar molarDensity() const
{
return fluidState_.molarDensity(phaseIdx);
}
/*!
* \brief Returns the molar mass of a given phase within the
* control volume.
*
* \param phaseIdx The phase index
*/
Scalar molarMass() const
{
return fluidState_.averageMolarMass(phaseIdx);
}
/*!
* \brief Return the dynamic viscosity \f$\mathrm{[Pa s]}\f$ of the fluid within the
* control volume.
......@@ -150,14 +202,117 @@ public:
protected:
FluidState fluidState_;
PrimaryVariables priVars_;
Scalar extrusionFactor_;
};
Implementation &asImp_()
{ return *static_cast<Implementation*>(this); }
/*!
* \ingroup NavierStokesModel
* \ingroup ImplicitVolumeVariables
* \brief Non-isothermal base class
*/
template <class TypeTag>
class NavierStokesVolumeVariablesImplementation<TypeTag, true>
: public NavierStokesVolumeVariablesImplementation<TypeTag, false>
{
using ParentType = NavierStokesVolumeVariablesImplementation<TypeTag, false>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
const Implementation &asImp_() const
{ return *static_cast<const Implementation*>(this); }
};
static const int phaseIdx = Indices::phaseIdx;
public:
using FluidState = typename GET_PROP_TYPE(TypeTag, FluidState);
/*!
* \copydoc ImplicitVolumeVariables::update
*/
void update(const ElementSolutionVector &elemSol,
const Problem &problem,
const Element &element,
const SubControlVolume &scv)
{
this->priVars_ = ParentType::extractDofPriVars(elemSol, scv);
this->extrusionFactor_ = problem.extrusionFactor(element, scv, elemSol);
completeFluidState(elemSol, problem, element, scv, this->fluidState_);
}
/*!
* \copydoc ImplicitModel::completeFluidState
*/
static void completeFluidState(const ElementSolutionVector& elemSol,
const Problem& problem,
const Element& element,
const SubControlVolume& scv,
FluidState& fluidState)
{
fluidState.setTemperature(elemSol[0][Indices::temperatureIdx]);
fluidState.setPressure(phaseIdx, elemSol[0][Indices::pressureIdx]);
// saturation in a single phase is always 1 and thus redundant
// to set. But since we use the fluid state shared by the
// immiscible multi-phase models, so we have to set it here...
fluidState.setSaturation(phaseIdx, 1.0);
typename FluidSystem::ParameterCache paramCache;
paramCache.updatePhase(fluidState, phaseIdx);
Scalar value = FluidSystem::density(fluidState, paramCache, phaseIdx);
fluidState.setDensity(phaseIdx, value);
value = FluidSystem::viscosity(fluidState, paramCache, phaseIdx);
fluidState.setViscosity(phaseIdx, value);
// compute and set the enthalpy
value = FluidSystem::enthalpy(fluidState, paramCache, phaseIdx);
fluidState.setEnthalpy(phaseIdx, value);
}
/*!
* \brief Returns the total internal energy of the fluid phase in the
* sub-control volume.
*/
Scalar internalEnergy() const
{ return this->fluidState_.internalEnergy(phaseIdx); }
/*!
* \brief Returns the total enthalpy of the fluid phase in the sub-control
* volume.
*/
Scalar enthalpy() const
{ return this->fluidState_.enthalpy(phaseIdx); }
/*!
* \brief Return the specific isobaric heat capacity \f$\mathrm{[J/(kg*K)]}\f$
* in the sub-control volume.
*/
Scalar heatCapacity() const
{ return FluidSystem::heatCapacity(this->fluidState_, phaseIdx); }
/*!
* \brief Returns the thermal conductivity \f$\mathrm{[W/(m*K)]}\f$
* of the fluid phase in the sub-control volume.
*/
Scalar thermalConductivity() const
{ return FluidSystem::thermalConductivity(this->fluidState_, phaseIdx); }
/*!
* \brief Returns the temperature \f$\mathrm{[K]}\f$
* of the fluid phase in the sub-control volume.
*/
Scalar temperature() const
{ return this->fluidState_.temperature(phaseIdx); }
};
}
#endif
dumux/freeflow/staggeredni/propertydefaults.hh
+ 3
− 3
View file @ 0772d902
......@@ -29,11 +29,10 @@
#include "properties.hh"
#include "model.hh"
#include "volumevariables.hh"
#include "../staggered/volumevariables.hh"
#include "indices.hh"
#include "../staggered/propertydefaults.hh" //TODO: why do we need this include?
namespace Dumux
{
......@@ -55,7 +54,7 @@ public:
// SET_INT_PROP(StaggeredNonIsothermal, NumEqCellCenter, 2);
//
// //! the VolumeVariables property
SET_TYPE_PROP(StaggeredNonIsothermal, VolumeVariables, NavierStokesNIVolumeVariables<TypeTag>);
SET_TYPE_PROP(StaggeredNonIsothermal, VolumeVariables, NavierStokesVolumeVariables<TypeTag>);
SET_TYPE_PROP(StaggeredNonIsothermal, Model, StaggeredNonIsothermalModel<TypeTag>);
SET_TYPE_PROP(StaggeredNonIsothermal, Indices, StaggeredNonIsothermalIndices<TypeTag>);
//
......@@ -67,6 +66,7 @@ SET_TYPE_PROP(StaggeredNonIsothermal, HeatConductionType, FouriersLaw<TypeTag>);
//
SET_INT_PROP(StaggeredNonIsothermal, PhaseIdx, 0); //!< Defines the phaseIdx
} // end namespace Properties
} // end namespace Dumux
......
dumux/freeflow/staggeredni/volumevariables.hh deleted 100644 → 0
+ 0
− 184
View file @ f209f32c
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* See the file COPYING for full copying permissions. *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
/*!
* \file
*
* \brief Contains the supplemental quantities, which are constant within a
* finite volume in the non-isothermal Stokes staggered grid model.
*/
#ifndef DUMUX_STAGGEREDNI_VOLUME_VARIABLES_HH
#define DUMUX_STAGGEREDNI_VOLUME_VARIABLES_HH
#include <dumux/freeflow/staggered/volumevariables.hh>
#include "properties.hh"
namespace Dumux
{
/*!
* \ingroup NavierStokesModel
* \ingroup ImplicitVolumeVariables
* \brief Contains the quantities which are are constant within a
* finite volume in the non-isothermal Stokes staggered grid model.
*/
template <class TypeTag>
class NavierStokesNIVolumeVariables : public NavierStokesVolumeVariables<TypeTag>
{
using ParentType = ImplicitVolumeVariables<TypeTag>;
using Implementation = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using FluidState = typename GET_PROP_TYPE(TypeTag, FluidState);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
using CellCenterPrimaryVariables = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
enum { numPhases = FluidSystem::numPhases,
phaseIdx = Indices::phaseIdx,
temperatureIdx = Indices::temperatureIdx
};
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
public:
/*!
* \copydoc ImplicitVolumeVariables::update()
*/
void update(const ElementSolutionVector &elemSol,
const Problem &problem,
const Element &element,
const SubControlVolume& scv)
{
ParentType::update(elemSol, problem, element, scv);
completeFluidState(elemSol, problem, element, scv, this->fluidState_);
}
/*!
* \copydoc ImplicitModel::completeFluidState
*/
static void completeFluidState(const ElementSolutionVector& elemSol,
const Problem& problem,
const Element& element,
const SubControlVolume& scv,
FluidState& fluidState)
{
fluidState.setTemperature(elemSol[0][Indices::temperatureIdx]);
fluidState.setPressure(phaseIdx, elemSol[0][Indices::pressureIdx]);
// saturation in a single phase is always 1 and thus redundant
// to set. But since we use the fluid state shared by the
// immiscible multi-phase models, so we have to set it here...
fluidState.setSaturation(phaseIdx, 1.0);
typename FluidSystem::ParameterCache paramCache;
paramCache.updatePhase(fluidState, phaseIdx);
Scalar value = FluidSystem::density(fluidState, paramCache, phaseIdx);
fluidState.setDensity(phaseIdx, value);
value = FluidSystem::viscosity(fluidState, paramCache, phaseIdx);
fluidState.setViscosity(phaseIdx, value);
// compute and set the enthalpy
value = FluidSystem::enthalpy(fluidState, paramCache, phaseIdx);
fluidState.setEnthalpy(phaseIdx, value);
}
/*!
* \brief Return the mass density \f$\mathrm{[kg/m^3]}\f$ of a given phase within the
* control volume.
*/
Scalar density(int phaseIdx = 0) const
{ return this->fluidState_.density(phaseIdx); }
/*!
* \brief Returns the mass density of a given phase within the
* control volume.
*
* \param phaseIdx The phase index
*/
Scalar molarDensity() const
{
return this->fluidState_.molarDensity(phaseIdx);
}
/*!
* \brief Returns the molar mass of a given phase within the
* control volume.
*
* \param phaseIdx The phase index
*/
Scalar molarMass() const
{
return this->fluidState_.averageMolarMass(phaseIdx);
}
/*!
* \brief Returns the total internal energy of the fluid phase in the
* sub-control volume.
*/
Scalar internalEnergy() const
{ return this->fluidState_.internalEnergy(phaseIdx); }
/*!
* \brief Returns the total enthalpy of the fluid phase in the sub-control
* volume.
*/
Scalar enthalpy() const
{ return this->fluidState_.enthalpy(phaseIdx); }
/*!
* \brief Return the specific isobaric heat capacity \f$\mathrm{[J/(kg*K)]}\f$
* in the sub-control volume.
*/
Scalar heatCapacity() const
{ return FluidSystem::heatCapacity(this->fluidState_, phaseIdx); }
/*!
* \brief Returns the thermal conductivity \f$\mathrm{[W/(m*K)]}\f$
* of the fluid phase in the sub-control volume.
*/
Scalar thermalConductivity() const
{ return FluidSystem::thermalConductivity(this->fluidState_, phaseIdx); }
/*!
* \brief Returns the temperature \f$\mathrm{[K]}\f$
* of the fluid phase in the sub-control volume.
*/
Scalar temperature() const
{ return this->fluidState_.temperature(phaseIdx); }
protected:
// this method gets called by the parent class. since this method
// is protected, we are friends with our parent...
friend class NavierStokesVolumeVariables<TypeTag>;
};
} // end namespace
#endif
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