diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index 51e5b342c..24e2ac6f1 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -1532,6 +1532,7 @@ std::size_t packSize(const Group& data, packSize(data.type(), comm) + packSize(data.getGroupEfficiencyFactor(), comm) + packSize(data.getTransferGroupEfficiencyFactor(), comm) + + packSize(data.isAvailableForGroupControl(), comm) + packSize(data.getGroupNetVFPTable(), comm) + packSize(data.parent(), comm) + packSize(data.iwells(), comm) + @@ -3375,6 +3376,7 @@ void pack(const Group& data, pack(data.type(), buffer, position, comm); pack(data.getGroupEfficiencyFactor(), buffer, position, comm); pack(data.getTransferGroupEfficiencyFactor(), buffer, position, comm); + pack(data.isAvailableForGroupControl(), buffer, position, comm); pack(data.getGroupNetVFPTable(), buffer, position, comm); pack(data.parent(), buffer, position, comm); pack(data.iwells(), buffer, position, comm); @@ -5913,6 +5915,7 @@ void unpack(Group& data, Group::GroupType type; double groupEfficiencyFactor; bool transferGroupEfficiencyFactor; + bool availableForGroupControl; int groupNetVFPTable; std::string parent; IOrderSet wells, groups; @@ -5927,6 +5930,7 @@ void unpack(Group& data, unpack(type, buffer, position, comm); unpack(groupEfficiencyFactor, buffer, position, comm); unpack(transferGroupEfficiencyFactor, buffer, position, comm); + unpack(availableForGroupControl, buffer, position, comm); unpack(groupNetVFPTable, buffer, position, comm); unpack(parent, buffer, position, comm); unpack(wells, buffer, position, comm); @@ -5936,6 +5940,7 @@ void unpack(Group& data, data = Group(name, insert_index, initStep, udqUndefined, units, type, groupEfficiencyFactor, transferGroupEfficiencyFactor, + availableForGroupControl, groupNetVFPTable, parent, wells, groups, injection, production); } diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index d90fd93db..2c38999bd 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -1786,7 +1786,7 @@ BOOST_AUTO_TEST_CASE(Group) std::map injection; Opm::Group val1("test1", 1, 2, 3.0, unitSystem, Opm::Group::GroupType::PRODUCTION, - 4.0, true, 5, "test2", + 4.0, true, false, 5, "test2", Opm::IOrderSet({"test3", "test4"}, {"test3","test4"}), Opm::IOrderSet({"test5", "test6"}, {"test5","test6"}), injection, @@ -2225,7 +2225,7 @@ BOOST_AUTO_TEST_CASE(Schedule) std::map injection; groups.insert({"test", {{std::make_shared("test1", 1, 2, 3.0, unitSystem, Opm::Group::GroupType::PRODUCTION, - 4.0, true, 5, "test2", + 4.0, true, false, 5, "test2", Opm::IOrderSet({"test3", "test4"}, {"test3","test4"}), Opm::IOrderSet({"test5", "test6"}, {"test5","test6"}), injection,