From 81663e2942d690db8d6ec3e67ceaaa8c3b75d1de Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Wed, 18 Mar 2020 09:29:02 +0100
Subject: [PATCH] remove old serialization support for Action::Actions

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

diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp
index 0fd3fd094..b594da31f 100644
--- a/opm/simulators/utils/ParallelRestart.cpp
+++ b/opm/simulators/utils/ParallelRestart.cpp
@@ -23,7 +23,6 @@
 
 #include "ParallelRestart.hpp"
 #include <opm/parser/eclipse/EclipseState/Grid/FaceDir.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/Action/Actions.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/MSW/icd.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/MSW/SpiralICD.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.hpp>
@@ -662,12 +661,6 @@ std::size_t packSize(const Deck& data,
            packSize(data.unitSystemAccessCount(), comm);
 }
 
-std::size_t packSize(const Action::Actions& data,
-                     Dune::MPIHelper::MPICommunicator comm)
-{
-    return packSize(data.getActions(), comm);
-}
-
 std::size_t packSize(const WellPolymerProperties& data,
                      Dune::MPIHelper::MPICommunicator comm)
 {
@@ -1308,13 +1301,6 @@ void pack(const Deck& data,
     pack(data.unitSystemAccessCount(), buffer, position, comm);
 }
 
-void pack(const Action::Actions& data,
-          std::vector<char>& buffer, int& position,
-          Dune::MPIHelper::MPICommunicator comm)
-{
-    pack(data.getActions(), buffer, position, comm);
-}
-
 void pack(const WellPolymerProperties& data,
           std::vector<char>& buffer, int& position,
           Dune::MPIHelper::MPICommunicator comm)
@@ -2192,14 +2178,6 @@ void unpack(Deck& data, std::vector<char>& buffer, int& position,
                 activeUnitSystem.get(), dataFile, inputPath, accessCount);
 }
 
-void unpack(Action::Actions& data, std::vector<char>& buffer, int& position,
-            Dune::MPIHelper::MPICommunicator comm)
-{
-    std::vector<Action::ActionX> actions;
-    unpack(actions, buffer, position, comm);
-    data = Action::Actions(actions);
-}
-
 void unpack(WellPolymerProperties& data,
             std::vector<char>& buffer, int& position,
             Dune::MPIHelper::MPICommunicator comm)
@@ -2310,7 +2288,6 @@ INSTANTIATE_PACK(std::unordered_set<std::string>)
 INSTANTIATE_PACK(std::pair<bool,double>)
 INSTANTIATE_PACK(std::pair<bool,std::size_t>)
 INSTANTIATE_PACK(DynamicState<int>)
-INSTANTIATE_PACK(DynamicState<std::shared_ptr<Action::Actions>>)
 INSTANTIATE_PACK(DynamicState<Well::ProducerCMode>)
 INSTANTIATE_PACK(DynamicVector<Deck>)
 
diff --git a/opm/simulators/utils/ParallelRestart.hpp b/opm/simulators/utils/ParallelRestart.hpp
index 24f6cc957..045b38db3 100644
--- a/opm/simulators/utils/ParallelRestart.hpp
+++ b/opm/simulators/utils/ParallelRestart.hpp
@@ -43,9 +43,6 @@
 namespace Opm
 {
 
-namespace Action {
-    class Actions;
-}
 class Connection;
 class Dimension;
 template<class T> class IOrderSet;
@@ -382,7 +379,6 @@ void unpack(char* str, std::size_t length, std::vector<char>& buffer, int& posit
   void unpack(T& data, std::vector<char>& buffer, int& position, \
               Dune::MPIHelper::MPICommunicator comm);
 
-ADD_PACK_PROTOTYPES(Action::Actions)
 ADD_PACK_PROTOTYPES(Connection)
 ADD_PACK_PROTOTYPES(data::CellData)
 ADD_PACK_PROTOTYPES(data::Connection)
diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp
index 740a82943..825ddff87 100644
--- a/tests/test_ParallelRestart.cpp
+++ b/tests/test_ParallelRestart.cpp
@@ -2050,7 +2050,7 @@ BOOST_AUTO_TEST_CASE(Actions)
 {
 #ifdef HAVE_MPI
     Opm::Action::Actions val1({getActionX()});
-    auto val2 = PackUnpack(val1);
+    auto val2 = PackUnpack2(val1);
     DO_CHECKS(Action::Actions)
 #endif
 }