OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use class based enums for VFP flow types

Browse Source
This commit is contained in:
Joakim Hove 2021-02-15 18:53:20 +01:00
parent 27b4dabd6a
commit 6383f3c1ac
2 changed files with 56 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
opm/simulators/wells/VFPHelpers.hpp
View File

@ -74,21 +74,19 @@ inline EvalWell zeroIfNanInf(const EvalWell& value) {
* @return Production rate of oil, gas or liquid.
*/
template <typename T>
static T getFlo(const T& aqua, const T& liquid, const T& vapour,
const VFPProdTable::FLO_TYPE& type) {
static T getFlo(const T& aqua, const T& liquid, const T& vapour, VFPProdTable::FLO_TYPE type) {
switch (type) {
case VFPProdTable::FLO_OIL:
case VFPProdTable::FLO_TYPE::FLO_OIL:
//Oil = liquid phase
return liquid;
case VFPProdTable::FLO_LIQ:
case VFPProdTable::FLO_TYPE::FLO_LIQ:
//Liquid = aqua + liquid phases
return aqua + liquid;
case VFPProdTable::FLO_GAS:
case VFPProdTable::FLO_TYPE::FLO_GAS:
//Gas = vapor phase
return vapour;
case VFPProdTable::FLO_INVALID: //Intentional fall-through
default:
OPM_THROW(std::logic_error, "Invalid FLO_TYPE: '" << type << "'");
throw std::logic_error("Invalid FLO_TYPE");
}
}
@ -100,21 +98,19 @@ static T getFlo(const T& aqua, const T& liquid, const T& vapour,
* @return Production rate of oil, gas or liquid.
*/
template <typename T>
static T getFlo(const T& aqua, const T& liquid, const T& vapour,
const VFPInjTable::FLO_TYPE& type) {
static T getFlo(const T& aqua, const T& liquid, const T& vapour, VFPInjTable::FLO_TYPE type) {
switch (type) {
case VFPInjTable::FLO_OIL:
case VFPInjTable::FLO_TYPE::FLO_OIL:
//Oil = liquid phase
return liquid;
case VFPInjTable::FLO_WAT:
case VFPInjTable::FLO_TYPE::FLO_WAT:
//Liquid = aqua phase
return aqua;
case VFPInjTable::FLO_GAS:
case VFPInjTable::FLO_TYPE::FLO_GAS:
//Gas = vapor phase
return vapour;
case VFPInjTable::FLO_INVALID: //Intentional fall-through
default:
OPM_THROW(std::logic_error, "Invalid FLO_TYPE: '" << type << "'");
throw std::logic_error("Invalid FLO_TYPE");
}
}
@ -129,23 +125,22 @@ static T getFlo(const T& aqua, const T& liquid, const T& vapour,
* @return Production rate of oil, gas or liquid.
*/
template <typename T>
static T getWFR(const T& aqua, const T& liquid, const T& vapour,
const VFPProdTable::WFR_TYPE& type) {
static T getWFR(const T& aqua, const T& liquid, const T& vapour, VFPProdTable::WFR_TYPE type) {
switch(type) {
case VFPProdTable::WFR_WOR: {
case VFPProdTable::WFR_TYPE::WFR_WOR:
//Water-oil ratio = water / oil
T wor = aqua / liquid;
return zeroIfNanInf(wor);
}
case VFPProdTable::WFR_WCT:
return zeroIfNanInf(aqua/liquid);
case VFPProdTable::WFR_TYPE::WFR_WCT:
//Water cut = water / (water + oil)
return zeroIfNanInf(aqua / (aqua + liquid));
case VFPProdTable::WFR_WGR:
case VFPProdTable::WFR_TYPE::WFR_WGR:
//Water-gas ratio = water / gas
return zeroIfNanInf(aqua / vapour);
case VFPProdTable::WFR_INVALID: //Intentional fall-through
default:
OPM_THROW(std::logic_error, "Invalid WFR_TYPE: '" << type << "'");
throw std::logic_error("Invalid WFR_TYPE");
}
}
@ -159,21 +154,19 @@ static T getWFR(const T& aqua, const T& liquid, const T& vapour,
* @return Production rate of oil, gas or liquid.
*/
template <typename T>
static T getGFR(const T& aqua, const T& liquid, const T& vapour,
const VFPProdTable::GFR_TYPE& type) {
static T getGFR(const T& aqua, const T& liquid, const T& vapour, VFPProdTable::GFR_TYPE type) {
switch(type) {
case VFPProdTable::GFR_GOR:
case VFPProdTable::GFR_TYPE::GFR_GOR:
// Gas-oil ratio = gas / oil
return zeroIfNanInf(vapour / liquid);
case VFPProdTable::GFR_GLR:
case VFPProdTable::GFR_TYPE::GFR_GLR:
// Gas-liquid ratio = gas / (oil + water)
return zeroIfNanInf(vapour / (liquid + aqua));
case VFPProdTable::GFR_OGR:
case VFPProdTable::GFR_TYPE::GFR_OGR:
// Oil-gas ratio = oil / gas
return zeroIfNanInf(liquid / vapour);
case VFPProdTable::GFR_INVALID: //Intentional fall-through
default:
OPM_THROW(std::logic_error, "Invalid GFR_TYPE: '" << type << "'");
throw std::logic_error("Invalid GFR_TYPE");
}
}

10
tests/test_vfpproperties.cpp
View File

@ -194,10 +194,10 @@ struct TrivialFixture {
inline void initProperties() {
table.reset(new Opm::VFPProdTable(1,
1000.0,
Opm::VFPProdTable::FLO_OIL,
Opm::VFPProdTable::WFR_WOR,
Opm::VFPProdTable::GFR_GOR,
Opm::VFPProdTable::ALQ_UNDEF,
Opm::VFPProdTable::FLO_TYPE::FLO_OIL,
Opm::VFPProdTable::WFR_TYPE::WFR_WOR,
Opm::VFPProdTable::GFR_TYPE::GFR_GOR,
Opm::VFPProdTable::ALQ_TYPE::ALQ_UNDEF,
flo_axis,
thp_axis,
wfr_axis,
@ -231,7 +231,7 @@ private:
int nz;
int nu;
int nv;
Opm::VFPProdTable::array_type data;
std::vector<double> data;
};