OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fluid states: remove phaseIsPresent()

Browse Source 
this method is now unused and before, it only caused trouble. To
replicate it, use fluidState.saturation(phaseIdx) > 0.0.
This commit is contained in:
Andreas Lauser 2017-12-04 14:51:12 +01:00
parent a15cb08d2e
commit 45870255f7
6 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/material/checkFluidSystem.hpp
View File

@ -179,13 +179,6 @@ public:
return this->base().saturation(phaseIdx);
}
auto phaseIsPresent(unsigned phaseIdx) const
-> decltype(this->base().phaseIsPresent(phaseIdx))
{
assert(false);
return this->base().phaseIsPresent(phaseIdx);
}
auto fugacity(unsigned phaseIdx, unsigned compIdx) const
-> decltype(this->base().fugacity(phaseIdx, compIdx))
{
@ -261,7 +254,6 @@ void checkFluidState(const BaseFluidState& fs)
val = fs.molarVolume(/*phaseIdx=*/0);
val = fs.density(/*phaseIdx=*/0);
val = fs.saturation(/*phaseIdx=*/0);
bool b OPM_UNUSED = fs.phaseIsPresent(/*phaseIdx=*/0);
val = fs.fugacity(/*phaseIdx=*/0, /*compIdx=*/0);
val = fs.fugacityCoefficient(/*phaseIdx=*/0, /*compIdx=*/0);
val = fs.enthalpy(/*phaseIdx=*/0);

3
opm/material/fluidstates/BlackOilFluidState.hpp
View File

@ -132,9 +132,6 @@ public:
unsigned short pvtRegionIndex() const
{ return pvtRegionIdx_; }
bool phaseIsPresent(unsigned phaseIdx) const
{ return saturation_[phaseIdx] > 0.0; }
//////
// slow methods
//////

12
opm/material/fluidstates/FluidStateSaturationModules.hpp
View File

@ -57,12 +57,6 @@ public:
const Scalar& saturation(unsigned phaseIdx) const
{ return saturation_[phaseIdx]; }
/*!
* \brief Returns true iff a fluid phase shall be assumed to be present.
*/
bool phaseIsPresent(unsigned phaseIdx) const
{ return saturation_[phaseIdx] > 0.0; }
/*!
* \brief Set the saturation of a phase [-]
*/
@ -115,12 +109,6 @@ public:
const Scalar& saturation(unsigned /* phaseIdx */) const
{ OPM_THROW(std::runtime_error, "Saturation is not provided by this fluid state"); }
/*!
* \brief Returns true iff a fluid phase shall be assumed to be present.
*/
bool phaseIsPresent(unsigned /* phaseIdx */) const
{ OPM_THROW(std::runtime_error, "phaseIsPresent() is not provided by this fluid state"); }
/*!
* \brief Retrieve all parameters from an arbitrary fluid
* state.

6
opm/material/fluidstates/PressureOverlayFluidState.hpp
View File

@ -88,12 +88,6 @@ public:
-> decltype(std::declval<FluidState>().saturation(phaseIdx))
{ return fs_->saturation(phaseIdx); }
/*!
* \brief Returns true iff a fluid phase shall be assumed to be present.
*/
bool phaseIsPresent(unsigned phaseIdx) const
{ return fs_->phaseIsPresent(phaseIdx); }
/*!
* \brief The mole fraction of a component in a phase []
*/

6
opm/material/fluidstates/SaturationOverlayFluidState.hpp
View File

@ -87,12 +87,6 @@ public:
-> decltype(std::declval<FluidState>().saturation(phaseIdx))
{ return saturation_[phaseIdx]; }
/*!
* \brief Returns true iff a fluid phase shall be assumed to be present.
*/
bool phaseIsPresent(unsigned phaseIdx) const
{ return saturation_[phaseIdx] > 0.0; }
/*!
* \brief The mole fraction of a component in a phase []
*/

6
opm/material/fluidstates/TemperatureOverlayFluidState.hpp
View File

@ -90,12 +90,6 @@ public:
-> decltype(std::declval<FluidState>().saturation(phaseIdx))
{ return fs_->saturation(phaseIdx); }
/*!
* \brief Returns true iff a fluid phase shall be assumed to be present.
*/
bool phaseIsPresent(unsigned phaseIdx) const
{ return fs_->phaseIsPresent(phaseIdx); }
/*!
* \brief The mole fraction of a component in a phase []
*/