From e46cd524e48842e9969c5423ce33234ab2ff7930 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 WatdentTable

---
 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 0996eff3c..8738b3fec 100644
--- a/opm/simulators/utils/ParallelRestart.cpp
+++ b/opm/simulators/utils/ParallelRestart.cpp
@@ -312,7 +312,6 @@ HANDLE_AS_POD(StandardCond)
 HANDLE_AS_POD(Tabdims)
 HANDLE_AS_POD(TimeStampUTC::YMD)
 HANDLE_AS_POD(Tuning)
-HANDLE_AS_POD(WATDENTRecord)
 HANDLE_AS_POD(WellBrineProperties)
 HANDLE_AS_POD(WellFoamProperties)
 
@@ -443,11 +442,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 WatdentTable& data, Dune::MPIHelper::MPICommunicator comm)
-{
-    return packSize(static_cast<const std::vector<WATDENTRecord>&>(data), comm);
-}
-
 std::size_t packSize(const PolyInjTable& data, Dune::MPIHelper::MPICommunicator comm)
 {
     return packSize(data.getThroughputs(), comm) +
@@ -1580,12 +1574,6 @@ void pack(const PvtoTable& data, std::vector<char>& buffer, int& position,
     pack(static_cast<const PvtxTable&>(data), buffer, position, comm);
 }
 
-void pack(const WatdentTable& data, std::vector<char>& buffer, int& position,
-          Dune::MPIHelper::MPICommunicator comm)
-{
-    pack(static_cast<const std::vector<WATDENTRecord>&>(data), buffer, position, comm);
-}
-
 void pack(const PolyInjTable& data, std::vector<char>& buffer, int& position,
           Dune::MPIHelper::MPICommunicator comm)
 {
@@ -2785,14 +2773,6 @@ void unpack(PvtoTable& data, std::vector<char>& buffer, int& position,
     unpack_pvt(data, buffer, position, comm);
 }
 
-void unpack(WatdentTable& data, std::vector<char>& buffer, int& position,
-            Dune::MPIHelper::MPICommunicator comm)
-{
-    std::vector<WATDENTRecord> pdata;
-    unpack(pdata, buffer, position, comm);
-    data = WatdentTable(pdata);
-}
-
 void unpack(PolyInjTable& 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 35ec25bc2..fa4d04714 100644
--- a/opm/simulators/utils/ParallelRestart.hpp
+++ b/opm/simulators/utils/ParallelRestart.hpp
@@ -103,8 +103,6 @@ class UnitSystem;
 class Valve;
 class VFPInjTable;
 class VFPProdTable;
-class WATDENTRecord;
-class WatdentTable;
 class WellConnections;
 class WellEconProductionLimits;
 class WellFoamProperties;
@@ -508,8 +506,6 @@ ADD_PACK_PROTOTYPES(UnitSystem)
 ADD_PACK_PROTOTYPES(Valve)
 ADD_PACK_PROTOTYPES(VFPInjTable)
 ADD_PACK_PROTOTYPES(VFPProdTable)
-ADD_PACK_PROTOTYPES(WATDENTRecord)
-ADD_PACK_PROTOTYPES(WatdentTable)
 ADD_PACK_PROTOTYPES(Well)
 ADD_PACK_PROTOTYPES(WellType)
 ADD_PACK_PROTOTYPES(Well::WellGuideRate)
diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp
index 0274ce1e3..4d90791d3 100644
--- a/tests/test_ParallelRestart.cpp
+++ b/tests/test_ParallelRestart.cpp
@@ -1122,7 +1122,7 @@ BOOST_AUTO_TEST_CASE(WATDENTRecord)
 {
 #if HAVE_MPI
     Opm::WATDENTRecord val1{1.0, 2.0, 3.0};
-    auto val2 = PackUnpack(val1);
+    auto val2 = PackUnpack2(val1);
     DO_CHECKS(WATDENTRecord)
 #endif
 }
@@ -1132,7 +1132,7 @@ BOOST_AUTO_TEST_CASE(WatdentTable)
 {
 #if HAVE_MPI
     Opm::WatdentTable val1({Opm::WATDENTRecord{1.0, 2.0, 3.0}});
-    auto val2 = PackUnpack(val1);
+    auto val2 = PackUnpack2(val1);
     DO_CHECKS(WatdentTable)
 #endif
 }