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 SimpleTable

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

28
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/Schedule/Well/WListManager.hpp>
#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/SimpleTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SkprpolyTable.hpp> #include <opm/parser/eclipse/EclipseState/Tables/SkprpolyTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/StandardCond.hpp> #include <opm/parser/eclipse/EclipseState/Tables/StandardCond.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp> #include <opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp>
@ -364,13 +363,6 @@ std::size_t packSize(const TableColumn& data, Dune::MPIHelper::MPICommunicator c
packSize(data.defaultCount(), comm); packSize(data.defaultCount(), comm);
} }
std::size_t packSize(const SimpleTable& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.schema(), comm) +
packSize(data.columns(), comm) +
packSize(data.jfunc(), comm);
}
std::size_t packSize(const TableContainer& data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const TableContainer& data, Dune::MPIHelper::MPICommunicator comm)
{ {
size_t res = 2*packSize(data.max(), comm); size_t res = 2*packSize(data.max(), comm);
@ -1396,14 +1388,6 @@ void pack(const TableColumn& data, std::vector<char>& buffer, int& position,
pack(data.defaultCount(), buffer, position, comm); pack(data.defaultCount(), buffer, position, comm);
} }
void pack(const SimpleTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.schema(), buffer, position, comm);
pack(data.columns(), buffer, position, comm);
pack(data.jfunc(), buffer, position, comm);
}
void pack(const TableContainer& data, std::vector<char>& buffer, int& position, void pack(const TableContainer& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@ -2471,18 +2455,6 @@ void unpack(TableColumn& data, std::vector<char>& buffer, int& position,
data = TableColumn(schema, name, values, defaults, defaultCount); data = TableColumn(schema, name, values, defaults, defaultCount);
} }
void unpack(SimpleTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
TableSchema schema;
OrderedMap<std::string, TableColumn> columns;
bool jf;
unpack(schema, buffer, position, comm);
unpack(columns, buffer, position, comm);
unpack(jf, buffer, position, comm);
data = SimpleTable(schema, columns, jf);
}
void unpack(TableContainer& data, std::vector<char>& buffer, int& position, void unpack(TableContainer& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {

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

@ -74,7 +74,6 @@ class RestartConfig;
class RestartSchedule; class RestartSchedule;
class RFTConfig; class RFTConfig;
class Segment; class Segment;
class SimpleTable;
class SkprpolyTable; class SkprpolyTable;
class SolventDensityTable; class SolventDensityTable;
class SpiralICD; class SpiralICD;
@ -464,7 +463,6 @@ ADD_PACK_PROTOTYPES(RestartSchedule)
ADD_PACK_PROTOTYPES(RestartValue) ADD_PACK_PROTOTYPES(RestartValue)
ADD_PACK_PROTOTYPES(RFTConfig) ADD_PACK_PROTOTYPES(RFTConfig)
ADD_PACK_PROTOTYPES(Segment) ADD_PACK_PROTOTYPES(Segment)
ADD_PACK_PROTOTYPES(SimpleTable)
ADD_PACK_PROTOTYPES(SkprpolyTable) ADD_PACK_PROTOTYPES(SkprpolyTable)
ADD_PACK_PROTOTYPES(SolventDensityTable) ADD_PACK_PROTOTYPES(SolventDensityTable)
ADD_PACK_PROTOTYPES(SpiralICD) ADD_PACK_PROTOTYPES(SpiralICD)

2
tests/test_ParallelRestart.cpp
View File

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