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 Phases

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-03-13 12:45:51 +01:00
parent d3115c7afd
commit 6fde65439d
3 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -551,11 +551,6 @@ std::size_t packSize(const RestartConfig& data, Dune::MPIHelper::MPICommunicator
packSize(data.saveKeywords(), comm); packSize(data.saveKeywords(), comm);
} }
std::size_t packSize(const Phases& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.getBits(), comm);
}
std::size_t packSize(const EndpointScaling& data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const EndpointScaling& data, Dune::MPIHelper::MPICommunicator comm)
{ {
return packSize(data.getBits(), comm); return packSize(data.getBits(), comm);
@@ -1943,12 +1938,6 @@ void pack(const RestartConfig& data, std::vector<char>& buffer, int& position,
pack(data.saveKeywords(), buffer, position, comm); pack(data.saveKeywords(), buffer, position, comm);
} }
void pack(const Phases& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.getBits(), buffer, position, comm);
}
void pack(const EndpointScaling& data, std::vector<char>& buffer, int& position, void pack(const EndpointScaling& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@@ -3483,14 +3472,6 @@ void unpack(RestartConfig& data, std::vector<char>& buffer, int& position,
restart_keyw, save_keyw); restart_keyw, save_keyw);
} }
void unpack(Phases& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
unsigned long bits;
unpack(bits, buffer, position, comm);
data = Phases(std::bitset<NUM_PHASES_IN_ENUM>(bits));
}
void unpack(EndpointScaling& data, std::vector<char>& buffer, int& position, void unpack(EndpointScaling& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {

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

@@ -85,7 +85,6 @@ class Location;
class MessageLimits; class MessageLimits;
class MLimits; class MLimits;
class OilVaporizationProperties; class OilVaporizationProperties;
class Phases;
class PlymwinjTable; class PlymwinjTable;
class PlyshlogTable; class PlyshlogTable;
class PlyvmhRecord; class PlyvmhRecord;
@@ -529,7 +528,6 @@ ADD_PACK_PROTOTYPES(Location)
ADD_PACK_PROTOTYPES(MessageLimits) ADD_PACK_PROTOTYPES(MessageLimits)
ADD_PACK_PROTOTYPES(MLimits) ADD_PACK_PROTOTYPES(MLimits)
ADD_PACK_PROTOTYPES(OilVaporizationProperties) ADD_PACK_PROTOTYPES(OilVaporizationProperties)
ADD_PACK_PROTOTYPES(Phases)
ADD_PACK_PROTOTYPES(PlmixparRecord) ADD_PACK_PROTOTYPES(PlmixparRecord)
ADD_PACK_PROTOTYPES(PlmixparTable) ADD_PACK_PROTOTYPES(PlmixparTable)
ADD_PACK_PROTOTYPES(PlymwinjTable) ADD_PACK_PROTOTYPES(PlymwinjTable)

2
tests/test_ParallelRestart.cpp
View File

@@ -911,7 +911,7 @@ BOOST_AUTO_TEST_CASE(Phases)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::Phases val1(true, true, true, false, true, false, true, false); Opm::Phases val1(true, true, true, false, true, false, true, false);
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(Phases) DO_CHECKS(Phases)
#endif #endif
} }