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 UDQCOnfig

Browse Source
This commit is contained in:
Arne Morten Kvarving
2020-03-16 15:41:45 +01:00
parent e165bd56a5
commit d7cfb92edc
3 changed files with 1 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,6 @@
#include <opm/parser/eclipse/EclipseState/Schedule/ScheduleTypes.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Tuning.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunction.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.hpp>
@@ -1100,17 +1099,6 @@ std::size_t packSize(const WListManager& data,
return packSize(data.lists(), comm);
}
std::size_t packSize(const UDQConfig& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.params(), comm) +
packSize(data.definitionMap(), comm) +
packSize(data.assignmentMap(), comm) +
packSize(data.unitsMap(), comm) +
packSize(data.inputIndex(), comm) +
packSize(data.typeCount(), comm);
}
std::size_t packSize(const GuideRateModel& data,
Dune::MPIHelper::MPICommunicator comm)
{
@@ -2377,18 +2365,6 @@ void pack(const WListManager& data,
pack(data.lists(), buffer, position, comm);
}
void pack(const UDQConfig& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.params(), buffer, position, comm);
pack(data.definitionMap(), buffer, position, comm);
pack(data.assignmentMap(), buffer, position, comm);
pack(data.unitsMap(), buffer, position, comm);
pack(data.inputIndex(), buffer, position, comm);
pack(data.typeCount(), buffer, position, comm);
}
void pack(const GuideRateModel& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
@@ -4115,29 +4091,6 @@ void unpack(WListManager& data,
data = WListManager(lists);
}
void unpack(UDQConfig& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
UDQParams params;
UDQFunctionTable function_table;
std::unordered_map<std::string,UDQDefine> definitionsMap;
std::unordered_map<std::string,UDQAssign> assignmentsMap;
std::unordered_map<std::string,std::string> units;
OrderedMap<std::string,UDQIndex> inputIndex;
std::map<UDQVarType,std::size_t> typeCount;
unpack(params, buffer, position, comm);
function_table = UDQFunctionTable(params);
unpack(definitionsMap, buffer, position, comm);
unpack(assignmentsMap, buffer, position, comm);
unpack(units, buffer, position, comm);
unpack(inputIndex, buffer, position, comm);
unpack(typeCount, buffer, position, comm);
data = UDQConfig(params, function_table, definitionsMap,
assignmentsMap, units, inputIndex, typeCount);
}
void unpack(GuideRateModel& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
@@ -4686,7 +4639,6 @@ INSTANTIATE_PACK(DynamicState<std::shared_ptr<Action::Actions>>)
INSTANTIATE_PACK(DynamicState<std::shared_ptr<GConSale>>)
INSTANTIATE_PACK(DynamicState<std::shared_ptr<GConSump>>)
INSTANTIATE_PACK(DynamicState<std::shared_ptr<GuideRateConfig>>)
INSTANTIATE_PACK(DynamicState<std::shared_ptr<UDQConfig>>)
INSTANTIATE_PACK(DynamicState<Tuning>)
INSTANTIATE_PACK(DynamicState<Well::ProducerCMode>)
INSTANTIATE_PACK(DynamicState<std::shared_ptr<WellTestConfig>>)

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

@@ -123,7 +123,6 @@ class TlmixparRecord;
class TlmixparTable;
class Tuning;
class UDAValue;
class UDQConfig;
class UDQParams;
class UnitSystem;
class Valve;
@@ -560,7 +559,6 @@ ADD_PACK_PROTOTYPES(TlmixparRecord)
ADD_PACK_PROTOTYPES(TlmixparTable)
ADD_PACK_PROTOTYPES(Tuning)
ADD_PACK_PROTOTYPES(UDAValue)
ADD_PACK_PROTOTYPES(UDQConfig)
ADD_PACK_PROTOTYPES(UDQParams)
ADD_PACK_PROTOTYPES(UnitSystem)
ADD_PACK_PROTOTYPES(Valve)

2
tests/test_ParallelRestart.cpp
View File

@@ -1717,7 +1717,7 @@ BOOST_AUTO_TEST_CASE(UDQConfig)
{
#ifdef HAVE_MPI
Opm::UDQConfig val1 = getUDQConfig();
auto val2 = PackUnpack(val1);
auto val2 = PackUnpack2(val1);
DO_CHECKS(UDQConfig)
#endif
}