OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use small wrapper to manage shared pointers in ScheduleState

Browse Source
This commit is contained in:
Joakim Hove
2021-01-27 10:55:35 +01:00
parent 39720fa3a4
commit acb1284efd
22 changed files with 243 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/parser/ACTIONX.cpp
View File

@@ -764,10 +764,10 @@ TSTEP
Runspec runspec (deck);
Schedule sched(deck, grid1, fp, runspec, python);
const auto& actions0 = sched[0].actions();
const auto& actions0 = sched[0].actions.get();
BOOST_CHECK_EQUAL(actions0.size(), 0U);
const auto& actions1 = sched[1].actions();
const auto& actions1 = sched[1].actions.get();
BOOST_CHECK_EQUAL(actions1.size(), 1U);
@@ -804,7 +804,7 @@ TSTEP
/*****************************************************************/
const auto& actions2 = sched[2].actions();
const auto& actions2 = sched[2].actions.get();
BOOST_CHECK_EQUAL(actions2.size(), 2U);
const auto& actB = actions2.get("B");
@@ -920,8 +920,8 @@ ENDACTIO
Runspec runspec (deck);
Schedule sched(deck, grid1, fp, runspec, python);
const auto& action1 = sched[1].actions().get("A");
const auto& action2 = sched[2].actions().get("A");
const auto& action1 = sched[1].actions.get().get("A");
const auto& action2 = sched[2].actions.get().get("A");
BOOST_CHECK(action1.id() != action2.id());
@@ -976,7 +976,7 @@ TSTEP
auto unit_system = UnitSystem::newMETRIC();
const auto st = SummaryState{ std::chrono::system_clock::now() };
Schedule sched = make_schedule(deck_string);
const auto& action1 = sched[0].actions().get("A");
const auto& action1 = sched[0].actions.get().get("A");
{
const auto& group = sched.getGroup("G1", 0);
const auto& prod = group.productionControls(st);
@@ -1040,7 +1040,7 @@ TSTEP
Opm::UnitSystem unitSystem = UnitSystem( UnitSystem::UnitType::UNIT_TYPE_METRIC );
auto sched = make_schedule(input);
const auto& action1 = sched[0].actions().get("A");
const auto& action1 = sched[0].actions.get().get("A");
{
const auto& glo = sched.glo(0);
BOOST_CHECK(!glo.has_group("PLAT-A"));
@@ -1096,7 +1096,7 @@ TSTEP
const auto st = SummaryState{ std::chrono::system_clock::now() };
Schedule sched = make_schedule(deck_string);
const auto& action1 = sched[0].actions().get("A");
const auto& action1 = sched[0].actions.get().get("A");
{
const auto& well = sched.getWell("PROD1", 0);
BOOST_CHECK_EQUAL( well.getWellPIScalingFactor(1.0), 1.0);
@@ -1138,7 +1138,7 @@ ENDACTIO
Opm::WListManager wlm;
Opm::Action::Context context(st, wlm);
const auto& config = sched[0].actions();
const auto& config = sched[0].actions.get();
const Opm::Action::ActionX& action = config.get("ACT1");
/*