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 SimulationConfig

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-12 15:57:20 +01:00
parent be74b0903a
commit fa3cccdd64
3 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,6 @@
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WList.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Well/WList.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.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>
@ -570,17 +569,6 @@ std::size_t packSize(const InitConfig& data, Dune::MPIHelper::MPICommunicator co
packSize(data.getRestartRootName(), comm); packSize(data.getRestartRootName(), comm);
} }
std::size_t packSize(const SimulationConfig& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.getThresholdPressure(), comm) +
packSize(data.bcconfig(), comm) +
packSize(data.rock_config(), comm) +
packSize(data.useCPR(), comm) +
packSize(data.hasDISGAS(), comm) +
packSize(data.hasVAPOIL(), comm) +
packSize(data.isThermal(), comm);
}
std::size_t packSize(const TimeMap& data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const TimeMap& data, Dune::MPIHelper::MPICommunicator comm)
{ {
return packSize(data.timeList(), comm); return packSize(data.timeList(), comm);
@ -2095,18 +2083,6 @@ void pack(const InitConfig& data, std::vector<char>& buffer, int& position,
pack(data.getRestartRootName(), buffer, position, comm); pack(data.getRestartRootName(), buffer, position, comm);
} }
void pack(const SimulationConfig& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.getThresholdPressure(), buffer, position, comm);
pack(data.bcconfig(), buffer, position, comm);
pack(data.rock_config(), buffer, position, comm);
pack(data.useCPR(), buffer, position, comm);
pack(data.hasDISGAS(), buffer, position, comm);
pack(data.hasVAPOIL(), buffer, position, comm);
pack(data.isThermal(), buffer, position, comm);
}
void pack(const TimeMap& data, std::vector<char>& buffer, int& position, void pack(const TimeMap& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@ -3783,23 +3759,6 @@ void unpack(InitConfig& data, std::vector<char>& buffer, int& position,
restartRequested, restartStep, restartRootName); restartRequested, restartStep, restartRootName);
} }
void unpack(SimulationConfig& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
ThresholdPressure thresholdPressure;
BCConfig bc;
RockConfig rock_config;
bool useCPR, DISGAS, VAPOIL, isThermal;
unpack(thresholdPressure, buffer, position, comm);
unpack(bc, buffer, position, comm);
unpack(rock_config, buffer, position, comm);
unpack(useCPR, buffer, position, comm);
unpack(DISGAS, buffer, position, comm);
unpack(VAPOIL, buffer, position, comm);
unpack(isThermal, buffer, position, comm);
data = SimulationConfig(thresholdPressure, bc, rock_config, useCPR, DISGAS, VAPOIL, isThermal);
}
void unpack(TimeMap& data, std::vector<char>& buffer, int& position, void unpack(TimeMap& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {

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

@ -125,7 +125,6 @@ class Runspec;
class Segment; class Segment;
class ShrateRecord; class ShrateRecord;
class ShrateTable; class ShrateTable;
class SimulationConfig;
class SimpleTable; class SimpleTable;
class SkprpolyTable; class SkprpolyTable;
class SkprwatTable; class SkprwatTable;
@ -585,7 +584,6 @@ ADD_PACK_PROTOTYPES(Runspec)
ADD_PACK_PROTOTYPES(Segment) ADD_PACK_PROTOTYPES(Segment)
ADD_PACK_PROTOTYPES(ShrateRecord) ADD_PACK_PROTOTYPES(ShrateRecord)
ADD_PACK_PROTOTYPES(ShrateTable) ADD_PACK_PROTOTYPES(ShrateTable)
ADD_PACK_PROTOTYPES(SimulationConfig)
ADD_PACK_PROTOTYPES(SimpleTable) ADD_PACK_PROTOTYPES(SimpleTable)
ADD_PACK_PROTOTYPES(SkprpolyTable) ADD_PACK_PROTOTYPES(SkprpolyTable)
ADD_PACK_PROTOTYPES(SkprwatTable) ADD_PACK_PROTOTYPES(SkprwatTable)

2
tests/test_ParallelRestart.cpp
View File

@ -845,7 +845,7 @@ BOOST_AUTO_TEST_CASE(SimulationConfig)
{ {
#if HAVE_MPI #if HAVE_MPI
Opm::SimulationConfig val1(getThresholdPressure(), getBCConfig(), getRockConfig(), false, true, false, true); Opm::SimulationConfig val1(getThresholdPressure(), getBCConfig(), getRockConfig(), false, true, false, true);
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(SimulationConfig) DO_CHECKS(SimulationConfig)
#endif #endif
} }