From 40ea92ac81ce7971b45916178a0eeaa22cf38ded Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Sat, 4 Jan 2020 06:27:08 +0100 Subject: [PATCH] Reenable BHP testing --- tests/parser/ScheduleTests.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/tests/parser/ScheduleTests.cpp b/tests/parser/ScheduleTests.cpp index fb368b0e2..cf9caa22d 100644 --- a/tests/parser/ScheduleTests.cpp +++ b/tests/parser/ScheduleTests.cpp @@ -1570,24 +1570,23 @@ BOOST_AUTO_TEST_CASE(changeBhpLimitInHistoryModeWithWeltarg) { FieldPropsManager fp( deck , grid, table); Runspec runspec (deck); Schedule sched(deck, grid , fp, eclipseProperties, runspec); - /* + // The BHP limit should not be effected by WCONHIST - BOOST_CHECK_EQUAL(sched.getWell("P", 1).getProductionProperties().BHPLimit.get(), 50 * 1e5); // 1 - BOOST_CHECK_EQUAL(sched.getWell("P", 2).getProductionProperties().BHPLimit.get(), 50 * 1e5); // 2 + BOOST_CHECK_EQUAL(sched.getWell("P", 1).getProductionProperties().BHPLimit.getSI(), 50 * 1e5); // 1 + BOOST_CHECK_EQUAL(sched.getWell("P", 2).getProductionProperties().BHPLimit.getSI(), 50 * 1e5); // 2 - BOOST_CHECK_EQUAL(sched.getWell("I", 1).getInjectionProperties().BHPLimit.get(), 600 * 1e5); // 1 - BOOST_CHECK_EQUAL(sched.getWell("I", 2).getInjectionProperties().BHPLimit.get(), 600 * 1e5); // 2 + BOOST_CHECK_EQUAL(sched.getWell("I", 1).getInjectionProperties().BHPLimit.getSI(), 600 * 1e5); // 1 + BOOST_CHECK_EQUAL(sched.getWell("I", 2).getInjectionProperties().BHPLimit.getSI(), 600 * 1e5); // 2 BOOST_CHECK_EQUAL(sched.getWell("I", 2).getInjectionProperties().hasInjectionControl(Opm::Well::InjectorCMode::BHP), true); // The well is producer for timestep 3 and the injection properties BHPLimit should be set to zero. BOOST_CHECK(sched.getWell("I", 3).isProducer()); - BOOST_CHECK_EQUAL(sched.getWell("I", 3).getInjectionProperties().BHPLimit.get(), 0); // 3 + BOOST_CHECK_EQUAL(sched.getWell("I", 3).getInjectionProperties().BHPLimit.getSI(), 0); // 3 BOOST_CHECK_EQUAL(sched.getWell("I", 3).getProductionProperties().hasProductionControl(Opm::Well::ProducerCMode::BHP), true ); BOOST_CHECK_EQUAL(sched.getWell("I", 4).getInjectionProperties().hasInjectionControl(Opm::Well::InjectorCMode::BHP), true ); - BOOST_CHECK_EQUAL(sched.getWell("I", 4).getInjectionProperties().BHPLimit.get(), 6891.2 * 1e5); // 4 - */ + BOOST_CHECK_EQUAL(sched.getWell("I", 4).getInjectionProperties().BHPLimit.getSI(), 6891.2 * 1e5); // 4 } BOOST_AUTO_TEST_CASE(changeModeWithWHISTCTL) {