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 DeckRecord

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

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

@ -655,12 +655,6 @@ std::size_t packSize(const Group& data,
packSize(data.productionProperties(), comm); packSize(data.productionProperties(), comm);
} }
std::size_t packSize(const DeckRecord& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.getItems(), comm);
}
std::size_t packSize(const Location& data, std::size_t packSize(const Location& data,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@ -1361,13 +1355,6 @@ void pack(const Group& data,
pack(data.productionProperties(), buffer, position, comm); pack(data.productionProperties(), buffer, position, comm);
} }
void pack(const DeckRecord& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.getItems(), buffer, position, comm);
}
void pack(const Location& data, void pack(const Location& data,
std::vector<char>& buffer, int& position, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
@ -2305,15 +2292,6 @@ void unpack(Group& data,
injection, production); injection, production);
} }
void unpack(DeckRecord& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::vector<DeckItem> items;
unpack(items, buffer, position, comm);
data = DeckRecord(std::move(items));
}
void unpack(Location& data, void unpack(Location& data,
std::vector<char>& buffer, int& position, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)

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

@ -52,7 +52,6 @@ namespace Action {
} }
class Connection; class Connection;
class DeckRecord;
class Dimension; class Dimension;
template<class T> class IOrderSet; template<class T> class IOrderSet;
class Location; class Location;
@ -405,7 +404,6 @@ ADD_PACK_PROTOTYPES(data::Well)
ADD_PACK_PROTOTYPES(data::WellRates) ADD_PACK_PROTOTYPES(data::WellRates)
ADD_PACK_PROTOTYPES(Deck) ADD_PACK_PROTOTYPES(Deck)
ADD_PACK_PROTOTYPES(DeckKeyword) ADD_PACK_PROTOTYPES(DeckKeyword)
ADD_PACK_PROTOTYPES(DeckRecord)
ADD_PACK_PROTOTYPES(Dimension) ADD_PACK_PROTOTYPES(Dimension)
ADD_PACK_PROTOTYPES(Group) ADD_PACK_PROTOTYPES(Group)
ADD_PACK_PROTOTYPES(Group::GroupInjectionProperties) ADD_PACK_PROTOTYPES(Group::GroupInjectionProperties)

2
tests/test_ParallelRestart.cpp
View File

@ -1939,7 +1939,7 @@ BOOST_AUTO_TEST_CASE(DeckRecord)
{ {
#ifdef HAVE_MPI #ifdef HAVE_MPI
Opm::DeckRecord val1 = getDeckRecord(); Opm::DeckRecord val1 = getDeckRecord();
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(DeckRecord) DO_CHECKS(DeckRecord)
#endif #endif
} }