From c8b14dcbb1fdfc127a1f0a7064e13b08730732fb 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 IOrderSet

---
 opm/simulators/utils/ParallelRestart.cpp | 31 +++---------------------
 opm/simulators/utils/ParallelRestart.hpp | 12 ---------
 2 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp
index a14496db8..4b1f6f227 100644
--- a/opm/simulators/utils/ParallelRestart.cpp
+++ b/opm/simulators/utils/ParallelRestart.cpp
@@ -29,7 +29,6 @@
 #include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunctionTable.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp>
-#include <opm/parser/eclipse/EclipseState/Util/IOrderSet.hpp>
 #include <dune/common/parallel/mpitraits.hh>
 
 #define HANDLE_AS_POD(T) \
@@ -376,14 +375,6 @@ std::size_t packSize(const UnitSystem& data,
            packSize(data.use_count(), comm);
 }
 
-template<class T>
-std::size_t packSize(const IOrderSet<T>& data,
-                     Dune::MPIHelper::MPICommunicator comm)
-{
-    return packSize(data.index(), comm) +
-           packSize(data.data(), comm);
-}
-
 std::size_t packSize(const Group::GroupInjectionProperties& data,
                      Dune::MPIHelper::MPICommunicator comm)
 {
@@ -765,14 +756,6 @@ void pack(const UnitSystem& data,
     pack(data.use_count(), buffer, position, comm);
 }
 
-template<class T>
-void pack(const IOrderSet<T>& data, std::vector<char>& buffer, int& position,
-          Dune::MPIHelper::MPICommunicator comm)
-{
-    pack(data.index(), buffer, position, comm);
-    pack(data.data(), buffer, position, comm);
-}
-
 void pack(const Group::GroupInjectionProperties& data,
           std::vector<char>& buffer, int& position,
           Dune::MPIHelper::MPICommunicator comm)
@@ -1216,17 +1199,6 @@ void unpack(UnitSystem& data,
     data = UnitSystem(name, type, dimensions, use_count);
 }
 
-template<class T>
-void unpack(IOrderSet<T>& data, std::vector<char>& buffer, int& position,
-            Dune::MPIHelper::MPICommunicator comm)
-{
-    typename IOrderSet<T>::index_type index;
-    typename IOrderSet<T>::storage_type storage;
-    unpack(index, buffer, position, comm);
-    unpack(storage, buffer, position, comm);
-    data = IOrderSet<T>(index, storage);
-}
-
 template void unpack(std::map<Phase,Group::GroupInjectionProperties>& data,
             std::vector<char>& buffer, int& position,
             Dune::MPIHelper::MPICommunicator comm);
@@ -1379,6 +1351,7 @@ INSTANTIATE_PACK(bool)
 INSTANTIATE_PACK(int)
 INSTANTIATE_PACK(std::array<short,3>)
 INSTANTIATE_PACK(std::array<bool,3>)
+INSTANTIATE_PACK(std::array<int,3>)
 INSTANTIATE_PACK(unsigned char)
 INSTANTIATE_PACK(std::map<std::pair<int,int>,std::pair<bool,double>>)
 INSTANTIATE_PACK(std::map<FaceDir::DirEnum,std::string>)
@@ -1386,6 +1359,8 @@ INSTANTIATE_PACK(std::map<FaceDir::DirEnum,std::vector<double>>)
 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<std::string,int>)
+INSTANTIATE_PACK(std::map<std::string,double>)
+INSTANTIATE_PACK(std::map<int,int>)
 INSTANTIATE_PACK(std::map<UDQVarType,std::size_t>)
 INSTANTIATE_PACK(std::unordered_map<std::string,size_t>)
 INSTANTIATE_PACK(std::unordered_map<std::string,std::string>)
diff --git a/opm/simulators/utils/ParallelRestart.hpp b/opm/simulators/utils/ParallelRestart.hpp
index 654b95184..6c8c81331 100644
--- a/opm/simulators/utils/ParallelRestart.hpp
+++ b/opm/simulators/utils/ParallelRestart.hpp
@@ -42,7 +42,6 @@ namespace Opm
 {
 
 class Dimension;
-template<class T> class IOrderSet;
 class UDAValue;
 class UnitSystem;
 class VFPInjTable;
@@ -135,9 +134,6 @@ std::size_t packSize(const OrderedMap<Key,Value>& data, Dune::MPIHelper::MPIComm
 template<class T>
 std::size_t packSize(const DynamicState<T>& data, Dune::MPIHelper::MPICommunicator comm);
 
-template<class T>
-std::size_t packSize(const IOrderSet<T>& data, Dune::MPIHelper::MPICommunicator comm);
-
 ////// pack routines
 
 template<class T>
@@ -235,10 +231,6 @@ template<class T>
 void pack(const DynamicState<T>& data, std::vector<char>& buffer,
           int& position, Dune::MPIHelper::MPICommunicator comm);
 
-template<class T>
-void pack(const IOrderSet<T>& data, std::vector<char>& buffer,
-          int& position, Dune::MPIHelper::MPICommunicator comm);
-
 void pack(const char* str, std::vector<char>& buffer, int& position,
           Dune::MPIHelper::MPICommunicator comm);
 
@@ -340,10 +332,6 @@ template<class T>
 void unpack(DynamicState<T>& data, std::vector<char>& buffer, int& position,
             Dune::MPIHelper::MPICommunicator comm);
 
-template<class T>
-void unpack(IOrderSet<T>& data, std::vector<char>& buffer,
-            int& position, Dune::MPIHelper::MPICommunicator comm);
-
 void unpack(char* str, std::size_t length, std::vector<char>& buffer, int& position,
             Dune::MPIHelper::MPICommunicator comm);