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

fixed: missing Kind in Connection serialization

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-01-13 11:56:10 +01:00
parent 2a2379dce9
commit b2b398e217
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1191,6 +1191,7 @@ std::size_t packSize(const Connection& data,
packSize(data.getI(), comm) +
packSize(data.getJ(), comm) +
packSize(data.getK(), comm) +
packSize(data.kind(), comm) +
packSize(data.getSeqIndex(), comm) +
packSize(data.getSegDistStart(), comm) +
packSize(data.getSegDistEnd(), comm) +
@ -2892,6 +2893,7 @@ void pack(const Connection& data,
pack(data.getI(), buffer, position, comm);
pack(data.getJ(), buffer, position, comm);
pack(data.getK(), buffer, position, comm);
pack(data.kind(), buffer, position, comm);
pack(data.getSeqIndex(), buffer, position, comm);
pack(data.getSegDistStart(), buffer, position, comm);
pack(data.getSegDistEnd(), buffer, position, comm);
@ -5006,6 +5008,8 @@ void unpack(Connection& data,
size_t compSegSeqIndex;
int segment;
double wellPi;
Connection::CTFKind kind;
unpack(dir, buffer, position, comm);
unpack(depth, buffer, position, comm);
unpack(state, buffer, position, comm);
@ -5019,6 +5023,7 @@ void unpack(Connection& data,
unpack(I, buffer, position, comm);
unpack(J, buffer, position, comm);
unpack(K, buffer, position, comm);
unpack(kind, buffer, position, comm);
unpack(seqIndex, buffer, position, comm);
unpack(segDistStart, buffer, position, comm);
unpack(segDistEnd, buffer, position, comm);
@ -5029,7 +5034,7 @@ void unpack(Connection& data,
data = Connection(dir, depth, state, satTableId,
complnum, CF, Kh, rw, r0,
skinFactor, {I,J,K}, seqIndex,
skinFactor, {I,J,K}, kind, seqIndex,
segDistStart, segDistEnd,
defaultSatTabId, compSegSeqIndex,
segment, wellPi);

6
tests/test_ParallelRestart.cpp
View File

@ -1564,7 +1564,8 @@ BOOST_AUTO_TEST_CASE(Connection)
Opm::Connection val1(Opm::Connection::Direction::Y,
1.0, Opm::Connection::State::SHUT,
2, 3, 4.0, 5.0, 6.0, 7.0, 8.0,
{9, 10, 11}, 12, 13.0, 14.0, true,
{9, 10, 11}, Opm::Connection::CTFKind::Defaulted,
12, 13.0, 14.0, true,
15, 16, 17.0);
auto val2 = PackUnpack(val1);
BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2));
@ -1629,7 +1630,8 @@ BOOST_AUTO_TEST_CASE(WellConnections)
Opm::Connection conn(Opm::Connection::Direction::Y,
1.0, Opm::Connection::State::SHUT,
2, 3, 4.0, 5.0, 6.0, 7.0, 8.0,
{9, 10, 11}, 12, 13.0, 14.0, true,
{9, 10, 11}, Opm::Connection::CTFKind::Defaulted,
12, 13.0, 14.0, true,
15, 16, 17.0);
Opm::WellConnections val1(1, 2, 3, {conn, conn});
auto val2 = PackUnpack(val1);