Commit dab3f27a authored by Klaus Mosthaf's avatar Klaus Mosthaf
Browse files

renamed arguments to the same names as in the

parent class. This was required to make \copydoc work correctly.


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7852 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent cd3afa89
...@@ -74,43 +74,44 @@ class StokesVolumeVariables : public BoxVolumeVariables<TypeTag> ...@@ -74,43 +74,44 @@ class StokesVolumeVariables : public BoxVolumeVariables<TypeTag>
public: public:
/*! /*!
* \@copydoc BoxModel::update() * \copydoc BoxVolumeVariables::update()
*/ */
void update(const PrimaryVariables &primaryVars, void update(const PrimaryVariables &priVars,
const Problem &problem, const Problem &problem,
const Element &element, const Element &element,
const FVElementGeometry &elemGeom, const FVElementGeometry &elemGeom,
int vertIdx, int scvIdx,
bool isOldSol) bool isOldSol)
{ {
ParentType::update(primaryVars, ParentType::update(priVars,
problem, problem,
element, element,
elemGeom, elemGeom,
vertIdx, scvIdx,
isOldSol); isOldSol);
completeFluidState(primaryVars, problem, element, elemGeom, vertIdx, fluidState_, isOldSol); completeFluidState(priVars, problem, element, elemGeom, scvIdx, fluidState_, isOldSol);
for (int dimIdx=momentumXIdx; dimIdx<=lastMomentumIdx; ++dimIdx) for (int dimIdx=momentumXIdx; dimIdx<=lastMomentumIdx; ++dimIdx)
velocity_[dimIdx] = primaryVars[dimIdx]; velocity_[dimIdx] = priVars[dimIdx];
} }
/*! /*!
* \@copydoc BoxModel::completeFluidState() * \copydoc BoxModel::completeFluidState()
* \param isOldSol Specifies whether this is the previous solution or the current one
*/ */
static void completeFluidState(const PrimaryVariables& primaryVars, static void completeFluidState(const PrimaryVariables& primaryVariables,
const Problem& problem, const Problem& problem,
const Element& element, const Element& element,
const FVElementGeometry& elemGeom, const FVElementGeometry& elementGeometry,
int scvIdx, int scvIdx,
FluidState& fluidState, FluidState& fluidState,
bool isOldSol = false) bool isOldSol = false)
{ {
Scalar temperature = Implementation::temperature_(primaryVars, problem, element, Scalar temperature = Implementation::temperature_(primaryVariables, problem,
elemGeom, scvIdx); element, elementGeometry, scvIdx);
fluidState.setTemperature(temperature); fluidState.setTemperature(temperature);
fluidState.setPressure(phaseIdx, primaryVars[pressureIdx]); fluidState.setPressure(phaseIdx, primaryVariables[pressureIdx]);
// create NullParameterCache and do dummy update // create NullParameterCache and do dummy update
typename FluidSystem::ParameterCache paramCache; typename FluidSystem::ParameterCache paramCache;
......
...@@ -88,9 +88,10 @@ class Stokes2cModel : public StokesModel<TypeTag> ...@@ -88,9 +88,10 @@ class Stokes2cModel : public StokesModel<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables; typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
public: public:
//! \@copydoc BoxModel::addOutputVtkFields //! \copydoc BoxModel::addOutputVtkFields
template <class MultiWriter> template <class MultiWriter>
void addOutputVtkFields(const SolutionVector &sol, MultiWriter &writer) void addOutputVtkFields(const SolutionVector &sol,
MultiWriter &writer)
{ {
typedef Dune::BlockVector<Dune::FieldVector<Scalar, 1> > ScalarField; typedef Dune::BlockVector<Dune::FieldVector<Scalar, 1> > ScalarField;
typedef Dune::BlockVector<Dune::FieldVector<Scalar, dim> > VelocityField; typedef Dune::BlockVector<Dune::FieldVector<Scalar, dim> > VelocityField;
......
...@@ -66,24 +66,24 @@ class Stokes2cVolumeVariables : public StokesVolumeVariables<TypeTag> ...@@ -66,24 +66,24 @@ class Stokes2cVolumeVariables : public StokesVolumeVariables<TypeTag>
public: public:
/*! /*!
* \@copydoc BoxModel::update * \copydoc BoxVolumeVariables::update()
*/ */
void update(const PrimaryVariables &primaryVars, void update(const PrimaryVariables &priVars,
const Problem &problem, const Problem &problem,
const Element &element, const Element &element,
const FVElementGeometry &elemGeom, const FVElementGeometry &elemGeom,
int vertIdx, int scvIdx,
bool isOldSol) bool isOldSol)
{ {
// set the mole fractions first // set the mole fractions first
completeFluidState(primaryVars, problem, element, elemGeom, vertIdx, this->fluidState(), isOldSol); completeFluidState(priVars, problem, element, elemGeom, scvIdx, this->fluidState(), isOldSol);
// update vertex data for the mass and momentum balance // update vertex data for the mass and momentum balance
ParentType::update(primaryVars, ParentType::update(priVars,
problem, problem,
element, element,
elemGeom, elemGeom,
vertIdx, scvIdx,
isOldSol); isOldSol);
// Second instance of a parameter cache. // Second instance of a parameter cache.
...@@ -102,18 +102,19 @@ public: ...@@ -102,18 +102,19 @@ public:
}; };
/*! /*!
* \@copydoc BoxModel::completeFluidState * \copydoc BoxModel::completeFluidState()
* \param isOldSol Specifies whether this is the previous solution or the current one
*/ */
static void completeFluidState(const PrimaryVariables& primaryVars, static void completeFluidState(const PrimaryVariables& primaryVariables,
const Problem& problem, const Problem& problem,
const Element& element, const Element& element,
const FVElementGeometry& elemGeom, const FVElementGeometry& elementGeometry,
int scvIdx, int scvIdx,
FluidState& fluidState, FluidState& fluidState,
bool isOldSol = false) bool isOldSol = false)
{ {
Scalar massFraction[numComponents]; Scalar massFraction[numComponents];
massFraction[lCompIdx] = primaryVars[transportIdx]; massFraction[lCompIdx] = primaryVariables[transportIdx];
massFraction[gCompIdx] = 1 - massFraction[lCompIdx]; massFraction[gCompIdx] = 1 - massFraction[lCompIdx];
// calculate average molar mass of the gas phase // calculate average molar mass of the gas phase
......
...@@ -98,9 +98,10 @@ class Stokes2cniModel : public Stokes2cModel<TypeTag> ...@@ -98,9 +98,10 @@ class Stokes2cniModel : public Stokes2cModel<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables; typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
public: public:
//! \@copydoc BoxModel::addOutputVtkFields //! \copydoc BoxModel::addOutputVtkFields
template <class MultiWriter> template <class MultiWriter>
void addOutputVtkFields(const SolutionVector &sol, MultiWriter &writer) void addOutputVtkFields(const SolutionVector &sol,
MultiWriter &writer)
{ {
typedef Dune::BlockVector<Dune::FieldVector<Scalar, 1> > ScalarField; typedef Dune::BlockVector<Dune::FieldVector<Scalar, 1> > ScalarField;
typedef Dune::BlockVector<Dune::FieldVector<Scalar, dim> > VelocityField; typedef Dune::BlockVector<Dune::FieldVector<Scalar, dim> > VelocityField;
......
...@@ -63,13 +63,13 @@ class Stokes2cniVolumeVariables : public Stokes2cVolumeVariables<TypeTag> ...@@ -63,13 +63,13 @@ class Stokes2cniVolumeVariables : public Stokes2cVolumeVariables<TypeTag>
public: public:
/*! /*!
* \@copydoc BoxModel::update * \copydoc BoxVolumeVariables::update()
*/ */
void update(const PrimaryVariables &primaryVars, void update(const PrimaryVariables &priVars,
const Problem &problem, const Problem &problem,
const Element &element, const Element &element,
const FVElementGeometry &elemGeom, const FVElementGeometry &elemGeom,
int vertIdx, int scvIdx,
bool isOldSol) bool isOldSol)
{ {
// the internal energies and the enthalpies // the internal energies and the enthalpies
...@@ -77,11 +77,11 @@ public: ...@@ -77,11 +77,11 @@ public:
//TODO: value (Source: www.engineeringtoolbox.com/air-properties-d_156.html) //TODO: value (Source: www.engineeringtoolbox.com/air-properties-d_156.html)
// vertex update data for the mass balance // vertex update data for the mass balance
ParentType::update(primaryVars, ParentType::update(priVars,
problem, problem,
element, element,
elemGeom, elemGeom,
vertIdx, scvIdx,
isOldSol); isOldSol);
}; };
......
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