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

Add vaporized_oil to Rates

Browse Source
This commit is contained in:
Sveinung Styve Rundhovde (IT SI SIB) 2017-11-16 10:00:23 +01:00
parent 85eca28c84
commit ff3d0cda28
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
opm/output/data/Wells.hpp
View File

@ -51,6 +51,7 @@ namespace Opm {
polymer = (1 << 3),
solvent = (1 << 4),
dissolved_gas = (1 << 5),
vaporized_oil = (1 << 6),
};
using enum_size = std::underlying_type< opt >::type;
@ -84,6 +85,7 @@ namespace Opm {
double polymer = 0.0;
double solvent = 0.0;
double dissolved_gas = 0.0;
double vaporized_oil = 0.0;
};
struct Completion {
@ -190,6 +192,7 @@ namespace Opm {
case opt::polymer: return this->polymer;
case opt::solvent: return this->solvent;
case opt::dissolved_gas: return this->dissolved_gas;
case opt::vaporized_oil: return this->vaporized_oil;
}
throw std::invalid_argument(

6
tests/test_Summary.cpp
View File

@ -137,6 +137,7 @@ static data::Wells result_wells() {
rates1.set( rt::gas, -10.2 / day );
rates1.set( rt::solvent, -10.3 / day );
rates1.set( rt::dissolved_gas, -10.4 / day );
rates1.set( rt::vaporized_oil, -10.5 / day );
data::Rates rates2;
rates2.set( rt::wat, -20.0 / day );
@ -144,6 +145,7 @@ static data::Wells result_wells() {
rates2.set( rt::gas, -20.2 / day );
rates2.set( rt::solvent, -20.3 / day );
rates2.set( rt::dissolved_gas, -20.4 / day );
rates2.set( rt::vaporized_oil, -20.5 / day );
data::Rates rates3;
rates3.set( rt::wat, 30.0 / day );
@ -151,6 +153,7 @@ static data::Wells result_wells() {
rates3.set( rt::gas, 30.2 / day );
rates3.set( rt::solvent, 30.3 / day );
rates3.set( rt::dissolved_gas, 30.4 / day );
rates3.set( rt::vaporized_oil, 30.5 / day );
/* completion rates */
@ -160,6 +163,7 @@ static data::Wells result_wells() {
crates1.set( rt::gas, -100.2 / day );
crates1.set( rt::solvent, -100.3 / day );
crates1.set( rt::dissolved_gas, -100.4 / day );
crates1.set( rt::vaporized_oil, -100.5 / day );
data::Rates crates2;
crates2.set( rt::wat, -200.0 / day );
@ -167,6 +171,7 @@ static data::Wells result_wells() {
crates2.set( rt::gas, -200.2 / day );
crates2.set( rt::solvent, -200.3 / day );
crates2.set( rt::dissolved_gas, -200.4 / day );
crates2.set( rt::vaporized_oil, -200.5 / day );
data::Rates crates3;
crates3.set( rt::wat, 300.0 / day );
@ -174,6 +179,7 @@ static data::Wells result_wells() {
crates3.set( rt::gas, 300.2 / day );
crates3.set( rt::solvent, 300.3 / day );
crates3.set( rt::dissolved_gas, 300.4 / day );
crates3.set( rt::vaporized_oil, 300.5 / day );
/*
The active index assigned to the completion must be manually