diff --git a/src/opm/output/eclipse/Summary.cpp b/src/opm/output/eclipse/Summary.cpp index dcc0a7c64..aca063f80 100644 --- a/src/opm/output/eclipse/Summary.cpp +++ b/src/opm/output/eclipse/Summary.cpp @@ -738,7 +738,7 @@ inline quantity injection_history( const fn_args& args ) { return { sum, rate_unit< phase >() }; } -inline quantity abondoned_wells( const fn_args& args ) { +inline quantity abondoned_producers( const fn_args& args ) { std::size_t count = 0; for (const auto& sched_well : args.schedule_wells) { @@ -1362,7 +1362,7 @@ static const std::unordered_map< std::string, ofun > funs = { { "FMWIN", flowing< injector > }, { "FMWPR", flowing< producer > }, { "FVPRT", res_vol_production_target }, - { "FMWPA", abondoned_wells }, + { "FMWPA", abondoned_producers }, //Field control mode { "FMCTP", group_control< false, true, false, false >}, diff --git a/tests/SPE1CASE1.DATA b/tests/SPE1CASE1.DATA index f230d0d30..c3fb8c38b 100644 --- a/tests/SPE1CASE1.DATA +++ b/tests/SPE1CASE1.DATA @@ -392,7 +392,7 @@ WELSPECS -- Item #: 1 2 3 4 5 6 'PROD' 'G1' 10 10 8400 'OIL' / 'INJ' 'G1' 1 1 8335 'GAS' / - 'RFT' 'G1' 10 10 8400 'OIL' / + 'RFTP' 'G1' 10 10 8400 'OIL' / / -- Coordinates in item 3-4 are retrieved from Odeh's figure 1 and 2 -- Note that the depth at the midpoint of the well grid blocks @@ -401,7 +401,7 @@ WELSPECS COMPDAT -- Item #: 1 2 3 4 5 6 7 8 9 'PROD' 10 10 3 3 'OPEN' 1* 1* 0.5 / - 'RFT' 10 10 3 3 'OPEN' 1* 1* 0.5 / + 'RFTP' 10 10 3 3 'OPEN' 1* 1* 0.5 / 'INJ' 1 1 1 1 'OPEN' 1* 1* 0.5 / / -- Coordinates in item 2-5 are retreived from Odeh's figure 1 and 2 @@ -412,7 +412,7 @@ COMPDAT WCONPROD -- Item #:1 2 3 4 5 9 'PROD' 'OPEN' 'ORAT' 20000 4* 1000 / - 'RFT' 'SHUT' 'ORAT' 20000 4* 1000 / + 'RFTP' 'SHUT' 'ORAT' 20000 4* 1000 / / -- It is stated in Odeh's paper that the maximum oil prod. rate -- is 20 000stb per day which explains the choice of value in item 4. @@ -432,18 +432,18 @@ TSTEP 31 28 31 30 31 30 31 31 30 31 30 31 / WELOPEN - 'RFT' OPEN / + 'RFTP' OPEN / / WCONHIST - 'RFT' 'OPEN' 'RESV' 0 / + 'RFTP' 'OPEN' 'RESV' 0 / / TSTEP 31 / WELOPEN - 'RFT' 'SHUT' / + 'RFTP' 'SHUT' / / TSTEP diff --git a/tests/msim/test_msim.cpp b/tests/msim/test_msim.cpp index ed70a6a1b..fc207bd03 100644 --- a/tests/msim/test_msim.cpp +++ b/tests/msim/test_msim.cpp @@ -84,7 +84,7 @@ BOOST_AUTO_TEST_CASE(RUN) { msim msim(state); msim.well_rate("PROD", data::Rates::opt::oil, prod_opr); - msim.well_rate("RFT", data::Rates::opt::oil, prod_rft); + msim.well_rate("RFTP", data::Rates::opt::oil, prod_rft); msim.solution("PRESSURE", pressure); { const WorkArea work_area("test_msim"); @@ -120,7 +120,7 @@ BOOST_AUTO_TEST_CASE(RUN) { } BOOST_CHECK_EQUAL( fmwpa[0], 0.0 ); - // The RFT well will appear as an abondoned well. + // The RFTP well will appear as an abondoned well. BOOST_CHECK_EQUAL( fmwpa[dates.size() - 1], 1.0 ); const auto rsm = EclIO::ERsm("SPE1CASE1.RSM"); @@ -141,7 +141,7 @@ BOOST_AUTO_TEST_CASE(RUN) { const int report_step = 50; const auto& rst_state = Opm::RestartIO::RstState::load(rst, report_step); Schedule sched_rst(deck, state, python, &rst_state); - const auto& rft_well = sched_rst.getWell("RFT", report_step); + const auto& rft_well = sched_rst.getWell("RFTP", report_step); BOOST_CHECK(rft_well.getStatus() == Well::Status::SHUT); } }