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 TableColumn

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-17 10:07:46 +01:00
parent 1459b8bfd1
commit 198ea25dcb
3 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,6 @@
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Aqudims.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/FlatTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableSchema.hpp>
@ -351,15 +350,6 @@ std::size_t packSize(const TableSchema& data, Dune::MPIHelper::MPICommunicator c
return packSize(data.getColumns(), comm);
}
std::size_t packSize(const TableColumn& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.schema(), comm) +
packSize(data.name(), comm) +
packSize(data.values(), comm) +
packSize(data.defaults(), comm) +
packSize(data.defaultCount(), comm);
}
std::size_t packSize(const TableContainer& data, Dune::MPIHelper::MPICommunicator comm)
{
size_t res = 2*packSize(data.max(), comm);
@ -1363,16 +1353,6 @@ void pack(const TableSchema& data, std::vector<char>& buffer, int& position,
pack(data.getColumns(), buffer, position, comm);
}
void pack(const TableColumn& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.schema(), buffer, position, comm);
pack(data.name(), buffer, position, comm);
pack(data.values(), buffer, position, comm);
pack(data.defaults(), buffer, position, comm);
pack(data.defaultCount(), buffer, position, comm);
}
void pack(const TableContainer& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
@ -2410,22 +2390,6 @@ void unpack(TableSchema& data, std::vector<char>& buffer, int& position,
data = TableSchema(columns);
}
void unpack(TableColumn& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
ColumnSchema schema;
std::string name;
std::vector<double> values;
std::vector<bool> defaults;
size_t defaultCount;
unpack(schema, buffer, position, comm);
unpack(name, buffer, position, comm);
unpack(values, buffer, position, comm);
unpack(defaults, buffer, position, comm);
unpack(defaultCount, buffer, position, comm);
data = TableColumn(schema, name, values, defaults, defaultCount);
}
void unpack(TableContainer& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{

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

@ -76,7 +76,6 @@ class RFTConfig;
class Segment;
class SpiralICD;
class Tabdims;
class TableColumn;
class TableContainer;
class TableManager;
class TableSchema;
@ -463,7 +462,6 @@ ADD_PACK_PROTOTYPES(Segment)
ADD_PACK_PROTOTYPES(SpiralICD)
ADD_PACK_PROTOTYPES(std::string)
ADD_PACK_PROTOTYPES(Tabdims)
ADD_PACK_PROTOTYPES(TableColumn)
ADD_PACK_PROTOTYPES(TableContainer)
ADD_PACK_PROTOTYPES(TableManager)
ADD_PACK_PROTOTYPES(TableSchema)

2
tests/test_ParallelRestart.cpp
View File

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