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 RockConfig

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

44
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/WList.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WListManager.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/RockConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Aqudims.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/ColumnSchema.hpp>
@ -361,7 +360,6 @@ HANDLE_AS_POD(PlyvmhRecord)
HANDLE_AS_POD(PVTWRecord)
HANDLE_AS_POD(PVCDORecord)
HANDLE_AS_POD(Regdims)
HANDLE_AS_POD(RockConfig::RockComp)
HANDLE_AS_POD(ROCKRecord)
HANDLE_AS_POD(SatFuncControls)
HANDLE_AS_POD(ShrateRecord)
@ -492,16 +490,6 @@ std::size_t packSize(const Aquancon& data, Dune::MPIHelper::MPICommunicator comm
return packSize(data.data(), comm);
}
std::size_t packSize(const RockConfig& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.active(), comm) +
packSize(data.rocknum_property(), comm) +
packSize(data.comp(), comm) +
packSize(data.num_rock_tables(), comm) +
packSize(data.water_compaction(), comm) +
packSize(data.hysteresis_mode(), comm);
}
std::size_t packSize(const Rock2dTable& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.pvmultValues(), comm) +
@ -2014,18 +2002,6 @@ void pack(const Aquancon& data, std::vector<char>& buffer, int& position,
pack(data.data(), buffer, position, comm);
}
void pack(const RockConfig& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.active(), buffer, position, comm);
pack(data.rocknum_property(), buffer, position, comm);
pack(data.comp(), buffer, position, comm);
pack(data.num_rock_tables(), buffer, position, comm);
pack(data.water_compaction(), buffer, position, comm);
pack(data.hysteresis_mode(), buffer, position, comm);
}
void pack(const Rock2dTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
@ -3545,26 +3521,6 @@ void unpack(RestartValue& data, std::vector<char>& buffer, int& position,
unpack(data.extra, buffer, position, comm);
}
void unpack(RockConfig& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
RockConfig rock_config;
bool active;
std::vector<RockConfig::RockComp> rock_comp;
std::string rocknum_property;
std::size_t num_rock_tables;
bool water_compaction;
RockConfig::Hysteresis hyst_mode;
unpack(active, buffer, position, comm);
unpack(rocknum_property, buffer, position, comm);
unpack(rock_comp, buffer, position, comm);
unpack(num_rock_tables, buffer, position, comm);
unpack(water_compaction, buffer, position, comm);
unpack(hyst_mode, buffer, position, comm);
data = RockConfig(active, rock_comp, rocknum_property, num_rock_tables, water_compaction, hyst_mode);
}
void unpack(AquiferCT::AQUCT_data& data, std::vector<char>& buffer, int& position, Dune::MPIHelper::MPICommunicator comm)
{
int aquiferID;

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

@ -41,7 +41,6 @@
#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQActive.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/RockConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/DenT.hpp>
#include <opm/parser/eclipse/EclipseState/Util/OrderedMap.hpp>
@ -577,8 +576,6 @@ ADD_PACK_PROTOTYPES(RestartKey)
ADD_PACK_PROTOTYPES(RestartSchedule)
ADD_PACK_PROTOTYPES(RestartValue)
ADD_PACK_PROTOTYPES(RFTConfig)
ADD_PACK_PROTOTYPES(RockConfig)
ADD_PACK_PROTOTYPES(RockConfig::RockComp)
ADD_PACK_PROTOTYPES(ROCKRecord)
ADD_PACK_PROTOTYPES(RockTable)
ADD_PACK_PROTOTYPES(Rock2dTable)

2
tests/test_ParallelRestart.cpp
View File

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