Moved IOConfig to become member of RestartConfig

This commit is contained in:
Joakim Hove
2020-01-28 22:43:42 +01:00
parent b5cd80c232
commit 149722922b
2 changed files with 12 additions and 10 deletions

View File

@@ -821,7 +821,9 @@ BOOST_AUTO_TEST_CASE(RestartConfig)
#if HAVE_MPI
Opm::DynamicState<Opm::RestartSchedule> rsched({Opm::RestartSchedule(1, 2, 3)}, 2);
Opm::DynamicState<std::map<std::string,int>> rkw({{{"test",3}}}, 3);
Opm::RestartConfig val1(getTimeMap(), 1, true, rsched, rkw, {false, true});
Opm::IOConfig io(true, false, true, false, false, true, "test1", true,
"test2", true, "test3", false);
Opm::RestartConfig val1(io, getTimeMap(), 1, true, rsched, rkw, {false, true});
auto val2 = PackUnpack(val1);
BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2));
BOOST_CHECK(val1 == std::get<0>(val2));
@@ -2464,8 +2466,8 @@ BOOST_AUTO_TEST_CASE(EclipseConfig)
true, true, true, 20, "test1");
Opm::DynamicState<Opm::RestartSchedule> rsched({Opm::RestartSchedule(1, 2, 3)}, 2);
Opm::DynamicState<std::map<std::string,int>> rkw({{{"test",3}}}, 3);
Opm::RestartConfig restart(getTimeMap(), 1, true, rsched, rkw, {false, true});
Opm::EclipseConfig val1{io, init, restart};
Opm::RestartConfig restart(io, getTimeMap(), 1, true, rsched, rkw, {false, true});
Opm::EclipseConfig val1{init, restart};
auto val2 = PackUnpack(val1);
BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2));