diff --git a/opm/simulators/utils/ParallelRestart.cpp b/opm/simulators/utils/ParallelRestart.cpp index 4dee0f096..3ccbe8b69 100644 --- a/opm/simulators/utils/ParallelRestart.cpp +++ b/opm/simulators/utils/ParallelRestart.cpp @@ -23,6 +23,7 @@ #include "ParallelRestart.hpp" #include +#include #include #include #include @@ -1170,12 +1171,6 @@ std::size_t packSize(const Action::Actions& data, return packSize(data.getActions(), comm); } -std::size_t packSize(const BrineDensityTable& data, - Dune::MPIHelper::MPICommunicator comm) -{ - return packSize(data.getBrineDensityColumn(), comm); -} - std::size_t packSize(const PvtwsaltTable& data, Dune::MPIHelper::MPICommunicator comm) { @@ -2379,13 +2374,6 @@ void pack(const Action::Actions& data, pack(data.getActions(), buffer, position, comm); } -void pack(const BrineDensityTable& data, - std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - pack(data.getBrineDensityColumn(), buffer, position, comm); -} - void pack(const PvtwsaltTable& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) @@ -4051,15 +4039,6 @@ void unpack(Action::Actions& data, std::vector& buffer, int& position, data = Action::Actions(actions); } -void unpack(BrineDensityTable& data, std::vector& buffer, int& position, - Dune::MPIHelper::MPICommunicator comm) -{ - std::vector tableValues; - - unpack(tableValues, buffer, position, comm); - data = BrineDensityTable(tableValues); -} - void unpack(PvtwsaltTable& data, std::vector& buffer, int& position, Dune::MPIHelper::MPICommunicator comm) { diff --git a/opm/simulators/utils/ParallelRestart.hpp b/opm/simulators/utils/ParallelRestart.hpp index a8e887369..82c4144c4 100644 --- a/opm/simulators/utils/ParallelRestart.hpp +++ b/opm/simulators/utils/ParallelRestart.hpp @@ -59,7 +59,6 @@ namespace Action { } class Aqudims; -class BrineDensityTable; class ColumnSchema; class Connection; class DeckItem; @@ -462,7 +461,6 @@ ADD_PACK_PROTOTYPES(Action::ASTNode) ADD_PACK_PROTOTYPES(Action::Condition) ADD_PACK_PROTOTYPES(Action::Quantity) ADD_PACK_PROTOTYPES(Aqudims) -ADD_PACK_PROTOTYPES(BrineDensityTable) ADD_PACK_PROTOTYPES(ColumnSchema) ADD_PACK_PROTOTYPES(Connection) ADD_PACK_PROTOTYPES(data::CellData) diff --git a/tests/test_ParallelRestart.cpp b/tests/test_ParallelRestart.cpp index e3e88ee91..3056ccad1 100644 --- a/tests/test_ParallelRestart.cpp +++ b/tests/test_ParallelRestart.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -2170,7 +2171,7 @@ BOOST_AUTO_TEST_CASE(BrineDensityTable) { #ifdef HAVE_MPI Opm::BrineDensityTable val1({1.0, 2.0, 3.0}); - auto val2 = PackUnpack(val1); + auto val2 = PackUnpack2(val1); DO_CHECKS(BrineDensityTable) #endif }