Commit d23929df authored by Timo Koch's avatar Timo Koch
Browse files

[volvars] Rename wettingPhaseIdx() -> wettingPhase()

parent b5bda6da
......@@ -122,9 +122,9 @@ private:
using FluidSystem = typename PlotThermalConductivityModel::FluidSystem;
Scalar saturation(int phaseIdx) const
Scalar saturation(const int phaseIdx) const
{
if (phaseIdx == wettingPhaseIdx())
if (phaseIdx == wettingPhase())
return saturation_;
else
return 1.0 - saturation_;
......@@ -132,14 +132,14 @@ private:
Scalar fluidThermalConductivity(const int phaseIdx) const
{
if (phaseIdx == wettingPhaseIdx())
if (phaseIdx == wettingPhase())
return lambdaW_;
else
return lambdaN_;
}
Scalar wettingPhaseIdx() const
{ return phase0Idx;}
int wettingPhase() const
{ return phase0Idx; }
Scalar porosity() const
{ return porosity_; }
......
......@@ -82,8 +82,8 @@ public:
// TODO: there should be an assertion that the indices are correct and 0 is actually the wetting phase!
const Scalar sw = volVars.saturation(volVars.wettingPhaseIdx());
const Scalar lambdaW = volVars.fluidThermalConductivity(volVars.wettingPhaseIdx());
const Scalar lambdaN = volVars.fluidThermalConductivity(1-volVars.wettingPhaseIdx());
const Scalar lambdaW = volVars.fluidThermalConductivity(volVars.wettingPhase());
const Scalar lambdaN = volVars.fluidThermalConductivity(1-volVars.wettingPhase());
const Scalar lambdaSolid = volVars.solidThermalConductivity();
const Scalar porosity = volVars.porosity();
const Scalar rhoSolid = volVars.solidDensity();
......
......@@ -287,7 +287,7 @@ public:
/*!
* \brief Returns the wetting phase index
*/
const int wettingPhaseIdx() const
int wettingPhase() const
{ return wPhaseIdx_; }
protected:
......
......@@ -401,7 +401,7 @@ public:
/*!
* \brief Returns the wetting phase index
*/
const int wettingPhaseIdx() const
int wettingPhase() const
{ return wPhaseIdx_; }
protected:
......
......@@ -406,7 +406,7 @@ public:
/*!
* \brief Returns the wetting phase index
*/
const int wettingPhaseIdx() const
int wettingPhase() const
{ return wPhaseIdx_; }
private:
......
......@@ -495,7 +495,7 @@ public:
/*!
* \brief Returns the wetting phase index
*/
const int wettingPhaseIdx() const
int wettingPhase() const
{ return wPhaseIdx_; }
protected:
......
......@@ -491,10 +491,9 @@ public:
/*!
* \brief Returns the wetting phase index
*/
const int wettingPhaseIdx() const
int wettingPhase() const
{ return wPhaseIdx_; }
private:
int wPhaseIdx_;
FluidState fluidState_;
......
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