From 6fde65439d668ea733b0d77ea20973c3c8b9558e Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Fri, 13 Mar 2020 12:45:51 +0100
Subject: [PATCH] remove old serialization support for Phases

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

diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp
index c424f6533..baec70509 100644
--- a/opm/simulators/utils/ParallelRestart.cpp
+++ b/opm/simulators/utils/ParallelRestart.cpp
@@ -551,11 +551,6 @@ std::size_t packSize(const RestartConfig& data, Dune::MPIHelper::MPICommunicator
            packSize(data.saveKeywords(), comm);
 }
 
-std::size_t packSize(const Phases& data, Dune::MPIHelper::MPICommunicator comm)
-{
-    return packSize(data.getBits(), comm);
-}
-
 std::size_t packSize(const EndpointScaling& data, Dune::MPIHelper::MPICommunicator comm)
 {
     return packSize(data.getBits(), comm);
@@ -1943,12 +1938,6 @@ void pack(const RestartConfig& data, std::vector<char>& buffer, int& position,
     pack(data.saveKeywords(), buffer, position, comm);
 }
 
-void pack(const Phases& data, std::vector<char>& buffer, int& position,
-          Dune::MPIHelper::MPICommunicator comm)
-{
-    pack(data.getBits(), buffer, position, comm);
-}
-
 void pack(const EndpointScaling& data, std::vector<char>& buffer, int& position,
           Dune::MPIHelper::MPICommunicator comm)
 {
@@ -3483,14 +3472,6 @@ void unpack(RestartConfig& data, std::vector<char>& buffer, int& position,
                          restart_keyw, save_keyw);
 }
 
-void unpack(Phases& data, std::vector<char>& buffer, int& position,
-            Dune::MPIHelper::MPICommunicator comm)
-{
-    unsigned long bits;
-    unpack(bits, buffer, position, comm);
-    data = Phases(std::bitset<NUM_PHASES_IN_ENUM>(bits));
-}
-
 void unpack(EndpointScaling& 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 55ac34756..72e361eb1 100644
--- a/opm/simulators/utils/ParallelRestart.hpp
+++ b/opm/simulators/utils/ParallelRestart.hpp
@@ -85,7 +85,6 @@ class Location;
 class MessageLimits;
 class MLimits;
 class OilVaporizationProperties;
-class Phases;
 class PlymwinjTable;
 class PlyshlogTable;
 class PlyvmhRecord;
@@ -529,7 +528,6 @@ ADD_PACK_PROTOTYPES(Location)
 ADD_PACK_PROTOTYPES(MessageLimits)
 ADD_PACK_PROTOTYPES(MLimits)
 ADD_PACK_PROTOTYPES(OilVaporizationProperties)
-ADD_PACK_PROTOTYPES(Phases)
 ADD_PACK_PROTOTYPES(PlmixparRecord)
 ADD_PACK_PROTOTYPES(PlmixparTable)
 ADD_PACK_PROTOTYPES(PlymwinjTable)
diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp
index 7fa76ed78..bf05f13b2 100644
--- a/tests/test_ParallelRestart.cpp
+++ b/tests/test_ParallelRestart.cpp
@@ -911,7 +911,7 @@ BOOST_AUTO_TEST_CASE(Phases)
 {
 #if HAVE_MPI
     Opm::Phases val1(true, true, true, false, true, false, true, false);
-    auto val2 = PackUnpack(val1);
+    auto val2 = PackUnpack2(val1);
     DO_CHECKS(Phases)
 #endif
 }