OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove old serialization support for BrineDensityTable

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-17 10:07:46 +01:00
parent c9f810e18e
commit dc21682b3e
3 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
opm/simulators/utils/ParallelRestart.cpp
View File

@ -23,6 +23,7 @@
#include "ParallelRestart.hpp" #include "ParallelRestart.hpp"
#include <opm/common/OpmLog/Location.hpp> #include <opm/common/OpmLog/Location.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/FaceDir.hpp>
#include <opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.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/ActionAST.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Action/Actions.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Action/Actions.hpp>
@ -1170,12 +1171,6 @@ std::size_t packSize(const Action::Actions& data,
return packSize(data.getActions(), comm); 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, std::size_t packSize(const PvtwsaltTable& data,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {
@ -2379,13 +2374,6 @@ void pack(const Action::Actions& data,
pack(data.getActions(), buffer, position, comm); pack(data.getActions(), buffer, position, comm);
} }
void pack(const BrineDensityTable& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.getBrineDensityColumn(), buffer, position, comm);
}
void pack(const PvtwsaltTable& data, void pack(const PvtwsaltTable& data,
std::vector<char>& buffer, int& position, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
@ -4051,15 +4039,6 @@ void unpack(Action::Actions& data, std::vector<char>& buffer, int& position,
data = Action::Actions(actions); data = Action::Actions(actions);
} }
void unpack(BrineDensityTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::vector<double> tableValues;
unpack(tableValues, buffer, position, comm);
data = BrineDensityTable(tableValues);
}
void unpack(PvtwsaltTable& data, std::vector<char>& buffer, int& position, void unpack(PvtwsaltTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm) Dune::MPIHelper::MPICommunicator comm)
{ {

2
opm/simulators/utils/ParallelRestart.hpp
View File

@ -59,7 +59,6 @@ namespace Action {
} }
class Aqudims; class Aqudims;
class BrineDensityTable;
class ColumnSchema; class ColumnSchema;
class Connection; class Connection;
class DeckItem; class DeckItem;
@ -462,7 +461,6 @@ ADD_PACK_PROTOTYPES(Action::ASTNode)
ADD_PACK_PROTOTYPES(Action::Condition) ADD_PACK_PROTOTYPES(Action::Condition)
ADD_PACK_PROTOTYPES(Action::Quantity) ADD_PACK_PROTOTYPES(Action::Quantity)
ADD_PACK_PROTOTYPES(Aqudims) ADD_PACK_PROTOTYPES(Aqudims)
ADD_PACK_PROTOTYPES(BrineDensityTable)
ADD_PACK_PROTOTYPES(ColumnSchema) ADD_PACK_PROTOTYPES(ColumnSchema)
ADD_PACK_PROTOTYPES(Connection) ADD_PACK_PROTOTYPES(Connection)
ADD_PACK_PROTOTYPES(data::CellData) ADD_PACK_PROTOTYPES(data::CellData)

3
tests/test_ParallelRestart.cpp
View File

@ -29,6 +29,7 @@
#include <opm/parser/eclipse/Deck/DeckItem.hpp> #include <opm/parser/eclipse/Deck/DeckItem.hpp>
#include <opm/parser/eclipse/EclipseState/Aquancon.hpp> #include <opm/parser/eclipse/EclipseState/Aquancon.hpp>
#include <opm/parser/eclipse/EclipseState/AquiferCT.hpp> #include <opm/parser/eclipse/EclipseState/AquiferCT.hpp>
#include <opm/parser/eclipse/EclipseState/AquiferConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Aquifetp.hpp> #include <opm/parser/eclipse/EclipseState/Aquifetp.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseConfig.hpp> #include <opm/parser/eclipse/EclipseState/EclipseConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Runspec.hpp> #include <opm/parser/eclipse/EclipseState/Runspec.hpp>
@ -2170,7 +2171,7 @@ BOOST_AUTO_TEST_CASE(BrineDensityTable)
{ {
#ifdef HAVE_MPI #ifdef HAVE_MPI
Opm::BrineDensityTable val1({1.0, 2.0, 3.0}); Opm::BrineDensityTable val1({1.0, 2.0, 3.0});
auto val2 = PackUnpack(val1); auto val2 = PackUnpack2(val1);
DO_CHECKS(BrineDensityTable) DO_CHECKS(BrineDensityTable)
#endif #endif
} }