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 UDQAssign

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-16 15:38:31 +01:00
parent 89fcc588e8
commit 878885e61f
3 changed files with 1 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1111,21 +1111,6 @@ std::size_t packSize(const UDQDefine& data,
packSize(data.input_string(), comm);
}
std::size_t packSize(const UDQAssign::AssignRecord& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.selector, comm) +
packSize(data.value, comm);
}
std::size_t packSize(const UDQAssign& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.keyword(), comm) +
packSize(data.var_type(), comm) +
packSize(data.getRecords(), comm);
}
std::size_t packSize(const UDQIndex& data,
Dune::MPIHelper::MPICommunicator comm)
{
@ -2422,23 +2407,6 @@ void pack(const UDQDefine& data,
pack(data.input_string(), buffer, position, comm);
}
void pack(const UDQAssign::AssignRecord& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.selector, buffer, position, comm);
pack(data.value, buffer, position, comm);
}
void pack(const UDQAssign& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.keyword(), buffer, position, comm);
pack(data.var_type(), buffer, position, comm);
pack(data.getRecords(), buffer, position, comm);
}
void pack(const UDQIndex& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
@ -4203,27 +4171,6 @@ void unpack(UDQDefine& data,
data = UDQDefine(keyword, ast, varType, string_data);
}
void unpack(UDQAssign::AssignRecord& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
unpack(data.selector, buffer, position, comm);
unpack(data.value, buffer, position, comm);
}
void unpack(UDQAssign& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::string keyword;
UDQVarType varType;
std::vector<UDQAssign::AssignRecord> records;
unpack(keyword, buffer, position, comm);
unpack(varType, buffer, position, comm);
unpack(records, buffer, position, comm);
data = UDQAssign(keyword, varType, records);
}
void unpack(UDQIndex& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)

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

@ -37,7 +37,6 @@
#include <opm/parser/eclipse/EclipseState/Schedule/Group/Group.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQAssign.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WellTestConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/DenT.hpp>
@ -563,8 +562,6 @@ ADD_PACK_PROTOTYPES(TlmixparRecord)
ADD_PACK_PROTOTYPES(TlmixparTable)
ADD_PACK_PROTOTYPES(Tuning)
ADD_PACK_PROTOTYPES(UDAValue)
ADD_PACK_PROTOTYPES(UDQAssign)
ADD_PACK_PROTOTYPES(UDQAssign::AssignRecord)
ADD_PACK_PROTOTYPES(UDQConfig)
ADD_PACK_PROTOTYPES(UDQDefine)
ADD_PACK_PROTOTYPES(UDQIndex)

2
tests/test_ParallelRestart.cpp
View File

@ -1697,7 +1697,7 @@ BOOST_AUTO_TEST_CASE(UDQAssign)
Opm::UDQAssign val1("test", Opm::UDQVarType::NONE,
{Opm::UDQAssign::AssignRecord{{"test1"}, 1.0},
Opm::UDQAssign::AssignRecord{{"test2"}, 2.0}});
auto val2 = PackUnpack(val1);
auto val2 = PackUnpack2(val1);
DO_CHECKS(UDQAssign)
#endif
}