Use UDA for WCONPROD::RESV

This commit is contained in:
Joakim Hove
2019-06-24 07:56:37 +02:00
parent 9ed68a9f1f
commit cbc7394d60
7 changed files with 13 additions and 12 deletions

View File

@@ -962,9 +962,9 @@ BOOST_AUTO_TEST_CASE(createDeckWithWeltArg) {
BOOST_CHECK_EQUAL(wpp_2.WaterRate, 1400 * siFactorL);
BOOST_CHECK_EQUAL(wpp_2.GasRate, 1500.52 * siFactorG);
BOOST_CHECK_EQUAL(wpp_2.LiquidRate, 1600.58 * siFactorL);
BOOST_CHECK_EQUAL(wpp_2.ResVRate, 1801.05 * siFactorL);
BOOST_CHECK_EQUAL(wpp_2.BHPLimit, 1900 * siFactorP);
BOOST_CHECK_EQUAL(wpp_2.THPLimit, 2000 * siFactorP);
BOOST_CHECK_EQUAL(wpp_2.ResVRate.get<double>(), 1801.05 * siFactorL);
BOOST_CHECK_EQUAL(wpp_2.VFPTableNumber, 2100);
BOOST_CHECK_EQUAL(well_2.getGuideRate(), 2300.14);
}

View File

@@ -317,7 +317,7 @@ BOOST_AUTO_TEST_CASE(WellHaveProductionControlLimit) {
BOOST_CHECK( !well.getProductionProperties().hasProductionControl( Opm::WellProducer::RESV ));
auto properties2 = std::make_shared<Opm::WellProductionProperties>(well.getProductionProperties());
properties2->ResVRate = 100;
properties2->ResVRate.reset( 100 );
properties2->addProductionControl(Opm::WellProducer::RESV);
well.updateProduction(properties2);
BOOST_CHECK( well.getProductionProperties().hasProductionControl( Opm::WellProducer::RESV ));
@@ -327,9 +327,9 @@ BOOST_AUTO_TEST_CASE(WellHaveProductionControlLimit) {
properties3->WaterRate = 100;
properties3->GasRate = 100;
properties3->LiquidRate = 100;
properties3->ResVRate = 100;
properties3->BHPLimit = 100;
properties3->THPLimit = 100;
properties3->ResVRate.reset(100);
properties3->addProductionControl(Opm::WellProducer::ORAT);
properties3->addProductionControl(Opm::WellProducer::LRAT);
properties3->addProductionControl(Opm::WellProducer::BHP);

View File

@@ -145,8 +145,8 @@ BOOST_AUTO_TEST_CASE(WellTesting) {
BOOST_CHECK(sched.hasWell("W_2"));
BOOST_CHECK(sched.hasWell("W_3"));
BOOST_CHECK_CLOSE( 777/Metric::Time , sched.getWell2("W_2", 7).getProductionProperties().ResVRate , 0.0001);
BOOST_CHECK_EQUAL( 0 , sched.getWell2("W_2", 8).getProductionProperties().ResVRate);
BOOST_CHECK_CLOSE( 777/Metric::Time , sched.getWell2("W_2", 7).getProductionProperties().ResVRate.get<double>() , 0.0001);
BOOST_CHECK_EQUAL( 0 , sched.getWell2("W_2", 8).getProductionProperties().ResVRate.get<double>());
BOOST_CHECK_EQUAL( WellCommon::SHUT , sched.getWell2("W_2", 3).getStatus());