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

Return zero for e.g., the gas:oil-ratio if no oil

Browse Source
This commit is contained in:
babrodtk 2015-07-09 10:52:59 +02:00
parent 79410685ca
commit 926f7ba175
2 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
opm/autodiff/VFPProperties.hpp
View File

@ -214,6 +214,7 @@ public:
}
}
/**
* Computes the wfr parameter according to the wfr_type_
* @return Production rate of oil, gas or liquid.
@ -221,20 +222,25 @@ public:
template <typename T>
static T getWFR(const T& aqua, const T& liquid, const T& vapour,
const VFPProdTable::WFR_TYPE& type) {
T retval;
switch(type) {
case VFPProdTable::WFR_WOR:
//Water-oil ratio = water / oil
return aqua / liquid;
retval = aqua / liquid;
break;
case VFPProdTable::WFR_WCT:
//Water cut = water / (water + oil)
return aqua / (aqua + liquid);
retval = aqua / (aqua + liquid);
break;
case VFPProdTable::WFR_WGR:
//Water-gas ratio = water / gas
return aqua / vapour;
retval = aqua / vapour;
break;
case VFPProdTable::WFR_INVALID: //Intentional fall-through
default:
OPM_THROW(std::logic_error, "Invalid WFR_TYPE: '" << type << "'");
}
return zeroIfNan(retval);
}
/**
@ -244,20 +250,25 @@ public:
template <typename T>
static T getGFR(const T& aqua, const T& liquid, const T& vapour,
const VFPProdTable::GFR_TYPE& type) {
T retval;
switch(type) {
case VFPProdTable::GFR_GOR:
// Gas-oil ratio = gas / oil
return vapour / liquid;
retval = vapour / liquid;
break;
case VFPProdTable::GFR_GLR:
// Gas-liquid ratio = gas / (oil + water)
return vapour / (liquid + aqua);
retval = vapour / (liquid + aqua);
break;
case VFPProdTable::GFR_OGR:
// Oil-gas ratio = oil / gas
return liquid / vapour;
retval = liquid / vapour;
break;
case VFPProdTable::GFR_INVALID: //Intentional fall-through
default:
OPM_THROW(std::logic_error, "Invalid GFR_TYPE: '" << type << "'");
}
return zeroIfNan(retval);
}
@ -309,6 +320,18 @@ private:
* Misc helper functions
*/
const VFPProdTable* getProdTable(int table_id) const;
static inline double zeroIfNan(const double& value) {
return (std::isnan(value)) ? 0.0 : value;
}
static inline ADB::V zeroIfNan(const ADB::V& value) {
ADB::V retval(value.size());
for (int i=0; i<value.size(); ++i) {
retval[i] = zeroIfNan(value[i]);
}
return retval;
}
};
}

7
tests/test_vfpproperties.cpp
View File

@ -823,10 +823,9 @@ BOOST_AUTO_TEST_CASE(ParseInterpolateRealisticVFPPROD)
double liquid = f_i - aqua;
double vapour = g_i * liquid;
if (aqua == 0.0 || liquid == 0.0) {
//FIXME: This skips some corner cases, but will fail in current
//implementation, since getWFR(...), getGFR(...), getFlo(...)
//might perform division by zero
if ((aqua + liquid) == 0.0 || liquid == 0.0) {
//FIXME: This skips some corner cases, when
//getWFR(...) and getGFR(...) are infinite
}
else {
//Value given as pascal, convert to barsa for comparison with reference