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 mpi serialization support for EndpointScaling

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-03-13 12:47:22 +01:00
parent 6fde65439d
commit 138673f69c
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 EndpointScaling& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.getBits(), comm);
}
std::size_t packSize(const UDQParams& data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const UDQParams& data, Dune::MPIHelper::MPICommunicator comm)
{ {
return packSize(data.reseed(), comm) + return packSize(data.reseed(), comm) +
@@ -1938,12 +1933,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 EndpointScaling& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.getBits(), buffer, position, comm);
}
void pack(const UDQParams& data, std::vector<char>& buffer, int& position, void pack(const UDQParams& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@@ -3472,14 +3461,6 @@ void unpack(RestartConfig& data, std::vector<char>& buffer, int& position,
restart_keyw, save_keyw); restart_keyw, save_keyw);
} }
void unpack(EndpointScaling& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
unsigned long bits;
unpack(bits, buffer, position, comm);
data = EndpointScaling(std::bitset<4>(bits));
}
void unpack(UDQParams& data, std::vector<char>& buffer, int& position, void unpack(UDQParams& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {

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

@@ -77,7 +77,6 @@ class DensityTable;
class Dimension; class Dimension;
class EclHysterConfig; class EclHysterConfig;
class Eqldims; class Eqldims;
class EndpointScaling;
class Events; class Events;
template<class T> class IOrderSet; template<class T> class IOrderSet;
class JFunc; class JFunc;
@@ -509,7 +508,6 @@ ADD_PACK_PROTOTYPES(DenT)
ADD_PACK_PROTOTYPES(DenT::entry) ADD_PACK_PROTOTYPES(DenT::entry)
ADD_PACK_PROTOTYPES(Dimension) ADD_PACK_PROTOTYPES(Dimension)
ADD_PACK_PROTOTYPES(EclHysterConfig) ADD_PACK_PROTOTYPES(EclHysterConfig)
ADD_PACK_PROTOTYPES(EndpointScaling)
ADD_PACK_PROTOTYPES(Eqldims) ADD_PACK_PROTOTYPES(Eqldims)
ADD_PACK_PROTOTYPES(Events) ADD_PACK_PROTOTYPES(Events)
ADD_PACK_PROTOTYPES(GConSale) ADD_PACK_PROTOTYPES(GConSale)

2
tests/test_ParallelRestart.cpp
View File

@@ -931,7 +931,7 @@ BOOST_AUTO_TEST_CASE(EndpointScaling)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::EndpointScaling val1(std::bitset<4>(13)); Opm::EndpointScaling val1(std::bitset<4>(13));
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(EndpointScaling) DO_CHECKS(EndpointScaling)
#endif #endif
} }