From 0212c5e9be2816a56038b5c07d9365e204495a2b 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 TransMult

---
 opm/simulators/utils/ParallelRestart.cpp | 36 ------------------------
 opm/simulators/utils/ParallelRestart.hpp |  2 --
 tests/test_ParallelRestart.cpp           |  2 +-
 3 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp
index 64d389e62..04ee176b1 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/TransMult.hpp>
 #include <opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp>
 #include <opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
@@ -1555,15 +1554,6 @@ std::size_t packSize(const EclipseConfig& data,
            packSize(data.io(), comm);
 }
 
-std::size_t packSize(const TransMult& data,
-                     Dune::MPIHelper::MPICommunicator comm)
-{
-    return packSize(data.getSize(), comm) +
-           packSize(data.getTrans(), comm) +
-           packSize(data.getNames(), comm) +
-           packSize(data.getScanner(), comm);
-}
-
 std::size_t packSize(const FaultFace& data,
                      Dune::MPIHelper::MPICommunicator comm)
 {
@@ -3085,16 +3075,6 @@ void pack(const EclipseConfig& data,
     pack(data.io(), buffer, position, comm);
 }
 
-void pack(const TransMult& data,
-          std::vector<char>& buffer, int& position,
-          Dune::MPIHelper::MPICommunicator comm)
-{
-    pack(data.getSize(), buffer, position, comm);
-    pack(data.getTrans(), buffer, position, comm);
-    pack(data.getNames(), buffer, position, comm);
-    pack(data.getScanner(), buffer, position, comm);
-}
-
 void pack(const FaultFace& data,
           std::vector<char>& buffer, int& position,
           Dune::MPIHelper::MPICommunicator comm)
@@ -5242,22 +5222,6 @@ void unpack(EclipseConfig& data,
     data = EclipseConfig(init, io);
 }
 
-void unpack(TransMult& data,
-            std::vector<char>& buffer, int& position,
-            Dune::MPIHelper::MPICommunicator comm)
-{
-    std::array<size_t, 3> size;
-    std::map<FaceDir::DirEnum, std::vector<double>> trans;
-    std::map<FaceDir::DirEnum, std::string> names;
-    MULTREGTScanner scanner;
-
-    unpack(size, buffer, position, comm);
-    unpack(trans, buffer, position, comm);
-    unpack(names, buffer, position, comm);
-    unpack(scanner, buffer, position, comm);
-    data = TransMult(size, trans, names, scanner);
-}
-
 void unpack(FaultFace& 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 3751ea312..a4c32bc5b 100644
--- a/opm/simulators/utils/ParallelRestart.hpp
+++ b/opm/simulators/utils/ParallelRestart.hpp
@@ -139,7 +139,6 @@ class TableSchema;
 class TimeStampUTC;
 class TlmixparRecord;
 class TlmixparTable;
-class TransMult;
 class Tuning;
 class UDAValue;
 class UDQASTNode;
@@ -597,7 +596,6 @@ ADD_PACK_PROTOTYPES(TimeMap)
 ADD_PACK_PROTOTYPES(TimeStampUTC)
 ADD_PACK_PROTOTYPES(TlmixparRecord)
 ADD_PACK_PROTOTYPES(TlmixparTable)
-ADD_PACK_PROTOTYPES(TransMult)
 ADD_PACK_PROTOTYPES(Tuning)
 ADD_PACK_PROTOTYPES(UDAValue)
 ADD_PACK_PROTOTYPES(UDQActive)
diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp
index ac98e3562..898d07237 100644
--- a/tests/test_ParallelRestart.cpp
+++ b/tests/test_ParallelRestart.cpp
@@ -2290,7 +2290,7 @@ BOOST_AUTO_TEST_CASE(TransMult)
                         {{Opm::FaceDir::YPlus, {4.0, 5.0}}},
                         {{Opm::FaceDir::ZPlus, "test1"}},
                         scanner);
-    auto val2 = PackUnpack(val1);
+    auto val2 = PackUnpack2(val1);
     DO_CHECKS(TransMult)
 #endif
 }