OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-12 17:02:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to changes in schedule interface

Browse Source
This commit is contained in:
Tor Harald Sandve committed 2018-10-29 10:39:14 +01:00
1 parent 4cf81c69b1
commit 08c4a4857b
13 files changed
+32 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/test_stoppedwells.cpp
+2 -1
View File
@@ -47,7 +47,8 @@ BOOST_AUTO_TEST_CASE(TestStoppedWells)
const auto& grid = eclipseState.getInputGrid();
const TableManager table ( deck );
const Eclipse3DProperties eclipseProperties ( deck , table, grid);
const Schedule sched(deck, grid, eclipseProperties, Phases(true, true, true), parseContext );
const Opm::Runspec runspec (deck);
const Schedule sched(deck, grid, eclipseProperties, runspec, parseContext );
double target_surfacerate_inj;
tests/test_wellcollection.cpp
+4 -2
View File
@@ -45,7 +45,8 @@ BOOST_AUTO_TEST_CASE(AddWellsAndGroupToCollection) {
const auto& grid = eclipseState.getInputGrid();
const TableManager table ( deck );
const Eclipse3DProperties eclipseProperties ( deck , table, grid);
const Schedule sched(deck, grid, eclipseProperties, Phases(true, true, true), parseContext );
const Runspec runspec(deck);
const Schedule sched(deck, grid, eclipseProperties, runspec, parseContext );
WellCollection collection;
@@ -84,7 +85,8 @@ BOOST_AUTO_TEST_CASE(EfficiencyFactor) {
const auto& grid = eclipseState.getInputGrid();
const TableManager table ( deck );
const Eclipse3DProperties eclipseProperties ( deck , table, grid);
const Schedule sched(deck, grid, eclipseProperties, Phases(true, true, true), parseContext );
const Runspec runspec(deck);
const Schedule sched(deck, grid, eclipseProperties, runspec, parseContext );
size_t timestep = 2;
WellCollection collection;
tests/test_wellmodel.cpp
+2 -1
View File
@@ -79,7 +79,8 @@ struct SetupTest {
{
const Opm::TableManager table ( deck );
const Opm::Eclipse3DProperties eclipseProperties ( deck , table, ecl_state->getInputGrid());
schedule.reset( new Opm::Schedule(deck, ecl_state->getInputGrid(), eclipseProperties, Opm::Phases(true, true, true), parse_context ));
const Opm::Runspec runspec (deck);
schedule.reset( new Opm::Schedule(deck, ecl_state->getInputGrid(), eclipseProperties, runspec, parse_context ));
}
// Create grid.
tests/test_wellsgroup.cpp
+6 -3
View File
@@ -52,7 +52,8 @@ BOOST_AUTO_TEST_CASE(ConstructGroupFromWell) {
const auto& grid = eclipseState.getInputGrid();
const TableManager table ( deck );
const Eclipse3DProperties eclipseProperties ( deck , table, grid);
const Schedule sched(deck, grid, eclipseProperties, Phases(true, true, true), parseContext );
const Opm::Runspec runspec (deck);
const Schedule sched(deck, grid, eclipseProperties, runspec, parseContext );
PhaseUsage pu = phaseUsageFromDeck(eclipseState);
@@ -91,7 +92,8 @@ BOOST_AUTO_TEST_CASE(ConstructGroupFromGroup) {
const auto& grid = eclipseState.getInputGrid();
const TableManager table ( deck );
const Eclipse3DProperties eclipseProperties ( deck , table, grid);
const Schedule sched(deck, grid, eclipseProperties, Phases(true, true, true), parseContext );
const Opm::Runspec runspec (deck);
const Schedule sched(deck, grid, eclipseProperties, runspec, parseContext );
const auto& nodes = sched.getGroupTree(2);
@@ -128,7 +130,8 @@ BOOST_AUTO_TEST_CASE(EfficiencyFactor) {
const auto& grid = eclipseState.getInputGrid();
const TableManager table ( deck );
const Eclipse3DProperties eclipseProperties ( deck , table, grid);
const Schedule sched(deck, grid, eclipseProperties, Phases(true, true, true), parseContext );
const Opm::Runspec runspec (deck);
const Schedule sched(deck, grid, eclipseProperties, runspec, parseContext );
const auto& nodes = sched.getGroupTree(2);
tests/test_wellsmanager.cpp
+10 -5
View File
@@ -184,7 +184,8 @@ BOOST_AUTO_TEST_CASE(New_Constructor_Works) {
const auto& grid = eclipseState.getInputGrid();
const Opm::TableManager table ( deck );
const Opm::Eclipse3DProperties eclipseProperties ( deck , table, grid);
const Opm::Schedule sched(deck, grid, eclipseProperties, Opm::Phases(true, true, true), parseContext );
const Opm::Runspec runspec (deck);
const Opm::Schedule sched(deck, grid, eclipseProperties, runspec, parseContext );
{
@@ -225,7 +226,8 @@ BOOST_AUTO_TEST_CASE(WellsEqual) {
const auto& grid = eclipseState.getInputGrid();
const Opm::TableManager table ( deck );
const Opm::Eclipse3DProperties eclipseProperties ( deck , table, grid);
const Opm::Schedule sched(deck, grid, eclipseProperties, Opm::Phases(true, true, true), parseContext );
const Opm::Runspec runspec (deck);
const Opm::Schedule sched(deck, grid, eclipseProperties, runspec, parseContext );
Opm::WellsManager wellsManager0(eclipseState, sched, 0, *vanguard.c_grid());
@@ -245,7 +247,8 @@ BOOST_AUTO_TEST_CASE(ControlsEqual) {
const auto& grid = eclipseState.getInputGrid();
const Opm::TableManager table ( deck );
const Opm::Eclipse3DProperties eclipseProperties ( deck , table, grid);
const Opm::Schedule sched(deck, grid, eclipseProperties, Opm::Phases(true, true, true), parseContext );
const Opm::Runspec runspec (deck);
const Opm::Schedule sched(deck, grid, eclipseProperties, runspec, parseContext );
@@ -273,7 +276,8 @@ BOOST_AUTO_TEST_CASE(WellShutOK) {
const auto& grid = eclipseState.getInputGrid();
const Opm::TableManager table ( deck );
const Opm::Eclipse3DProperties eclipseProperties ( deck , table, grid);
const Opm::Schedule sched(deck, grid, eclipseProperties, Opm::Phases(true, true, true), parseContext );
const Opm::Runspec runspec (deck);
const Opm::Schedule sched(deck, grid, eclipseProperties, runspec, parseContext );
Opm::WellsManager wellsManager2(eclipseState, sched, 2, *vanguard.c_grid());
@@ -294,7 +298,8 @@ BOOST_AUTO_TEST_CASE(WellSTOPOK) {
const auto& grid = eclipseState.getInputGrid();
const Opm::TableManager table ( deck );
const Opm::Eclipse3DProperties eclipseProperties ( deck , table, grid);
const Opm::Schedule sched(deck, grid, eclipseProperties, Opm::Phases(true, true, true), parseContext );
const Opm::Runspec runspec (deck);
const Opm::Schedule sched(deck, grid, eclipseProperties, runspec, parseContext );