OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-27 09:40:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove old serialization support for TableSchema

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-17 10:07:46 +01:00
parent 7f2f1309bd
commit 05d02dcd66
3 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,6 @@
#include <opm/parser/eclipse/EclipseState/Tables/Aqudims.hpp> #include <opm/parser/eclipse/EclipseState/Tables/Aqudims.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/FlatTable.hpp> #include <opm/parser/eclipse/EclipseState/Tables/FlatTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp> #include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableSchema.hpp>
#include <opm/parser/eclipse/EclipseState/Util/IOrderSet.hpp> #include <opm/parser/eclipse/EclipseState/Util/IOrderSet.hpp>
#include <dune/common/parallel/mpitraits.hh> #include <dune/common/parallel/mpitraits.hh>
@ -344,11 +343,6 @@ std::size_t packSize(const WellType& data, Dune::MPIHelper::MPICommunicator comm
packSize(data.preferred_phase(), comm); packSize(data.preferred_phase(), comm);
} }
std::size_t packSize(const TableSchema& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.getColumns(), comm);
}
std::size_t packSize(const TimeMap& data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const TimeMap& data, Dune::MPIHelper::MPICommunicator comm)
{ {
return packSize(data.timeList(), comm); return packSize(data.timeList(), comm);
@ -1334,12 +1328,6 @@ void pack(const WellType& data, std::vector<char>& buffer, int& position,
pack(data.preferred_phase(), buffer, position, comm); pack(data.preferred_phase(), buffer, position, comm);
} }
void pack(const TableSchema& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.getColumns(), buffer, position, comm);
}
void pack(const TimeMap& data, std::vector<char>& buffer, int& position, void pack(const TimeMap& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@ -2350,14 +2338,6 @@ void unpack(WellType& data, std::vector<char>& buffer, int& position, Dune::MPIH
data = WellType( producer, preferred_phase ); data = WellType( producer, preferred_phase );
} }
void unpack(TableSchema& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
OrderedMap<std::string, ColumnSchema> columns;
unpack(columns, buffer, position, comm);
data = TableSchema(columns);
}
void unpack(TimeMap& data, std::vector<char>& buffer, int& position, void unpack(TimeMap& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {

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

@ -76,9 +76,7 @@ class RFTConfig;
class Segment; class Segment;
class SpiralICD; class SpiralICD;
class Tabdims; class Tabdims;
class TableContainer;
class TableManager; class TableManager;
class TableSchema;
class TimeStampUTC; class TimeStampUTC;
class Tuning; class Tuning;
class UDAValue; class UDAValue;
@ -463,7 +461,6 @@ ADD_PACK_PROTOTYPES(SpiralICD)
ADD_PACK_PROTOTYPES(std::string) ADD_PACK_PROTOTYPES(std::string)
ADD_PACK_PROTOTYPES(Tabdims) ADD_PACK_PROTOTYPES(Tabdims)
ADD_PACK_PROTOTYPES(TableManager) ADD_PACK_PROTOTYPES(TableManager)
ADD_PACK_PROTOTYPES(TableSchema)
ADD_PACK_PROTOTYPES(TimeMap) ADD_PACK_PROTOTYPES(TimeMap)
ADD_PACK_PROTOTYPES(TimeStampUTC) ADD_PACK_PROTOTYPES(TimeStampUTC)
ADD_PACK_PROTOTYPES(Tuning) ADD_PACK_PROTOTYPES(Tuning)

2
tests/test_ParallelRestart.cpp
View File

@ -749,7 +749,7 @@ BOOST_AUTO_TEST_CASE(TableSchema)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::TableSchema val1 = getTableSchema(); Opm::TableSchema val1 = getTableSchema();
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(TableSchema) DO_CHECKS(TableSchema)
#endif #endif
} }