diff --git a/src/opm/output/eclipse/Summary.cpp b/src/opm/output/eclipse/Summary.cpp index 49cf13484..ef511250c 100644 --- a/src/opm/output/eclipse/Summary.cpp +++ b/src/opm/output/eclipse/Summary.cpp @@ -767,6 +767,8 @@ static const std::unordered_map< std::string, ofun > funs = { duration ) }, { "FVPT", mul(sum (sum( rate< rt::reservoir_water, producer>, rate< rt::reservoir_oil, producer >), rate< rt::reservoir_gas, producer>), duration)}, + { "FGPTS", mul( rate< rt::dissolved_gas, producer > , duration )}, + { "FGPTF", mul( sub( rate< rt::gas, producer >, rate< rt::dissolved_gas, producer > ), duration )}, { "FWIR", rate< rt::wat, injector > }, { "FOIR", rate< rt::oil, injector > }, diff --git a/tests/summary_deck.DATA b/tests/summary_deck.DATA index 39c99ff18..fdb725b49 100644 --- a/tests/summary_deck.DATA +++ b/tests/summary_deck.DATA @@ -95,6 +95,8 @@ FGPTH FWPTH FGST FGCT +FGPTS +FGPTF -- Injection Cummulatives FVIT FWIT diff --git a/tests/test_Summary.cpp b/tests/test_Summary.cpp index cea2e5058..660142780 100644 --- a/tests/test_Summary.cpp +++ b/tests/test_Summary.cpp @@ -691,13 +691,22 @@ BOOST_AUTO_TEST_CASE(field_keywords) { ecl_sum_get_field_var( resp, 1, "FLPT" ), 1e-5 ); BOOST_CHECK_CLOSE( 10.6 + 10.7 + 10.8 + 20.6 + 20.7 + 20.8, ecl_sum_get_field_var( resp, 1, "FVPT" ), 1e-5 ); + BOOST_CHECK_CLOSE( 10.4 + 20.4, + ecl_sum_get_field_var( resp, 1, "FGPTS" ), 1e-5 ); + BOOST_CHECK_CLOSE( 10.2 - 10.4 + 20.2 - 20.4, + ecl_sum_get_field_var( resp, 1, "FGPTF" ), 1e-5 ); + BOOST_CHECK_CLOSE( 2 * (10.0 + 20.0), ecl_sum_get_field_var( resp, 2, "FWPT" ), 1e-5 ); BOOST_CHECK_CLOSE( 2 * (10.1 + 20.1), ecl_sum_get_field_var( resp, 2, "FOPT" ), 1e-5 ); BOOST_CHECK_CLOSE( 2 * (10.2 + 20.2), ecl_sum_get_field_var( resp, 2, "FGPT" ), 1e-5 ); BOOST_CHECK_CLOSE( 2 * (10.0 + 20.0 + 10.1 + 20.1), ecl_sum_get_field_var( resp, 2, "FLPT" ), 1e-5 ); - BOOST_CHECK_CLOSE( 2 * ( 10.6 + 10.7 + 10.8 + 20.6 + 20.7 + 20.8), + BOOST_CHECK_CLOSE( 2 * (10.6 + 10.7 + 10.8 + 20.6 + 20.7 + 20.8), ecl_sum_get_field_var( resp, 2, "FVPT" ), 1e-5 ); + BOOST_CHECK_CLOSE( 2 * (10.4 + 20.4), + ecl_sum_get_field_var( resp, 2, "FGPTS" ), 1e-5 ); + BOOST_CHECK_CLOSE( 2 * (10.2 - 10.4 + 20.2 - 20.4), + ecl_sum_get_field_var( resp, 2, "FGPTF" ), 1e-5 ); /* Production rates (history) */ BOOST_CHECK_CLOSE( 10.0 + 20.0, ecl_sum_get_field_var( resp, 1, "FWPRH" ), 1e-5 );