OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-05 22:13:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove old serialization support for GroupProductionProperties

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-18 09:29:02 +01:00
parent d496b93cfa
commit 714caef9c6
3 changed files with 1 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -371,21 +371,6 @@ std::size_t packSize(const UnitSystem& data,
packSize(data.use_count(), comm); packSize(data.use_count(), comm);
} }
std::size_t packSize(const Group::GroupProductionProperties& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.cmode, comm) +
packSize(data.exceed_action, comm) +
packSize(data.oil_target, comm) +
packSize(data.water_target, comm) +
packSize(data.gas_target, comm) +
packSize(data.liquid_target, comm) +
packSize(data.guide_rate, comm) +
packSize(data.guide_rate_def, comm) +
packSize(data.resv_target, comm) +
packSize(data.production_controls, comm);
}
std::size_t packSize(const Group& data, std::size_t packSize(const Group& data,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@ -731,22 +716,6 @@ void pack(const UnitSystem& data,
pack(data.use_count(), buffer, position, comm); pack(data.use_count(), buffer, position, comm);
} }
void pack(const Group::GroupProductionProperties& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.cmode, buffer, position, comm);
pack(data.exceed_action, buffer, position, comm);
pack(data.oil_target, buffer, position, comm);
pack(data.water_target, buffer, position, comm);
pack(data.gas_target, buffer, position, comm);
pack(data.liquid_target, buffer, position, comm);
pack(data.guide_rate, buffer, position, comm);
pack(data.guide_rate_def, buffer, position, comm);
pack(data.resv_target, buffer, position, comm);
pack(data.production_controls, buffer, position, comm);
}
void pack(const Group& data, void pack(const Group& data,
std::vector<char>& buffer, int& position, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
@ -1159,22 +1128,6 @@ void unpack(UnitSystem& data,
data = UnitSystem(name, type, dimensions, use_count); data = UnitSystem(name, type, dimensions, use_count);
} }
void unpack(Group::GroupProductionProperties& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
unpack(data.cmode, buffer, position, comm);
unpack(data.exceed_action, buffer, position, comm);
unpack(data.oil_target, buffer, position, comm);
unpack(data.water_target, buffer, position, comm);
unpack(data.gas_target, buffer, position, comm);
unpack(data.liquid_target, buffer, position, comm);
unpack(data.guide_rate, buffer, position, comm);
unpack(data.guide_rate_def, buffer, position, comm);
unpack(data.resv_target, buffer, position, comm);
unpack(data.production_controls, buffer, position, comm);
}
void unpack(Group& data, void unpack(Group& data,
std::vector<char>& buffer, int& position, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)

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

@ -354,7 +354,6 @@ ADD_PACK_PROTOTYPES(data::Well)
ADD_PACK_PROTOTYPES(data::WellRates) ADD_PACK_PROTOTYPES(data::WellRates)
ADD_PACK_PROTOTYPES(Dimension) ADD_PACK_PROTOTYPES(Dimension)
ADD_PACK_PROTOTYPES(Group) ADD_PACK_PROTOTYPES(Group)
ADD_PACK_PROTOTYPES(Group::GroupProductionProperties)
ADD_PACK_PROTOTYPES(RestartKey) ADD_PACK_PROTOTYPES(RestartKey)
ADD_PACK_PROTOTYPES(RestartValue) ADD_PACK_PROTOTYPES(RestartValue)
ADD_PACK_PROTOTYPES(std::string) ADD_PACK_PROTOTYPES(std::string)

2
tests/test_ParallelRestart.cpp
View File

@ -1613,7 +1613,7 @@ BOOST_AUTO_TEST_CASE(GroupProductionProperties)
5.0, Opm::Group::GuideRateTarget::COMB, 5.0, Opm::Group::GuideRateTarget::COMB,
6.0, 7}; 6.0, 7};
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(Group::GroupProductionProperties) DO_CHECKS(Group::GroupProductionProperties)
#endif #endif
} }