From aad289841adfa96911aaff4a4442c03f6ad24b42 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Fri, 13 Mar 2020 08:26:18 +0100
Subject: [PATCH] remove old serialization support for MULTREGTScanner

---
 opm/simulators/utils/ParallelRestart.cpp | 76 ------------------------
 opm/simulators/utils/ParallelRestart.hpp |  4 --
 tests/test_ParallelRestart.cpp           |  4 +-
 3 files changed, 2 insertions(+), 82 deletions(-)

diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp
index 01eb59f68..64d389e62 100644
--- a/opm/simulators/utils/ParallelRestart.cpp
+++ b/opm/simulators/utils/ParallelRestart.cpp
@@ -28,7 +28,6 @@
 #include <opm/parser/eclipse/EclipseState/Grid/Fault.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/FaultFace.hpp>
-#include <opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/TransMult.hpp>
 #include <opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp>
 #include <opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.hpp>
@@ -1549,27 +1548,6 @@ std::size_t packSize(const GuideRateConfig::GroupTarget& data,
            packSize(data.target, comm);
 }
 
-std::size_t packSize(const MULTREGTRecord& data,
-                     Dune::MPIHelper::MPICommunicator comm)
-{
-    return packSize(data.src_value, comm) +
-           packSize(data.target_value, comm) +
-           packSize(data.trans_mult, comm) +
-           packSize(data.directions, comm) +
-           packSize(data.nnc_behaviour, comm) +
-           packSize(data.region_name, comm);
-}
-
-std::size_t packSize(const MULTREGTScanner& data,
-                     Dune::MPIHelper::MPICommunicator comm)
-{
-    return packSize(data.getSize(), comm) +
-           packSize(data.getRecords(), comm) +
-           packSize(data.getSearchMap(), comm) +
-           packSize(data.getRegions(), comm) +
-           packSize(data.getDefaultRegion(), comm);
-}
-
 std::size_t packSize(const EclipseConfig& data,
                      Dune::MPIHelper::MPICommunicator comm)
 {
@@ -3099,29 +3077,6 @@ void pack(const GuideRateConfig::GroupTarget& data,
     pack(data.target, buffer, position, comm);
 }
 
-void pack(const MULTREGTRecord& data,
-          std::vector<char>& buffer, int& position,
-          Dune::MPIHelper::MPICommunicator comm)
-{
-    pack(data.src_value, buffer, position, comm);
-    pack(data.target_value, buffer, position, comm);
-    pack(data.trans_mult, buffer, position, comm);
-    pack(data.directions, buffer, position, comm);
-    pack(data.nnc_behaviour, buffer, position, comm);
-    pack(data.region_name, buffer, position, comm);
-}
-
-void pack(const MULTREGTScanner& data,
-          std::vector<char>& buffer, int& position,
-          Dune::MPIHelper::MPICommunicator comm)
-{
-    pack(data.getSize(), buffer, position, comm);
-    pack(data.getRecords(), buffer, position, comm);
-    pack(data.getSearchMap(), buffer, position, comm);
-    pack(data.getRegions(), buffer, position, comm);
-    pack(data.getDefaultRegion(), buffer, position, comm);
-}
-
 void pack(const EclipseConfig& data,
           std::vector<char>& buffer, int& position,
           Dune::MPIHelper::MPICommunicator comm)
@@ -5275,37 +5230,6 @@ void unpack(GuideRateConfig::GroupTarget& data,
     unpack(data.target, buffer, position, comm);
 }
 
-void unpack(MULTREGTRecord& data,
-            std::vector<char>& buffer, int& position,
-            Dune::MPIHelper::MPICommunicator comm)
-{
-    unpack(data.src_value, buffer, position, comm);
-    unpack(data.target_value, buffer, position, comm);
-    unpack(data.trans_mult, buffer, position, comm);
-    unpack(data.directions, buffer, position, comm);
-    unpack(data.nnc_behaviour, buffer, position, comm);
-    unpack(data.region_name, buffer, position, comm);
-}
-
-void unpack(MULTREGTScanner& data,
-            std::vector<char>& buffer, int& position,
-            Dune::MPIHelper::MPICommunicator comm)
-{
-    std::array<size_t, 3> size;
-    std::vector<MULTREGTRecord> records;
-    MULTREGTScanner::ExternalSearchMap searchMap;
-    std::map<std::string, std::vector<int>> regions;
-    std::string defaultRegion;
-
-    unpack(size, buffer, position, comm);
-    unpack(records, buffer, position, comm);
-    unpack(searchMap, buffer, position, comm);
-    unpack(regions, buffer, position, comm);
-    unpack(defaultRegion, buffer, position, comm);
-
-    data = MULTREGTScanner(size, records, searchMap, regions, defaultRegion);
-}
-
 void unpack(EclipseConfig& data,
             std::vector<char>& buffer, int& position,
             Dune::MPIHelper::MPICommunicator comm)
diff --git a/opm/simulators/utils/ParallelRestart.hpp b/opm/simulators/utils/ParallelRestart.hpp
index 508395707..3751ea312 100644
--- a/opm/simulators/utils/ParallelRestart.hpp
+++ b/opm/simulators/utils/ParallelRestart.hpp
@@ -94,8 +94,6 @@ class JFunc;
 class Location;
 class MessageLimits;
 class MLimits;
-class MULTREGTRecord;
-class MULTREGTScanner;
 class OilVaporizationProperties;
 class Phases;
 class PlymwinjTable;
@@ -551,8 +549,6 @@ ADD_PACK_PROTOTYPES(JFunc)
 ADD_PACK_PROTOTYPES(Location)
 ADD_PACK_PROTOTYPES(MessageLimits)
 ADD_PACK_PROTOTYPES(MLimits)
-ADD_PACK_PROTOTYPES(MULTREGTRecord)
-ADD_PACK_PROTOTYPES(MULTREGTScanner)
 ADD_PACK_PROTOTYPES(OilVaporizationProperties)
 ADD_PACK_PROTOTYPES(Phases)
 ADD_PACK_PROTOTYPES(PlmixparRecord)
diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp
index a07993113..ac98e3562 100644
--- a/tests/test_ParallelRestart.cpp
+++ b/tests/test_ParallelRestart.cpp
@@ -2232,7 +2232,7 @@ BOOST_AUTO_TEST_CASE(MULTREGTRecord)
 {
 #ifdef HAVE_MPI
     Opm::MULTREGTRecord val1{1, 2, 3.0, 4, Opm::MULTREGT::ALL, "test"};
-    auto val2 = PackUnpack(val1);
+    auto val2 = PackUnpack2(val1);
     DO_CHECKS(MULTREGTRecord)
 #endif
 }
@@ -2251,7 +2251,7 @@ BOOST_AUTO_TEST_CASE(MULTREGTScanner)
                               {{"test3", {7,8}}},
                               "test4");
 
-    auto val2 = PackUnpack(val1);
+    auto val2 = PackUnpack2(val1);
     DO_CHECKS(MULTREGTScanner)
 #endif
 }