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

make the water PVT salt dependent

Browse Source
This commit is contained in:
Tor Harald Sandve 2020-07-02 13:42:58 +02:00
parent a11b3a53b2
commit b4c8dd5e86
5 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

12
opm/material/fluidsystems/BlackOilFluidSystem.hpp
View File

@ -603,6 +603,7 @@ public:
const LhsEval& p = Opm::decay<LhsEval>(fluidState.pressure(phaseIdx));
const LhsEval& T = Opm::decay<LhsEval>(fluidState.temperature(phaseIdx));
const LhsEval& saltConcentration = Opm::BlackOil::template getSaltConcentration_<ThisType, FluidState, LhsEval>(fluidState, regionIdx);
switch (phaseIdx) {
case oilPhaseIdx: {
@ -643,7 +644,7 @@ public:
case waterPhaseIdx:
return
referenceDensity(waterPhaseIdx, regionIdx)
* waterPvt_->inverseFormationVolumeFactor(regionIdx, T, p);
* waterPvt_->inverseFormationVolumeFactor(regionIdx, T, p, saltConcentration);
}
throw std::logic_error("Unhandled phase index "+std::to_string(phaseIdx));
@ -731,6 +732,7 @@ public:
const auto& p = Opm::decay<LhsEval>(fluidState.pressure(phaseIdx));
const auto& T = Opm::decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& saltConcentration = Opm::decay<LhsEval>(fluidState.saltConcentration());
switch (phaseIdx) {
case oilPhaseIdx: {
@ -764,7 +766,7 @@ public:
return gasPvt_->inverseFormationVolumeFactor(regionIdx, T, p, Rv);
}
case waterPhaseIdx:
return waterPvt_->inverseFormationVolumeFactor(regionIdx, T, p);
return waterPvt_->inverseFormationVolumeFactor(regionIdx, T, p, saltConcentration);
default: throw std::logic_error("Unhandled phase index "+std::to_string(phaseIdx));
}
}
@ -786,11 +788,12 @@ public:
const auto& p = Opm::decay<LhsEval>(fluidState.pressure(phaseIdx));
const auto& T = Opm::decay<LhsEval>(fluidState.temperature(phaseIdx));
const auto& saltConcentration = Opm::decay<LhsEval>(fluidState.saltConcentration());
switch (phaseIdx) {
case oilPhaseIdx: return oilPvt_->saturatedInverseFormationVolumeFactor(regionIdx, T, p);
case gasPhaseIdx: return gasPvt_->saturatedInverseFormationVolumeFactor(regionIdx, T, p);
case waterPhaseIdx: return waterPvt_->inverseFormationVolumeFactor(regionIdx, T, p);
case waterPhaseIdx: return waterPvt_->inverseFormationVolumeFactor(regionIdx, T, p, saltConcentration);
default: throw std::logic_error("Unhandled phase index "+std::to_string(phaseIdx));
}
}
@ -928,6 +931,7 @@ public:
const LhsEval& p = Opm::decay<LhsEval>(fluidState.pressure(phaseIdx));
const LhsEval& T = Opm::decay<LhsEval>(fluidState.temperature(phaseIdx));
const LhsEval& saltConcentration = Opm::BlackOil::template getSaltConcentration_<ThisType, FluidState, LhsEval>(fluidState, regionIdx);
switch (phaseIdx) {
case oilPhaseIdx: {
@ -965,7 +969,7 @@ public:
case waterPhaseIdx:
// since water is always assumed to be immiscible in the black-oil model,
// there is no "saturated water"
return waterPvt_->viscosity(regionIdx, T, p);
return waterPvt_->viscosity(regionIdx, T, p, saltConcentration);
}
throw std::logic_error("Unhandled phase index "+std::to_string(phaseIdx));

27
opm/material/fluidsystems/blackoilpvt/WaterPvtMultiplexer.hpp
View File

@ -151,20 +151,6 @@ public:
const Evaluation& pressure) const
{ OPM_WATER_PVT_MULTIPLEXER_CALL(return pvtImpl.internalEnergy(regionIdx, temperature, pressure)); return 0; }
/*!
* \brief Returns the dynamic viscosity [Pa s] of the fluid phase given a set of parameters.
*/
template <class Evaluation>
Evaluation viscosity(unsigned regionIdx,
const Evaluation& temperature,
const Evaluation& pressure) const
{
// assert(realWaterPvt_ != ConstantCompressibilityBrinePvt );
const Evaluation saltconcentration = 0.0;
OPM_WATER_PVT_MULTIPLEXER_CALL(return pvtImpl.viscosity(regionIdx, temperature, pressure, saltconcentration));
return 0;
}
/*!
* \brief Returns the dynamic viscosity [Pa s] of the fluid phase given a set of parameters.
*/
@ -190,19 +176,6 @@ public:
return 0;
}
/*!
* \brief Returns the formation volume factor [-] of the fluid phase.
*/
template <class Evaluation>
Evaluation inverseFormationVolumeFactor(unsigned regionIdx,
const Evaluation& temperature,
const Evaluation& pressure) const
{
const Evaluation saltconcentration = 0.0;
OPM_WATER_PVT_MULTIPLEXER_CALL(return pvtImpl.inverseFormationVolumeFactor(regionIdx, temperature, pressure, saltconcentration));
return 0;
}
void setApproach(WaterPvtApproach appr)
{
switch (appr) {

7
tests/test_eclblackoilpvt.cpp
View File

@ -139,6 +139,7 @@ void ensurePvtApi(const OilPvt& oilPvt, const GasPvt& gasPvt, const WaterPvt& wa
while (0) {
Evaluation temperature = 273.15 + 20.0;
Evaluation pressure = 1e5;
Evaluation saltconcentration = 0.0;
Evaluation Rs = 0.0;
Evaluation Rv = 0.0;
Evaluation So = 0.5;
@ -150,10 +151,12 @@ void ensurePvtApi(const OilPvt& oilPvt, const GasPvt& gasPvt, const WaterPvt& wa
/////
tmp = waterPvt.viscosity(/*regionIdx=*/0,
temperature,
pressure);
pressure,
saltconcentration);
tmp = waterPvt.inverseFormationVolumeFactor(/*regionIdx=*/0,
temperature,
pressure);
pressure,
saltconcentration);
/////
// oil PVT API

3
tests/test_fluidsystems.cpp
View File

@ -53,6 +53,7 @@
#include <opm/material/fluidstates/NonEquilibriumFluidState.hpp>
#include <opm/material/fluidstates/ImmiscibleFluidState.hpp>
#include <opm/material/fluidstates/SimpleModularFluidState.hpp>
#include <opm/material/fluidstates/BlackOilFluidState.hpp>
// include the tables for CO2 which are delivered with opm-material by default
#include <opm/material/common/UniformTabulated2DFunction.hpp>
@ -83,7 +84,7 @@ void ensureBlackoilApi()
#endif
typedef typename FluidSystem::Scalar Scalar;
typedef Opm::CompositionalFluidState<Evaluation, FluidSystem> FluidState;
typedef Opm::BlackOilFluidState<Evaluation, FluidSystem> FluidState;
FluidState fluidState;
Evaluation XoG = 0.0;
Evaluation XgO = 0.0;