From 8a0959b026ac01d1265de1bcad292b9fb2e6e517 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 WellPolymerProperties

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

diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp
index db254388b..d406030e6 100644
--- a/opm/simulators/utils/ParallelRestart.cpp
+++ b/opm/simulators/utils/ParallelRestart.cpp
@@ -34,7 +34,6 @@
 #include <opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.hpp>
-#include <opm/parser/eclipse/EclipseState/Schedule/Well/WellPolymerProperties.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Well/WellTracerProperties.hpp>
 #include <opm/parser/eclipse/EclipseState/Util/IOrderSet.hpp>
 #include <dune/common/parallel/mpitraits.hh>
@@ -622,16 +621,6 @@ std::size_t packSize(const Group& data,
            packSize(data.productionProperties(), comm);
 }
 
-std::size_t packSize(const WellPolymerProperties& data,
-                     Dune::MPIHelper::MPICommunicator comm)
-{
-    return packSize(data.m_polymerConcentration, comm) +
-           packSize(data.m_saltConcentration, comm) +
-           packSize(data.m_plymwinjtable, comm) +
-           packSize(data.m_skprwattable, comm) +
-           packSize(data.m_skprpolytable, comm);
-}
-
 ////// pack routines
 
 template<class T>
@@ -1213,17 +1202,6 @@ void pack(const Group& data,
     pack(data.productionProperties(), buffer, position, comm);
 }
 
-void pack(const WellPolymerProperties& data,
-          std::vector<char>& buffer, int& position,
-          Dune::MPIHelper::MPICommunicator comm)
-{
-    pack(data.m_polymerConcentration, buffer, position, comm);
-    pack(data.m_saltConcentration, buffer, position, comm);
-    pack(data.m_plymwinjtable, buffer, position, comm);
-    pack(data.m_skprwattable, buffer, position, comm);
-    pack(data.m_skprpolytable, buffer, position, comm);
-}
-
 /// unpack routines
 
 template<class T>
@@ -2017,17 +1995,6 @@ void unpack(Group& data,
                  injection, production);
 }
 
-void unpack(WellPolymerProperties& data,
-            std::vector<char>& buffer, int& position,
-            Dune::MPIHelper::MPICommunicator comm)
-{
-    unpack(data.m_polymerConcentration, buffer, position, comm);
-    unpack(data.m_saltConcentration, buffer, position, comm);
-    unpack(data.m_plymwinjtable, buffer, position, comm);
-    unpack(data.m_skprwattable, buffer, position, comm);
-    unpack(data.m_skprpolytable, buffer, position, comm);
-}
-
 #define INSTANTIATE_PACK_VECTOR(...) \
 template std::size_t packSize(const std::vector<__VA_ARGS__>& data, \
                               Dune::MPIHelper::MPICommunicator comm); \
diff --git a/opm/simulators/utils/ParallelRestart.hpp b/opm/simulators/utils/ParallelRestart.hpp
index 4c6d3923e..9dc520025 100644
--- a/opm/simulators/utils/ParallelRestart.hpp
+++ b/opm/simulators/utils/ParallelRestart.hpp
@@ -53,7 +53,6 @@ class Valve;
 class VFPInjTable;
 class VFPProdTable;
 class WellConnections;
-class WellPolymerProperties;
 class WellSegments;
 class WellTracerProperties;
 
@@ -394,7 +393,6 @@ ADD_PACK_PROTOTYPES(Well::WellInjectionProperties)
 ADD_PACK_PROTOTYPES(Well::WellProductionProperties)
 ADD_PACK_PROTOTYPES(WellBrineProperties)
 ADD_PACK_PROTOTYPES(WellConnections)
-ADD_PACK_PROTOTYPES(WellPolymerProperties)
 ADD_PACK_PROTOTYPES(WellSegments)
 ADD_PACK_PROTOTYPES(WellTracerProperties)
 
diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp
index b510e4980..ecdeca72a 100644
--- a/tests/test_ParallelRestart.cpp
+++ b/tests/test_ParallelRestart.cpp
@@ -1363,7 +1363,7 @@ BOOST_AUTO_TEST_CASE(WellPolymerProperties)
 {
 #ifdef HAVE_MPI
     Opm::WellPolymerProperties val1{1.0, 2.0, 3, 4, 5};
-    auto val2 = PackUnpack(val1);
+    auto val2 = PackUnpack2(val1);
     DO_CHECKS(WellPolymerProperties)
 #endif
 }