diff --git a/src/opm/output/eclipse/Summary.cpp b/src/opm/output/eclipse/Summary.cpp index 04be2d38e..8a911f905 100644 --- a/src/opm/output/eclipse/Summary.cpp +++ b/src/opm/output/eclipse/Summary.cpp @@ -436,6 +436,7 @@ static const std::unordered_map< std::string, ofun > funs = { { "WOPRF", sub (rate < rt::oil, producer >, rate< rt::vaporized_oil, producer > ) }, { "WVPR", sum( sum( rate< rt::reservoir_water, producer >, rate< rt::reservoir_oil, producer > ), rate< rt::reservoir_gas, producer > ) }, + { "WGVPR", rate< rt::reservoir_gas, producer > }, { "WLPR", sum( rate< rt::wat, producer >, rate< rt::oil, producer > ) }, { "WWPT", mul( rate< rt::wat, producer >, duration ) }, @@ -468,6 +469,8 @@ static const std::unordered_map< std::string, ofun > funs = { { "WVPRT", res_vol_production_target }, { "GWIR", rate< rt::wat, injector > }, + { "WGVIR", rate< rt::reservoir_gas, injector >}, + { "WWVIR", rate< rt::reservoir_water, injector >}, { "GOIR", rate< rt::oil, injector > }, { "GGIR", rate< rt::gas, injector > }, { "GNIR", rate< rt::solvent, injector > }, diff --git a/tests/summary_deck.DATA b/tests/summary_deck.DATA index a314e1b15..9df157a27 100644 --- a/tests/summary_deck.DATA +++ b/tests/summary_deck.DATA @@ -331,6 +331,8 @@ WWPRH / WOPR / +WGVPR + W_1 W_2 / WOPRH / WGPR @@ -366,6 +368,12 @@ WWIT WWIRH W_3 / +WGVIR + W_3 +/ +WWVIR + W_3 +/ WWITH W_3 / diff --git a/tests/test_Summary.cpp b/tests/test_Summary.cpp index 2e9986705..f1f93a6e9 100644 --- a/tests/test_Summary.cpp +++ b/tests/test_Summary.cpp @@ -233,7 +233,9 @@ BOOST_AUTO_TEST_CASE(well_keywords) { BOOST_CHECK_CLOSE( 20.1, ecl_sum_get_well_var( resp, 1, "W_2", "WOPR" ), 1e-5 ); BOOST_CHECK_CLOSE( 10.2, ecl_sum_get_well_var( resp, 1, "W_1", "WGPR" ), 1e-5 ); + BOOST_CHECK_CLOSE( 10.8, ecl_sum_get_well_var( resp, 1, "W_1", "WGVPR" ), 1e-5 ); BOOST_CHECK_CLOSE( 20.2, ecl_sum_get_well_var( resp, 1, "W_2", "WGPR" ), 1e-5 ); + BOOST_CHECK_CLOSE( 20.8, ecl_sum_get_well_var( resp, 1, "W_2", "WGVPR" ), 1e-5 ); BOOST_CHECK_CLOSE( 10.0 + 10.1, ecl_sum_get_well_var( resp, 1, "W_1", "WLPR" ), 1e-5 ); BOOST_CHECK_CLOSE( 20.0 + 20.1, ecl_sum_get_well_var( resp, 1, "W_2", "WLPR" ), 1e-5 ); BOOST_CHECK_CLOSE( 10.3, ecl_sum_get_well_var( resp, 1, "W_1", "WNPR" ), 1e-5 ); @@ -316,6 +318,8 @@ BOOST_AUTO_TEST_CASE(well_keywords) { /* Injection rates */ BOOST_CHECK_CLOSE( 30.0, ecl_sum_get_well_var( resp, 1, "W_3", "WWIR" ), 1e-5 ); + BOOST_CHECK_CLOSE( 30.6, ecl_sum_get_well_var( resp, 1, "W_3", "WWVIR" ), 1e-5 ); + BOOST_CHECK_CLOSE( 30.8, ecl_sum_get_well_var( resp, 1, "W_3", "WGVIR" ), 1e-5 ); BOOST_CHECK_CLOSE( 30.2, ecl_sum_get_well_var( resp, 1, "W_3", "WGIR" ), 1e-5 ); BOOST_CHECK_CLOSE( 30.3, ecl_sum_get_well_var( resp, 1, "W_3", "WNIR" ), 1e-5 );