remove old serialization support for UDQCOnfig

opm/simulators/utils/ParallelRestart.cpp

@@ -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>>)

opm/simulators/utils/ParallelRestart.hpp

@@ -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)

tests/test_ParallelRestart.cpp

@@ -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
 }