From 46c21442751cc8ec2e996ab232c9b0d46aeb6fde Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Tue, 17 Mar 2020 10:07:46 +0100
Subject: [PATCH] remove old serialization support for PvtwTable

---
 opm/simulators/utils/ParallelRestart.cpp | 20 --------------------
 opm/simulators/utils/ParallelRestart.hpp |  4 ----
 tests/test_ParallelRestart.cpp           |  4 ++--
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp
index f9a0b1168..83d136b57 100644
--- a/opm/simulators/utils/ParallelRestart.cpp
+++ b/opm/simulators/utils/ParallelRestart.cpp
@@ -308,7 +308,6 @@ HANDLE_AS_POD(data::Segment)
 HANDLE_AS_POD(MLimits)
 HANDLE_AS_POD(PlmixparRecord)
 HANDLE_AS_POD(PlyvmhRecord)
-HANDLE_AS_POD(PVTWRecord)
 HANDLE_AS_POD(PVCDORecord)
 HANDLE_AS_POD(Regdims)
 HANDLE_AS_POD(ROCKRecord)
@@ -451,11 +450,6 @@ std::size_t packSize(const PvtoTable& data, Dune::MPIHelper::MPICommunicator com
     return packSize(static_cast<const PvtxTable&>(data), comm);
 }
 
-std::size_t packSize(const PvtwTable& data, Dune::MPIHelper::MPICommunicator comm)
-{
-    return packSize(static_cast<const std::vector<PVTWRecord>&>(data), comm);
-}
-
 std::size_t packSize(const PvcdoTable& data, Dune::MPIHelper::MPICommunicator comm)
 {
     return packSize(static_cast<const std::vector<PVCDORecord>&>(data), comm);
@@ -1628,12 +1622,6 @@ void pack(const PvtoTable& data, std::vector<char>& buffer, int& position,
     pack(static_cast<const PvtxTable&>(data), buffer, position, comm);
 }
 
-void pack(const PvtwTable& data, std::vector<char>& buffer, int& position,
-          Dune::MPIHelper::MPICommunicator comm)
-{
-    pack(static_cast<const std::vector<PVTWRecord>&>(data), buffer, position, comm);
-}
-
 void pack(const PvcdoTable& data, std::vector<char>& buffer, int& position,
           Dune::MPIHelper::MPICommunicator comm)
 {
@@ -2881,14 +2869,6 @@ void unpack(PvtoTable& data, std::vector<char>& buffer, int& position,
     unpack_pvt(data, buffer, position, comm);
 }
 
-void unpack(PvtwTable& data, std::vector<char>& buffer, int& position,
-            Dune::MPIHelper::MPICommunicator comm)
-{
-    std::vector<PVTWRecord> pdata;
-    unpack(pdata, buffer, position, comm);
-    data = PvtwTable(pdata);
-}
-
 void unpack(PvcdoTable& 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 ce54d9639..67bb67024 100644
--- a/opm/simulators/utils/ParallelRestart.hpp
+++ b/opm/simulators/utils/ParallelRestart.hpp
@@ -80,9 +80,7 @@ class PlmixparRecord;
 class PlmixparTable;
 class PvtgTable;
 class PvtoTable;
-class PVTWRecord;
 class PvtwsaltTable;
-class PvtwTable;
 class Regdims;
 class RestartConfig;
 class RestartSchedule;
@@ -498,9 +496,7 @@ ADD_PACK_PROTOTYPES(PVCDORecord)
 ADD_PACK_PROTOTYPES(PvcdoTable)
 ADD_PACK_PROTOTYPES(PvtgTable)
 ADD_PACK_PROTOTYPES(PvtoTable)
-ADD_PACK_PROTOTYPES(PVTWRecord)
 ADD_PACK_PROTOTYPES(PvtwsaltTable)
-ADD_PACK_PROTOTYPES(PvtwTable)
 ADD_PACK_PROTOTYPES(Regdims)
 ADD_PACK_PROTOTYPES(RestartConfig)
 ADD_PACK_PROTOTYPES(RestartKey)
diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp
index aadb46540..4ed7ec729 100644
--- a/tests/test_ParallelRestart.cpp
+++ b/tests/test_ParallelRestart.cpp
@@ -1042,7 +1042,7 @@ BOOST_AUTO_TEST_CASE(PVTWRecord)
 {
 #if HAVE_MPI
     Opm::PVTWRecord val1{1.0, 2.0, 3.0, 4.0, 5.0};
-    auto val2 = PackUnpack(val1);
+    auto val2 = PackUnpack2(val1);
     DO_CHECKS(PVTWRecord)
 #endif
 }
@@ -1052,7 +1052,7 @@ BOOST_AUTO_TEST_CASE(PvtwTable)
 {
 #if HAVE_MPI
     Opm::PvtwTable val1({Opm::PVTWRecord{1.0, 2.0, 3.0, 4.0, 5.0}});
-    auto val2 = PackUnpack(val1);
+    auto val2 = PackUnpack2(val1);
     DO_CHECKS(PvtwTable)
 #endif
 }