Fix vappars and dr[sv]dt logic

The simulator should either use VAPPERS or dr[sv]dt, both the
combination drsdt and drvdt is allowed.
This commit is contained in:
Tor Harald Sandve
2018-10-17 13:35:25 +02:00
parent 6fee172f16
commit 95179f393c
30 changed files with 428 additions and 214 deletions

View File

@@ -283,7 +283,8 @@ BOOST_AUTO_TEST_CASE(createDeckWithGEFAC) {
EclipseGrid grid(10,10,10);
TableManager table ( deck );
Eclipse3DProperties eclipseProperties ( deck , table, grid);
Opm::Schedule schedule(deck, grid, eclipseProperties, Opm::Phases(true, true, true) , parseContext);
Runspec runspec (deck );
Opm::Schedule schedule(deck, grid, eclipseProperties, runspec , parseContext);
const auto& group1 = schedule.getGroup("PRODUC");
BOOST_CHECK_EQUAL(group1.getGroupEfficiencyFactor(0), 0.85);
@@ -332,7 +333,8 @@ BOOST_AUTO_TEST_CASE(createDeckWithWGRUPCONandWCONPROD) {
EclipseGrid grid(10,10,10);
TableManager table ( deck );
Eclipse3DProperties eclipseProperties ( deck , table, grid);
Opm::Schedule schedule(deck, grid, eclipseProperties, Opm::Phases(true, true, true) , parseContext);
Runspec runspec (deck );
Opm::Schedule schedule(deck, grid, eclipseProperties, runspec , parseContext);
const auto* currentWell = schedule.getWell("B-37T2");
const Opm::WellProductionProperties& wellProductionProperties = currentWell->getProductionProperties(0);
BOOST_CHECK_EQUAL(wellProductionProperties.controlMode, Opm::WellProducer::ControlModeEnum::GRUP);
@@ -423,7 +425,8 @@ BOOST_AUTO_TEST_CASE(createDeckWithGRUPNET) {
EclipseGrid grid(10,10,10);
TableManager table ( deck );
Eclipse3DProperties eclipseProperties ( deck , table, grid);
Opm::Schedule schedule(deck, grid, eclipseProperties, Opm::Phases(true, true, true) , parseContext);
Runspec runspec (deck );
Opm::Schedule schedule(deck, grid, eclipseProperties, runspec , parseContext);
const auto& group1 = schedule.getGroup("PROD");
const auto& group2 = schedule.getGroup("MANI-E2");