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 old serialization support for DeckKeyword

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-03-17 15:40:52 +01:00
parent a289008c96
commit c5f36bd7cc
3 changed files with 1 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -654,17 +654,6 @@ std::size_t packSize(const Group& data,
packSize(data.productionProperties(), comm);
}
std::size_t packSize(const DeckKeyword& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.name(), comm) +
packSize(data.location(), comm) +
packSize(data.records(), comm) +
packSize(data.isDataKeyword(), comm) +
packSize(data.isSlashTerminated(), comm);
}
std::size_t packSize(const Deck& data,
Dune::MPIHelper::MPICommunicator comm)
{
@@ -1347,17 +1336,6 @@ void pack(const Group& data,
pack(data.productionProperties(), buffer, position, comm);
}
void pack(const DeckKeyword& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.name(), buffer, position, comm);
pack(data.location(), buffer, position, comm);
pack(data.records(), buffer, position, comm);
pack(data.isDataKeyword(), buffer, position, comm);
pack(data.isSlashTerminated(), buffer, position, comm);
}
void pack(const Deck& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
@@ -2276,24 +2254,6 @@ void unpack(Group& data,
injection, production);
}
void unpack(DeckKeyword& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::string name;
Location location;
std::vector<DeckRecord> records;
bool isDataKeyword, isSlashTerminated;
unpack(name, buffer, position, comm);
unpack(location, buffer, position, comm);
unpack(records, buffer, position, comm);
unpack(isDataKeyword, buffer, position, comm);
unpack(isSlashTerminated, buffer, position, comm);
data = DeckKeyword(name, location, records,
isDataKeyword, isSlashTerminated);
}
void unpack(Deck& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{

1
opm/simulators/utils/ParallelRestart.hpp
View File

@@ -402,7 +402,6 @@ ADD_PACK_PROTOTYPES(data::Solution)
ADD_PACK_PROTOTYPES(data::Well)
ADD_PACK_PROTOTYPES(data::WellRates)
ADD_PACK_PROTOTYPES(Deck)
ADD_PACK_PROTOTYPES(DeckKeyword)
ADD_PACK_PROTOTYPES(Dimension)
ADD_PACK_PROTOTYPES(Group)
ADD_PACK_PROTOTYPES(Group::GroupInjectionProperties)

2
tests/test_ParallelRestart.cpp
View File

@@ -1960,7 +1960,7 @@ BOOST_AUTO_TEST_CASE(DeckKeyword)
#ifdef HAVE_MPI
Opm::DeckKeyword val1("test", {"test",1},
{getDeckRecord(), getDeckRecord()}, true, false);
auto val2 = PackUnpack(val1);
auto val2 = PackUnpack2(val1);
DO_CHECKS(DeckKeyword)
#endif
}