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 ThresholdPressure

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-12 15:54:45 +01:00
parent cdb19da0bd
commit 33cf3826aa
3 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,6 @@
#include <opm/parser/eclipse/EclipseState/SimulationConfig/BCConfig.hpp> #include <opm/parser/eclipse/EclipseState/SimulationConfig/BCConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/RockConfig.hpp> #include <opm/parser/eclipse/EclipseState/SimulationConfig/RockConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp> #include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Aqudims.hpp> #include <opm/parser/eclipse/EclipseState/Tables/Aqudims.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/ColumnSchema.hpp> #include <opm/parser/eclipse/EclipseState/Tables/ColumnSchema.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Eqldims.hpp> #include <opm/parser/eclipse/EclipseState/Tables/Eqldims.hpp>
@ -422,14 +421,6 @@ std::size_t packSize(const RestartValue& data, Dune::MPIHelper::MPICommunicator
return packSize(data.solution, comm) + packSize(data.wells, comm) + packSize(data.extra, comm); return packSize(data.solution, comm) + packSize(data.wells, comm) + packSize(data.extra, comm);
} }
std::size_t packSize(const ThresholdPressure& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.active(), comm) +
packSize(data.restart(), comm) +
packSize(data.thresholdPressureTable(), comm) +
packSize(data.pressureTable(), comm);
}
std::size_t packSize(const WellType& data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const WellType& data, Dune::MPIHelper::MPICommunicator comm)
{ {
return packSize(data.producer(), comm) + return packSize(data.producer(), comm) +
@ -1955,15 +1946,6 @@ void pack(const RestartValue& data, std::vector<char>& buffer, int& position,
pack(data.extra, buffer, position, comm); pack(data.extra, buffer, position, comm);
} }
void pack(const ThresholdPressure& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.active(), buffer, position, comm);
pack(data.restart(), buffer, position, comm);
pack(data.thresholdPressureTable(), buffer, position, comm);
pack(data.pressureTable(), buffer, position, comm);
}
void pack(const AquiferCT::AQUCT_data& data, std::vector<char>& buffer, int& position, void pack(const AquiferCT::AQUCT_data& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) { Dune::MPIHelper::MPICommunicator comm) {
pack(data.aquiferID, buffer, position, comm); pack(data.aquiferID, buffer, position, comm);
@ -3596,20 +3578,6 @@ void unpack(RockConfig& data, std::vector<char>& buffer, int& position,
data = RockConfig(active, rock_comp, rocknum_property, num_rock_tables, water_compaction, hyst_mode); data = RockConfig(active, rock_comp, rocknum_property, num_rock_tables, water_compaction, hyst_mode);
} }
void unpack(ThresholdPressure& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
ThresholdPressure::ThresholdPressureTable thpTable;
ThresholdPressure::PressureTable pTable;
bool active, restart;
unpack(active, buffer, position, comm);
unpack(restart, buffer, position, comm);
unpack(thpTable, buffer, position, comm);
unpack(pTable, buffer, position, comm);
data = ThresholdPressure(active, restart, thpTable, pTable);
}
void unpack(AquiferCT::AQUCT_data& data, std::vector<char>& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) void unpack(AquiferCT::AQUCT_data& data, std::vector<char>& buffer, int& position, Dune::MPIHelper::MPICommunicator comm)
{ {
int aquiferID; int aquiferID;

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

@ -141,7 +141,6 @@ class TableColumn;
class TableContainer; class TableContainer;
class TableManager; class TableManager;
class TableSchema; class TableSchema;
class ThresholdPressure;
class TimeStampUTC; class TimeStampUTC;
class TlmixparRecord; class TlmixparRecord;
class TlmixparTable; class TlmixparTable;
@ -606,7 +605,6 @@ ADD_PACK_PROTOTYPES(TableColumn)
ADD_PACK_PROTOTYPES(TableContainer) ADD_PACK_PROTOTYPES(TableContainer)
ADD_PACK_PROTOTYPES(TableManager) ADD_PACK_PROTOTYPES(TableManager)
ADD_PACK_PROTOTYPES(TableSchema) ADD_PACK_PROTOTYPES(TableSchema)
ADD_PACK_PROTOTYPES(ThresholdPressure)
ADD_PACK_PROTOTYPES(TimeMap) ADD_PACK_PROTOTYPES(TimeMap)
ADD_PACK_PROTOTYPES(TimeStampUTC) ADD_PACK_PROTOTYPES(TimeStampUTC)
ADD_PACK_PROTOTYPES(TlmixparRecord) ADD_PACK_PROTOTYPES(TlmixparRecord)

2
tests/test_ParallelRestart.cpp
View File

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