From 90710725654ec8851e13b5faa73983882b974290 Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Tue, 17 Mar 2020 14:37:32 +0100
Subject: [PATCH] remove old serialization support for Events

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

diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp
index 64272de54..95c414fb0 100644
--- a/opm/simulators/utils/ParallelRestart.cpp
+++ b/opm/simulators/utils/ParallelRestart.cpp
@@ -29,7 +29,6 @@
 #include <opm/parser/eclipse/EclipseState/Schedule/Action/ActionX.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Action/ASTNode.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Action/Condition.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/Events.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/MessageLimits.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/MSW/icd.hpp>
@@ -337,12 +336,6 @@ template
 std::size_t packSize(const std::map<Phase,Group::GroupInjectionProperties>& data,
                      Dune::MPIHelper::MPICommunicator comm);
 
-std::size_t packSize(const Events& data,
-                     Dune::MPIHelper::MPICommunicator comm)
-{
-    return packSize(data.events(), comm);
-}
-
 std::size_t packSize(const MessageLimits& data,
                      Dune::MPIHelper::MPICommunicator comm)
 {
@@ -1164,13 +1157,6 @@ void pack(const WellType& data, std::vector<char>& buffer, int& position,
     pack(data.preferred_phase(), buffer, position, comm);
 }
 
-void pack(const Events& data,
-          std::vector<char>& buffer, int& position,
-          Dune::MPIHelper::MPICommunicator comm)
-{
-    pack(data.events(), buffer, position, comm);
-}
-
 void pack(const MessageLimits& data,
           std::vector<char>& buffer, int& position,
           Dune::MPIHelper::MPICommunicator comm)
@@ -2051,15 +2037,6 @@ void unpack(WellType& data, std::vector<char>& buffer, int& position, Dune::MPIH
     data = WellType( producer, preferred_phase );
 }
 
-void unpack(Events& data,
-          std::vector<char>& buffer, int& position,
-          Dune::MPIHelper::MPICommunicator comm)
-{
-    DynamicVector<uint64_t> events;
-    unpack(events, buffer, position, comm);
-    data = Events(events);
-}
-
 void unpack(MessageLimits& data,
           std::vector<char>& buffer, int& position,
           Dune::MPIHelper::MPICommunicator comm)
@@ -3016,7 +2993,6 @@ INSTANTIATE_PACK(unsigned char)
 INSTANTIATE_PACK(std::map<std::pair<int,int>,std::pair<bool,double>>)
 INSTANTIATE_PACK(std::map<FaceDir::DirEnum,std::string>)
 INSTANTIATE_PACK(std::map<FaceDir::DirEnum,std::vector<double>>)
-INSTANTIATE_PACK(std::map<std::string,Events>)
 INSTANTIATE_PACK(std::map<std::string,std::vector<int>>)
 INSTANTIATE_PACK(std::map<std::string,std::map<std::pair<int,int>,int>>)
 INSTANTIATE_PACK(std::map<UDQVarType,std::size_t>)
diff --git a/opm/simulators/utils/ParallelRestart.hpp b/opm/simulators/utils/ParallelRestart.hpp
index 1839ab0ee..b10124d5a 100644
--- a/opm/simulators/utils/ParallelRestart.hpp
+++ b/opm/simulators/utils/ParallelRestart.hpp
@@ -60,7 +60,6 @@ class Connection;
 class DeckItem;
 class DeckRecord;
 class Dimension;
-class Events;
 template<class T> class IOrderSet;
 class Location;
 class MessageLimits;
@@ -421,7 +420,6 @@ ADD_PACK_PROTOTYPES(DeckItem)
 ADD_PACK_PROTOTYPES(DeckKeyword)
 ADD_PACK_PROTOTYPES(DeckRecord)
 ADD_PACK_PROTOTYPES(Dimension)
-ADD_PACK_PROTOTYPES(Events)
 ADD_PACK_PROTOTYPES(GConSale)
 ADD_PACK_PROTOTYPES(GConSale::GCONSALEGroup)
 ADD_PACK_PROTOTYPES(GConSump)
diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp
index 9d27e4130..f0a39677f 100644
--- a/tests/test_ParallelRestart.cpp
+++ b/tests/test_ParallelRestart.cpp
@@ -1289,7 +1289,7 @@ BOOST_AUTO_TEST_CASE(Events)
 {
 #ifdef HAVE_MPI
     Opm::Events val1(Opm::DynamicVector<uint64_t>({1,2,3,4,5}));
-    auto val2 = PackUnpack(val1);
+    auto val2 = PackUnpack2(val1);
     DO_CHECKS(Events)
 #endif
 }