OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove numRemoved member from WellConnections

Browse Source
This commit is contained in:
Joakim Hove 2020-03-18 15:41:21 +01:00
parent 91d5a86392
commit 006b87050d
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/simulators/utils/ParallelRestart.cpp
View File

@ -511,7 +511,6 @@ std::size_t packSize(const WellConnections& data,
return packSize(data.ordering(), comm) +
packSize(data.getHeadI(), comm) +
packSize(data.getHeadJ(), comm) +
packSize(data.getNumRemoved(), comm) +
packSize(data.getConnections(), comm);
}
@ -1414,7 +1413,6 @@ void pack(const WellConnections& data,
pack(data.ordering(), buffer, position, comm);
pack(data.getHeadI(), buffer, position, comm);
pack(data.getHeadJ(), buffer, position, comm);
pack(data.getNumRemoved(), buffer, position, comm);
pack(data.getConnections(), buffer, position, comm);
}
@ -2454,17 +2452,15 @@ void unpack(WellConnections& data,
Dune::MPIHelper::MPICommunicator comm)
{
int headI, headJ;
size_t numRemoved;
Connection::Order ordering;
std::vector<Connection> connections;
unpack(ordering, buffer, position, comm),
unpack(headI, buffer, position, comm),
unpack(headJ, buffer, position, comm),
unpack(numRemoved, buffer, position, comm),
unpack(connections, buffer, position, comm),
data = WellConnections(ordering, headI, headJ, numRemoved, connections);
data = WellConnections(ordering, headI, headJ, connections);
}
void unpack(Well::WellProductionProperties& data,

2
tests/test_ParallelRestart.cpp
View File

@ -1473,7 +1473,7 @@ BOOST_AUTO_TEST_CASE(WellConnections)
{9, 10, 11}, Opm::Connection::CTFKind::Defaulted,
12, 13.0, 14.0, true,
15, 16, 17.0);
Opm::WellConnections val1(Opm::Connection::Order::TRACK, 1, 2, 3, {conn, conn});
Opm::WellConnections val1(Opm::Connection::Order::TRACK, 1, 2, {conn, conn});
auto val2 = PackUnpack(val1);
DO_CHECKS(WellConnections)
#endif