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 RocktabTable

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

30
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/RocktabTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SkprpolyTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/StandardCond.hpp>
@ -1114,12 +1113,6 @@ std::size_t packSize(const PlyvmhTable& data, Dune::MPIHelper::MPICommunicator c
return packSize(static_cast<const std::vector<PlyvmhRecord>&>(data), comm);
}
std::size_t packSize(const RocktabTable& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(static_cast<const SimpleTable&>(data), comm) +
packSize(data.isDirectional(), comm);
}
////// pack routines
template<class T>
@ -2167,13 +2160,6 @@ void pack(const PlyvmhTable& data, std::vector<char>& buffer, int& position,
pack(static_cast<const std::vector<PlyvmhRecord>&>(data), buffer, position, comm);
}
void pack(const RocktabTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(static_cast<const SimpleTable&>(data), buffer, position, comm);
pack(data.isDirectional(), buffer, position, comm);
}
/// unpack routines
template<class T>
@ -3634,22 +3620,6 @@ void unpack(PlyvmhTable& data, std::vector<char>& buffer, int& position,
data = PlyvmhTable(pdata);
}
void unpack(RocktabTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
TableSchema schema;
OrderedMap<std::string, TableColumn> columns;
bool jfunc;
bool isDirectional;
unpack(schema, buffer, position, comm);
unpack(columns, buffer, position, comm);
unpack(jfunc, buffer, position, comm);
unpack(isDirectional, buffer, position, comm);
data = RocktabTable(schema, columns, jfunc, isDirectional);
}
#define INSTANTIATE_PACK_VECTOR(...) \
template std::size_t packSize(const std::vector<__VA_ARGS__>& data, \
Dune::MPIHelper::MPICommunicator comm); \

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

@ -73,7 +73,6 @@ class PlyvmhTable;
class RestartConfig;
class RestartSchedule;
class RFTConfig;
class RocktabTable;
class Segment;
class SimpleTable;
class SkprpolyTable;
@ -464,7 +463,6 @@ ADD_PACK_PROTOTYPES(RestartKey)
ADD_PACK_PROTOTYPES(RestartSchedule)
ADD_PACK_PROTOTYPES(RestartValue)
ADD_PACK_PROTOTYPES(RFTConfig)
ADD_PACK_PROTOTYPES(RocktabTable)
ADD_PACK_PROTOTYPES(Segment)
ADD_PACK_PROTOTYPES(SimpleTable)
ADD_PACK_PROTOTYPES(SkprpolyTable)

2
tests/test_ParallelRestart.cpp
View File

@ -2385,7 +2385,7 @@ BOOST_AUTO_TEST_CASE(RocktabTable)
Opm::OrderedMap<std::string, Opm::TableColumn> data;
data.insert({"test3", getTableColumn()});
Opm::RocktabTable val1(getTableSchema(), data, true, true);
auto val2 = PackUnpack(val1);
auto val2 = PackUnpack2(val1);
DO_CHECKS(RocktabTable)
#endif
}