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 Action::AST

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-17 15:40:52 +01:00
parent 2c1d45ea54
commit 5c89c48554
3 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,6 @@
#include "ParallelRestart.hpp"
#include <opm/parser/eclipse/EclipseState/Grid/FaceDir.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/Condition.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/MSW/icd.hpp>
@ -664,12 +663,6 @@ std::size_t packSize(const Deck& data,
packSize(data.unitSystemAccessCount(), comm);
}
std::size_t packSize(const Action::AST& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.getCondition(), comm);
}
std::size_t packSize(const Action::Quantity& data,
Dune::MPIHelper::MPICommunicator comm)
{
@ -1333,13 +1326,6 @@ void pack(const Deck& data,
pack(data.unitSystemAccessCount(), buffer, position, comm);
}
void pack(const Action::AST& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.getCondition(), buffer, position, comm);
}
void pack(const Action::Quantity& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
@ -2243,14 +2229,6 @@ void unpack(Deck& data, std::vector<char>& buffer, int& position,
activeUnitSystem.get(), dataFile, inputPath, accessCount);
}
void unpack(Action::AST& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::shared_ptr<Action::ASTNode> condition;
unpack(condition, buffer, position, comm);
data = Action::AST(condition);
}
void unpack(Action::Quantity& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{

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

@ -45,7 +45,6 @@ namespace Opm
namespace Action {
class Actions;
class AST;
class Condition;
class Quantity;
}
@ -387,7 +386,6 @@ void unpack(char* str, std::size_t length, std::vector<char>& buffer, int& posit
Dune::MPIHelper::MPICommunicator comm);
ADD_PACK_PROTOTYPES(Action::Actions)
ADD_PACK_PROTOTYPES(Action::AST)
ADD_PACK_PROTOTYPES(Action::Condition)
ADD_PACK_PROTOTYPES(Action::Quantity)
ADD_PACK_PROTOTYPES(Connection)

2
tests/test_ParallelRestart.cpp
View File

@ -2008,7 +2008,7 @@ BOOST_AUTO_TEST_CASE(AST)
node.reset(new Opm::Action::ASTNode(number, FuncType::field,
"test1", {"test2"}, 1.0, {}));
Opm::Action::AST val1(node);
auto val2 = PackUnpack(val1);
auto val2 = PackUnpack2(val1);
DO_CHECKS(Action::AST)
#endif
}