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

fix return type getSaltConcentration

Browse Source
This commit is contained in:
Tor Harald Sandve 2020-07-08 08:09:26 +02:00
parent b4c8dd5e86
commit 74a6b98b4f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,14 +79,14 @@ LhsEval getInvB_(typename std::enable_if<!HasMember_invB<FluidState>::value,
OPM_GENERATE_HAS_MEMBER(saltConcentration, ) // Creates 'HasMember_saltConcentration<T>'. OPM_GENERATE_HAS_MEMBER(saltConcentration, ) // Creates 'HasMember_saltConcentration<T>'.
template <class FluidState> template <class FluidState>
unsigned getSaltConcentration_(typename std::enable_if<HasMember_saltConcentration<FluidState>::value, auto getSaltConcentration_(typename std::enable_if<HasMember_saltConcentration<FluidState>::value,
const FluidState&>::type fluidState) const FluidState&>::type fluidState)
{ return fluidState.saltConcentration(); } { return fluidState.saltConcentration(); }
template <class FluidState> template <class FluidState>
unsigned getSaltConcentration_(typename std::enable_if<!HasMember_saltConcentration<FluidState>::value, auto getSaltConcentration_(typename std::enable_if<!HasMember_saltConcentration<FluidState>::value,
const FluidState&>::type fluidState OPM_UNUSED) const FluidState&>::type fluidState OPM_UNUSED)
{ return 0; } { return 0.0; }
/*! /*!
* \brief Implements a "tailor-made" fluid state class for the black-oil model. * \brief Implements a "tailor-made" fluid state class for the black-oil model.