OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-16 20:24:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove old serialization support for Location

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

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

@ -22,7 +22,6 @@
#endif
#include "ParallelRestart.hpp"
#include <opm/common/OpmLog/Location.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/FaceDir.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Action/ActionAST.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Action/Actions.hpp>
@ -655,13 +654,6 @@ std::size_t packSize(const Group& data,
packSize(data.productionProperties(), comm);
}
std::size_t packSize(const Location& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.filename, comm) +
packSize(data.lineno, comm);
}
std::size_t packSize(const DeckKeyword& data,
Dune::MPIHelper::MPICommunicator comm)
{
@ -1355,14 +1347,6 @@ void pack(const Group& data,
pack(data.productionProperties(), buffer, position, comm);
}
void pack(const Location& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.filename, buffer, position, comm);
pack(data.lineno, buffer, position, comm);
}
void pack(const DeckKeyword& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
@ -2292,15 +2276,6 @@ void unpack(Group& data,
injection, production);
}
void unpack(Location& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
data.filename.clear();
unpack(data.filename, buffer, position, comm);
unpack(data.lineno, buffer, position, comm);
}
void unpack(DeckKeyword& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)

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

@ -54,7 +54,6 @@ namespace Action {
class Connection;
class Dimension;
template<class T> class IOrderSet;
class Location;
class Segment;
class SpiralICD;
class UDAValue;
@ -408,7 +407,6 @@ ADD_PACK_PROTOTYPES(Dimension)
ADD_PACK_PROTOTYPES(Group)
ADD_PACK_PROTOTYPES(Group::GroupInjectionProperties)
ADD_PACK_PROTOTYPES(Group::GroupProductionProperties)
ADD_PACK_PROTOTYPES(Location)
ADD_PACK_PROTOTYPES(RestartKey)
ADD_PACK_PROTOTYPES(RestartValue)
ADD_PACK_PROTOTYPES(Segment)

2
tests/test_ParallelRestart.cpp
View File

@ -1949,7 +1949,7 @@ BOOST_AUTO_TEST_CASE(Location)
{
#ifdef HAVE_MPI
Opm::Location val1{"test", 1};
auto val2 = PackUnpack(val1);
auto val2 = PackUnpack2(val1);
DO_CHECKS(Location)
#endif
}