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 UDQActive

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-03-16 15:32:57 +01:00
parent c07fa535bd
commit 89fcc588e8
3 changed files with 3 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1146,36 +1146,6 @@ std::size_t packSize(const UDQConfig& data,
packSize(data.typeCount(), comm); packSize(data.typeCount(), comm);
} }
std::size_t packSize(const UDQActive::InputRecord& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.input_index, comm) +
packSize(data.udq, comm) +
packSize(data.wgname, comm) +
packSize(data.control, comm);
}
std::size_t packSize(const UDQActive::Record& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.udq, comm) +
packSize(data.input_index, comm) +
packSize(data.use_index, comm) +
packSize(data.wgname, comm) +
packSize(data.control, comm) +
packSize(data.uad_code, comm) +
packSize(data.use_count, comm);
}
std::size_t packSize(const UDQActive& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.getInputRecords(), comm) +
packSize(data.getOutputRecords(), comm) +
packSize(data.getUdqKeys(), comm) +
packSize(data.getWgKeys(), comm);
}
std::size_t packSize(const GuideRateModel& data, std::size_t packSize(const GuideRateModel& data,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@@ -2491,39 +2461,6 @@ void pack(const UDQConfig& data,
pack(data.typeCount(), buffer, position, comm); pack(data.typeCount(), buffer, position, comm);
} }
void pack(const UDQActive::InputRecord& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.input_index, buffer, position, comm);
pack(data.udq, buffer, position, comm);
pack(data.wgname, buffer, position, comm);
pack(data.control, buffer, position, comm);
}
void pack(const UDQActive::Record& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.udq, buffer, position, comm);
pack(data.input_index, buffer, position, comm);
pack(data.use_index, buffer, position, comm);
pack(data.wgname, buffer, position, comm);
pack(data.control, buffer, position, comm);
pack(data.uad_code, buffer, position, comm);
pack(data.use_count, buffer, position, comm);
}
void pack(const UDQActive& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.getInputRecords(), buffer, position, comm);
pack(data.getOutputRecords(), buffer, position, comm);
pack(data.getUdqKeys(), buffer, position, comm);
pack(data.getWgKeys(), buffer, position, comm);
}
void pack(const GuideRateModel& data, void pack(const GuideRateModel& data,
std::vector<char>& buffer, int& position, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
@@ -4320,44 +4257,6 @@ void unpack(UDQConfig& data,
assignmentsMap, units, inputIndex, typeCount); assignmentsMap, units, inputIndex, typeCount);
} }
void unpack(UDQActive::InputRecord& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
unpack(data.input_index, buffer, position, comm);
unpack(data.udq, buffer, position, comm);
unpack(data.wgname, buffer, position, comm);
unpack(data.control, buffer, position, comm);
}
void unpack(UDQActive::Record& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
unpack(data.udq, buffer, position, comm);
unpack(data.input_index, buffer, position, comm);
unpack(data.use_index, buffer, position, comm);
unpack(data.wgname, buffer, position, comm);
unpack(data.control, buffer, position, comm);
unpack(data.uad_code, buffer, position, comm);
unpack(data.use_count, buffer, position, comm);
}
void unpack(UDQActive& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::vector<UDQActive::InputRecord> inputRecords;
std::vector<UDQActive::Record> outputRecords;
std::unordered_map<std::string,std::size_t> udqKeys, wgKeys;
unpack(inputRecords, buffer, position, comm);
unpack(outputRecords, buffer, position, comm);
unpack(udqKeys, buffer, position, comm);
unpack(wgKeys, buffer, position, comm);
data = UDQActive(inputRecords, outputRecords, udqKeys, wgKeys);
}
void unpack(GuideRateModel& data, void unpack(GuideRateModel& data,
std::vector<char>& buffer, int& position, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
@@ -4906,7 +4805,6 @@ INSTANTIATE_PACK(DynamicState<std::shared_ptr<Action::Actions>>)
INSTANTIATE_PACK(DynamicState<std::shared_ptr<GConSale>>) INSTANTIATE_PACK(DynamicState<std::shared_ptr<GConSale>>)
INSTANTIATE_PACK(DynamicState<std::shared_ptr<GConSump>>) INSTANTIATE_PACK(DynamicState<std::shared_ptr<GConSump>>)
INSTANTIATE_PACK(DynamicState<std::shared_ptr<GuideRateConfig>>) INSTANTIATE_PACK(DynamicState<std::shared_ptr<GuideRateConfig>>)
INSTANTIATE_PACK(DynamicState<std::shared_ptr<UDQActive>>)
INSTANTIATE_PACK(DynamicState<std::shared_ptr<UDQConfig>>) INSTANTIATE_PACK(DynamicState<std::shared_ptr<UDQConfig>>)
INSTANTIATE_PACK(DynamicState<Tuning>) INSTANTIATE_PACK(DynamicState<Tuning>)
INSTANTIATE_PACK(DynamicState<Well::ProducerCMode>) INSTANTIATE_PACK(DynamicState<Well::ProducerCMode>)

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

@@ -38,7 +38,6 @@
#include <opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp>
#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/Well.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/DenT.hpp> #include <opm/parser/eclipse/EclipseState/Tables/DenT.hpp>
@@ -564,9 +563,6 @@ ADD_PACK_PROTOTYPES(TlmixparRecord)
ADD_PACK_PROTOTYPES(TlmixparTable) ADD_PACK_PROTOTYPES(TlmixparTable)
ADD_PACK_PROTOTYPES(Tuning) ADD_PACK_PROTOTYPES(Tuning)
ADD_PACK_PROTOTYPES(UDAValue) ADD_PACK_PROTOTYPES(UDAValue)
ADD_PACK_PROTOTYPES(UDQActive)
ADD_PACK_PROTOTYPES(UDQActive::InputRecord)
ADD_PACK_PROTOTYPES(UDQActive::Record)
ADD_PACK_PROTOTYPES(UDQAssign) ADD_PACK_PROTOTYPES(UDQAssign)
ADD_PACK_PROTOTYPES(UDQAssign::AssignRecord) ADD_PACK_PROTOTYPES(UDQAssign::AssignRecord)
ADD_PACK_PROTOTYPES(UDQConfig) ADD_PACK_PROTOTYPES(UDQConfig)

6
tests/test_ParallelRestart.cpp
View File

@@ -1728,7 +1728,7 @@ BOOST_AUTO_TEST_CASE(UDQActiveInputRecord)
#ifdef HAVE_MPI #ifdef HAVE_MPI
Opm::UDQActive::InputRecord val1(1, "test1", "test2", Opm::UDQActive::InputRecord val1(1, "test1", "test2",
Opm::UDAControl::WCONPROD_ORAT); Opm::UDAControl::WCONPROD_ORAT);
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(UDQActive::InputRecord) DO_CHECKS(UDQActive::InputRecord)
#endif #endif
} }
@@ -1739,7 +1739,7 @@ BOOST_AUTO_TEST_CASE(UDQActiveRecord)
#ifdef HAVE_MPI #ifdef HAVE_MPI
Opm::UDQActive::Record val1("test1", 1, 2, "test2", Opm::UDQActive::Record val1("test1", 1, 2, "test2",
Opm::UDAControl::WCONPROD_ORAT); Opm::UDAControl::WCONPROD_ORAT);
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(UDQActive::Record) DO_CHECKS(UDQActive::Record)
#endif #endif
} }
@@ -1753,7 +1753,7 @@ BOOST_AUTO_TEST_CASE(UDQActive)
{Opm::UDQActive::Record("test1", 1, 2, "test2", {Opm::UDQActive::Record("test1", 1, 2, "test2",
Opm::UDAControl::WCONPROD_ORAT)}, Opm::UDAControl::WCONPROD_ORAT)},
{{"test1", 1}}, {{"test2", 2}}); {{"test1", 1}}, {{"test2", 2}});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(UDQActive) DO_CHECKS(UDQActive)
#endif #endif
} }