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 PolyInjTable, SkprwatTable, PlymwinjTable

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-17 10:07:46 +01:00
parent 937a27471b
commit cfe091ce1e
3 changed files with 2 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,8 +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/PlymwinjTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PolyInjTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PvtgTable.hpp> #include <opm/parser/eclipse/EclipseState/Tables/PvtgTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PvtoTable.hpp> #include <opm/parser/eclipse/EclipseState/Tables/PvtoTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Regdims.hpp> #include <opm/parser/eclipse/EclipseState/Tables/Regdims.hpp>
@ -64,7 +62,6 @@
#include <opm/parser/eclipse/EclipseState/Tables/RocktabTable.hpp> #include <opm/parser/eclipse/EclipseState/Tables/RocktabTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SimpleTable.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/SkprwatTable.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>
#include <opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp> #include <opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp>
@ -440,30 +437,12 @@ std::size_t packSize(const PvtoTable& data, Dune::MPIHelper::MPICommunicator com
return packSize(static_cast<const PvtxTable&>(data), comm); return packSize(static_cast<const PvtxTable&>(data), comm);
} }
std::size_t packSize(const PolyInjTable& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.getThroughputs(), comm) +
packSize(data.getVelocities(), comm) +
packSize(data.getTableNumber(), comm) +
packSize(data.getTableData(), comm);
}
std::size_t packSize(const PlymwinjTable& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(static_cast<const PolyInjTable&>(data), comm);
}
std::size_t packSize(const SkprpolyTable& data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const SkprpolyTable& data, Dune::MPIHelper::MPICommunicator comm)
{ {
return packSize(static_cast<const PolyInjTable&>(data), comm) + return packSize(static_cast<const PolyInjTable&>(data), comm) +
packSize(data.referenceConcentration(), comm); packSize(data.referenceConcentration(), comm);
} }
std::size_t packSize(const SkprwatTable& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(static_cast<const PolyInjTable&>(data), comm);
}
namespace { namespace {
struct SplitSimpleTables { struct SplitSimpleTables {
@ -1551,21 +1530,6 @@ void pack(const PvtoTable& data, std::vector<char>& buffer, int& position,
pack(static_cast<const PvtxTable&>(data), buffer, position, comm); pack(static_cast<const PvtxTable&>(data), buffer, position, comm);
} }
void pack(const PolyInjTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.getThroughputs(), buffer, position, comm);
pack(data.getVelocities(), buffer, position, comm);
pack(data.getTableNumber(), buffer, position, comm);
pack(data.getTableData(), buffer, position, comm);
}
void pack(const PlymwinjTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(static_cast<const PolyInjTable&>(data), buffer, position, comm);
}
void pack(const SkprpolyTable& data, std::vector<char>& buffer, int& position, void pack(const SkprpolyTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@ -1573,12 +1537,6 @@ void pack(const SkprpolyTable& data, std::vector<char>& buffer, int& position,
pack(data.referenceConcentration(), buffer, position, comm); pack(data.referenceConcentration(), buffer, position, comm);
} }
void pack(const SkprwatTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(static_cast<const PolyInjTable&>(data), buffer, position, comm);
}
void pack(const TableManager& data, std::vector<char>& buffer, int& position, void pack(const TableManager& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@ -2727,25 +2685,6 @@ void unpack(PvtoTable& data, std::vector<char>& buffer, int& position,
unpack_pvt(data, buffer, position, comm); unpack_pvt(data, buffer, position, comm);
} }
void unpack(PolyInjTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::vector<double> throughputs, velocities;
int tableNumber;
std::vector<std::vector<double>> tableData;
unpack(throughputs, buffer, position, comm);
unpack(velocities, buffer, position, comm);
unpack(tableNumber, buffer, position, comm);
unpack(tableData, buffer, position, comm);
data = PolyInjTable(throughputs, velocities, tableNumber, tableData);
}
void unpack(PlymwinjTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
unpack(static_cast<PolyInjTable&>(data), buffer, position, comm);
}
void unpack(SkprpolyTable& data, std::vector<char>& buffer, int& position, void unpack(SkprpolyTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@ -2755,12 +2694,6 @@ void unpack(SkprpolyTable& data, std::vector<char>& buffer, int& position,
data.setReferenceConcentration(refConcentration); data.setReferenceConcentration(refConcentration);
} }
void unpack(SkprwatTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
unpack(static_cast<PolyInjTable&>(data), buffer, position, comm);
}
void unpack(TableManager& data, std::vector<char>& buffer, int& position, void unpack(TableManager& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {

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

@ -68,10 +68,8 @@ class Location;
class MessageLimits; class MessageLimits;
class MLimits; class MLimits;
class OilVaporizationProperties; class OilVaporizationProperties;
class PlymwinjTable;
class PlyvmhRecord; class PlyvmhRecord;
class PlyvmhTable; class PlyvmhTable;
class PolyInjTable;
class PvtgTable; class PvtgTable;
class PvtoTable; class PvtoTable;
class PvtwsaltTable; class PvtwsaltTable;
@ -85,7 +83,6 @@ class Rock2dtrTable;
class Segment; class Segment;
class SimpleTable; class SimpleTable;
class SkprpolyTable; class SkprpolyTable;
class SkprwatTable;
class SolventDensityTable; class SolventDensityTable;
class SpiralICD; class SpiralICD;
class StandardCond; class StandardCond;
@ -466,10 +463,8 @@ ADD_PACK_PROTOTYPES(Location)
ADD_PACK_PROTOTYPES(MessageLimits) ADD_PACK_PROTOTYPES(MessageLimits)
ADD_PACK_PROTOTYPES(MLimits) ADD_PACK_PROTOTYPES(MLimits)
ADD_PACK_PROTOTYPES(OilVaporizationProperties) ADD_PACK_PROTOTYPES(OilVaporizationProperties)
ADD_PACK_PROTOTYPES(PlymwinjTable)
ADD_PACK_PROTOTYPES(PlyvmhRecord) ADD_PACK_PROTOTYPES(PlyvmhRecord)
ADD_PACK_PROTOTYPES(PlyvmhTable) ADD_PACK_PROTOTYPES(PlyvmhTable)
ADD_PACK_PROTOTYPES(PolyInjTable)
ADD_PACK_PROTOTYPES(PvtgTable) ADD_PACK_PROTOTYPES(PvtgTable)
ADD_PACK_PROTOTYPES(PvtoTable) ADD_PACK_PROTOTYPES(PvtoTable)
ADD_PACK_PROTOTYPES(PvtwsaltTable) ADD_PACK_PROTOTYPES(PvtwsaltTable)
@ -485,7 +480,6 @@ ADD_PACK_PROTOTYPES(RocktabTable)
ADD_PACK_PROTOTYPES(Segment) ADD_PACK_PROTOTYPES(Segment)
ADD_PACK_PROTOTYPES(SimpleTable) ADD_PACK_PROTOTYPES(SimpleTable)
ADD_PACK_PROTOTYPES(SkprpolyTable) ADD_PACK_PROTOTYPES(SkprpolyTable)
ADD_PACK_PROTOTYPES(SkprwatTable)
ADD_PACK_PROTOTYPES(SolventDensityTable) ADD_PACK_PROTOTYPES(SolventDensityTable)
ADD_PACK_PROTOTYPES(SpiralICD) ADD_PACK_PROTOTYPES(SpiralICD)
ADD_PACK_PROTOTYPES(std::string) ADD_PACK_PROTOTYPES(std::string)

4
tests/test_ParallelRestart.cpp
View File

@ -1142,7 +1142,7 @@ BOOST_AUTO_TEST_CASE(PlymwinjTable)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::PlymwinjTable val1({1.0}, {2.0}, 1, {{1.0}, {2.0}}); Opm::PlymwinjTable val1({1.0}, {2.0}, 1, {{1.0}, {2.0}});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(PlymwinjTable) DO_CHECKS(PlymwinjTable)
#endif #endif
} }
@ -1162,7 +1162,7 @@ BOOST_AUTO_TEST_CASE(SkprwatTable)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::SkprwatTable val1({1.0}, {2.0}, 1, {{1.0}, {2.0}}); Opm::SkprwatTable val1({1.0}, {2.0}, 1, {{1.0}, {2.0}});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(SkprwatTable) DO_CHECKS(SkprwatTable)
#endif #endif
} }