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 PlyshlogTable

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

91
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/JFunc.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>
@ -63,7 +62,6 @@
#include <opm/parser/eclipse/EclipseState/Tables/Rock2dTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Rock2dtrTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/RocktabTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/PlyshlogTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SkprpolyTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SkprwatTable.hpp>
@ -1138,17 +1136,6 @@ std::size_t packSize(const TimeStampUTC& data,
packSize(data.microseconds(), comm);
}
std::size_t packSize(const JFunc& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.flag(), comm) +
packSize(data.owSurfaceTension(), comm) +
packSize(data.goSurfaceTension(), comm) +
packSize(data.alphaFactor(), comm) +
packSize(data.betaFactor(), comm) +
packSize(data.direction(), comm);
}
std::size_t packSize(const WellPolymerProperties& data,
Dune::MPIHelper::MPICommunicator comm)
{
@ -1194,16 +1181,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 PlyshlogTable& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(static_cast<const SimpleTable&>(data), comm) +
packSize(data.getRefPolymerConcentration(), comm) +
packSize(data.getRefSalinity(), comm) +
packSize(data.getRefTemperature(), comm) +
packSize(data.hasRefSalinity(), comm) +
packSize(data.hasRefTemperature(), comm);
}
std::size_t packSize(const RocktabTable& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(static_cast<const SimpleTable&>(data), comm) +
@ -2273,18 +2250,6 @@ void pack(const TimeStampUTC& data,
pack(data.microseconds(), buffer, position, comm);
}
void pack(const JFunc& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.flag(), buffer, position, comm);
pack(data.owSurfaceTension(), buffer, position, comm);
pack(data.goSurfaceTension(), buffer, position, comm);
pack(data.alphaFactor(), buffer, position, comm);
pack(data.betaFactor(), buffer, position, comm);
pack(data.direction(), buffer, position, comm);
}
void pack(const WellPolymerProperties& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
@ -2336,17 +2301,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 PlyshlogTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(static_cast<const SimpleTable&>(data), buffer, position, comm);
pack(data.getRefPolymerConcentration(), buffer, position, comm);
pack(data.getRefSalinity(), buffer, position, comm);
pack(data.getRefTemperature(), buffer, position, comm);
pack(data.hasRefSalinity(), buffer, position, comm);
pack(data.hasRefTemperature(), buffer, position, comm);
}
void pack(const RocktabTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
@ -3847,25 +3801,6 @@ void unpack(TimeStampUTC& data,
data = TimeStampUTC(ymd, hour, minutes, seconds, usec);
}
void unpack(JFunc& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
JFunc::Flag flag;
double owSurfaceTension, goSurfaceTension;
double alphaFactor, betaFactor;
JFunc::Direction dir;
unpack(flag, buffer, position, comm);
unpack(owSurfaceTension, buffer, position, comm);
unpack(goSurfaceTension, buffer, position, comm);
unpack(alphaFactor, buffer, position, comm);
unpack(betaFactor, buffer, position, comm);
unpack(dir, buffer, position, comm);
data = JFunc(flag, owSurfaceTension, goSurfaceTension,
alphaFactor, betaFactor, dir);
}
void unpack(WellPolymerProperties& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
@ -3921,32 +3856,6 @@ void unpack(PlyvmhTable& data, std::vector<char>& buffer, int& position,
data = PlyvmhTable(pdata);
}
void unpack(PlyshlogTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
TableSchema schema;
OrderedMap<std::string, TableColumn> columns;
bool jfunc;
double refPolymerConcentration;
double refSalinity;
double refTemperature;
bool hasRefSalinity;
bool hasRefTemperature;
unpack(schema, buffer, position, comm);
unpack(columns, buffer, position, comm);
unpack(jfunc, buffer, position, comm);
unpack(refPolymerConcentration, buffer, position, comm);
unpack(refSalinity, buffer, position, comm);
unpack(refTemperature, buffer, position, comm);
unpack(hasRefSalinity, buffer, position, comm);
unpack(hasRefTemperature, buffer, position, comm);
data = PlyshlogTable(schema, columns, jfunc,
refPolymerConcentration, refSalinity,
refTemperature, hasRefSalinity, hasRefTemperature);
}
void unpack(RocktabTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{

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

@ -69,7 +69,6 @@ class MessageLimits;
class MLimits;
class OilVaporizationProperties;
class PlymwinjTable;
class PlyshlogTable;
class PlyvmhRecord;
class PlyvmhTable;
class PolyInjTable;
@ -468,7 +467,6 @@ ADD_PACK_PROTOTYPES(MessageLimits)
ADD_PACK_PROTOTYPES(MLimits)
ADD_PACK_PROTOTYPES(OilVaporizationProperties)
ADD_PACK_PROTOTYPES(PlymwinjTable)
ADD_PACK_PROTOTYPES(PlyshlogTable)
ADD_PACK_PROTOTYPES(PlyvmhRecord)
ADD_PACK_PROTOTYPES(PlyvmhTable)
ADD_PACK_PROTOTYPES(PolyInjTable)

2
tests/test_ParallelRestart.cpp
View File

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