remove old mpi serialization support for Runspec

opm/simulators/utils/ParallelRestart.cpp

@@ -23,7 +23,6 @@
 
 #include "ParallelRestart.hpp"
 #include <opm/common/OpmLog/Location.hpp>
-#include <opm/parser/eclipse/EclipseState/Runspec.hpp>
 #include <opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Action/ActionAST.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Action/Actions.hpp>
@@ -556,19 +555,6 @@ std::size_t packSize(const UDQParams& data, Dune::MPIHelper::MPICommunicator com
            packSize(data.cmpEpsilon(), comm);
 }
 
-std::size_t packSize(const Runspec& data, Dune::MPIHelper::MPICommunicator comm)
-{
-    return packSize(data.phases(), comm) +
-           packSize(data.tabdims(), comm) +
-           packSize(data.endpointScaling(), comm) +
-           packSize(data.wellDimensions(), comm) +
-           packSize(data.wellSegmentDimensions(), comm) +
-           packSize(data.udqParams(), comm) +
-           packSize(data.hysterPar(), comm) +
-           packSize(data.actdims(), comm) +
-           packSize(data.saturationFunctionControls(), comm);
-}
-
 std::size_t packSize(const PvtxTable& data, Dune::MPIHelper::MPICommunicator comm)
 {
     return packSize(data.getOuterColumnSchema(), comm) +
@@ -1931,20 +1917,6 @@ void pack(const UDQParams& data, std::vector<char>& buffer, int& position,
     pack(data.cmpEpsilon(), buffer, position, comm);
 }
 
-void pack(const Runspec& data, std::vector<char>& buffer, int& position,
-          Dune::MPIHelper::MPICommunicator comm)
-{
-    pack(data.phases(), buffer, position, comm);
-    pack(data.tabdims(), buffer, position, comm);
-    pack(data.endpointScaling(), buffer, position, comm);
-    pack(data.wellDimensions(), buffer, position, comm);
-    pack(data.wellSegmentDimensions(), buffer, position, comm);
-    pack(data.udqParams(), buffer, position, comm);
-    pack(data.hysterPar(), buffer, position, comm);
-    pack(data.actdims(), buffer, position, comm);
-    pack(data.saturationFunctionControls(), buffer, position, comm);
-}
-
 void pack(const PvtxTable& data, std::vector<char>& buffer, int& position,
           Dune::MPIHelper::MPICommunicator comm)
 {
@@ -3455,32 +3427,6 @@ void unpack(UDQParams& data, std::vector<char>& buffer, int& position,
     data = UDQParams(reseed, rand_seed, range, undefVal, cmp_eps);
 }
 
-void unpack(Runspec& data, std::vector<char>& buffer, int& position,
-            Dune::MPIHelper::MPICommunicator comm)
-{
-    Phases phases;
-    Tabdims tabdims;
-    EndpointScaling endScale;
-    Welldims wellDims;
-    WellSegmentDims wsegDims;
-    UDQParams udqparams;
-    EclHysterConfig hystPar;
-    Actdims actdims;
-    SatFuncControls sfuncctrl;
-
-    unpack(phases, buffer, position, comm);
-    unpack(tabdims, buffer, position, comm);
-    unpack(endScale, buffer, position, comm);
-    unpack(wellDims, buffer, position, comm);
-    unpack(wsegDims, buffer, position, comm);
-    unpack(udqparams, buffer, position, comm);
-    unpack(hystPar, buffer, position, comm);
-    unpack(actdims, buffer, position, comm);
-    unpack(sfuncctrl, buffer, position, comm);
-    data = Runspec(phases, tabdims, endScale, wellDims, wsegDims,
-                   udqparams, hystPar, actdims, sfuncctrl);
-}
-
 template<class PVTType>
 void unpack_pvt(PVTType& data, std::vector<char>& buffer, int& position,
             Dune::MPIHelper::MPICommunicator comm)

opm/simulators/utils/ParallelRestart.hpp

@@ -104,7 +104,6 @@ class RockTable;
 class RocktabTable;
 class Rock2dTable;
 class Rock2dtrTable;
-class Runspec;
 class Segment;
 class ShrateRecord;
 class ShrateTable;
@@ -544,7 +543,6 @@ ADD_PACK_PROTOTYPES(RockTable)
 ADD_PACK_PROTOTYPES(Rock2dTable)
 ADD_PACK_PROTOTYPES(Rock2dtrTable)
 ADD_PACK_PROTOTYPES(RocktabTable)
-ADD_PACK_PROTOTYPES(Runspec)
 ADD_PACK_PROTOTYPES(Segment)
 ADD_PACK_PROTOTYPES(ShrateRecord)
 ADD_PACK_PROTOTYPES(ShrateTable)

tests/test_ParallelRestart.cpp

@@ -1000,7 +1000,7 @@ BOOST_AUTO_TEST_CASE(Runspec)
                       Opm::Actdims(1,2,3,4),
                       Opm::SatFuncControls(5.0e-7, Opm::SatFuncControls::ThreePhaseOilKrModel::Stone2));
 
-    auto val2 = PackUnpack(val1);
+    auto val2 = PackUnpack2(val1);
     DO_CHECKS(Runspec)
 #endif
 }