Commit 904647c2 authored by Simon Scholz's avatar Simon Scholz
Browse files

[tracer] rename pIdx to phaseIdx

parent e2c17e19
......@@ -87,9 +87,9 @@ public:
*
* We always forward to the fluid state with the phaseIdx property (see class description).
*
* \param pIdx TODO docme!
* \param phaseIdx The phase index
*/
Scalar density(int pIdx = 0) const
Scalar density(int phaseIdx = 0) const
{ return fluidDensity_; }
/*!
......@@ -104,9 +104,9 @@ public:
* This method is here for compatibility reasons with other models. The saturation
* is always 1.0 in a one-phasic context.
*
* \param pIdx The phase index
* \param phaseIdx The phase index
*/
Scalar saturation(int pIdx = 0) const
Scalar saturation(int phaseIdx = 0) const
{ return 1.0; }
/*!
......@@ -115,53 +115,53 @@ public:
* This method is here for compatibility reasons with other models. The mobility is always 1
* for one-phasic models where the velocity field is given
*
* \param pIdx The phase index
* \param phaseIdx The phase index
*/
Scalar mobility(int pIdx = 0) const
Scalar mobility(int phaseIdx = 0) const
{ return 1.0; }
/*!
* \brief Returns the molar density \f$\mathrm{[mol/m^3]}\f$ the of the fluid phase.
*
* \param pIdx The phase index
* \param phaseIdx The phase index
*/
Scalar molarDensity(int pIdx = 0) const
Scalar molarDensity(int phaseIdx = 0) const
{ return fluidDensity_/fluidMolarMass_; }
/*!
* \brief Returns the mole fraction \f$\mathrm{[mol/mol]}\f$ of a component in the phase.
*
* \param pIdx The phase index
* \param phaseIdx The phase index
* \param compIdx The index of the component
*/
Scalar moleFraction(int pIdx, int compIdx) const
Scalar moleFraction(int phaseIdx, int compIdx) const
{ return useMoles ? moleOrMassFraction_[compIdx] : moleOrMassFraction_[compIdx]/FluidSystem::molarMass(compIdx)*fluidMolarMass_; }
/*!
* \brief Returns the mass fraction \f$\mathrm{[kg/kg]}\f$ of a component in the phase.
*
* \param pIdx The phase index
* \param phaseIdx The phase index
* \param compIdx The index of the component
*/
Scalar massFraction(int pIdx, int compIdx) const
Scalar massFraction(int phaseIdx, int compIdx) const
{ return useMoles ? moleOrMassFraction_[compIdx]*FluidSystem::molarMass(compIdx)/fluidMolarMass_ : moleOrMassFraction_[compIdx]; }
/*!
* \brief Returns the concentration \f$\mathrm{[mol/m^3]}\f$ of a component in the phase.
*
* \param pIdx The phase index
* \param phaseIdx The phase index
* \param compIdx The index of the component
*/
Scalar molarity(int pIdx, int compIdx) const
{ return moleFraction(pIdx, compIdx)*molarDensity(); }
Scalar molarity(int phaseIdx, int compIdx) const
{ return moleFraction(phaseIdx, compIdx)*molarDensity(); }
/*!
* \brief Returns the binary diffusion coefficient \f$\mathrm{[m^2/s]}\f$ in the fluid.
*
* \param pIdx The phase index
* \param phaseIdx The phase index
* \param compIdx The index of the component
*/
Scalar diffusionCoefficient(int pIdx, int compIdx) const
Scalar diffusionCoefficient(int phaseIdx, int compIdx) const
{ return diffCoeff_[compIdx]; }
// /*!
......
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