Support WVPRT+FVPRT

This commit is contained in:
Lars Petter Øren Hauge 2018-01-24 14:11:46 +01:00
parent 2343c5ada9
commit 9a404c2e93
3 changed files with 11 additions and 0 deletions

View File

@ -674,6 +674,7 @@ static const std::unordered_map< std::string, ofun > funs = {
{ "WBHP", bhp },
{ "WTHP", thp },
{ "WVPRT", res_vol_production_target },
{ "GWIR", rate< rt::wat, injector > },
{ "GOIR", rate< rt::oil, injector > },
@ -885,6 +886,7 @@ static const std::unordered_map< std::string, ofun > funs = {
{ "FMWPR", flowing< producer > },
{ "FPR", fpr },
{ "FPRP", fprp },
{ "FVPRT", res_vol_production_target },
/* Region properties */
{ "RPR" , rpr},

View File

@ -101,6 +101,7 @@ FGPTS
FGPTF
FOPTF
FOPTS
FVPRT
-- Injection Cummulatives
FVIT
FWIT
@ -477,6 +478,8 @@ WVPR
/
WVPT
/
WVPRT
/
WOPP
/
WVIR

View File

@ -397,6 +397,9 @@ BOOST_AUTO_TEST_CASE(well_keywords) {
BOOST_CHECK_CLOSE( 60.0, ecl_sum_get_well_var( resp, 2, "W_3", "WWITH" ), 1e-5 );
BOOST_CHECK_CLOSE( 0, ecl_sum_get_well_var( resp, 2, "W_3", "WGITH" ), 1e-5 );
/* Production targets */
BOOST_CHECK_CLOSE( 30.1 , ecl_sum_get_well_var( resp, 1, "W_5", "WVPRT" ), 1e-5 );
/* WWCT - water cut */
const double wwcut1 = 10.0 / ( 10.0 + 10.1 );
const double wwcut2 = 20.0 / ( 20.0 + 20.1 );
@ -779,6 +782,9 @@ BOOST_AUTO_TEST_CASE(field_keywords) {
BOOST_CHECK_CLOSE( 30.0, ecl_sum_get_field_var( resp, 1, "FWITH" ), 1e-5 );
BOOST_CHECK_CLOSE( 60.0, ecl_sum_get_field_var( resp, 2, "FWITH" ), 1e-5 );
/* Production targets */
BOOST_CHECK_CLOSE( 30.1 , ecl_sum_get_field_var( resp, 1, "FVPRT" ), 1e-5 );
/* fwct - water cut */
const double wcut = (10.0 + 20.0) / ( 10.0 + 10.1 + 20.0 + 20.1 );
BOOST_CHECK_CLOSE( wcut, ecl_sum_get_field_var( resp, 1, "FWCT" ), 1e-5 );