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

add mpi serialization for Action::Quantity

Browse Source
This commit is contained in:
Arne Morten Kvarving
2019-12-17 15:53:31 +01:00
parent 2a16051d84
commit a0c2d5b0f6
3 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@
#include <opm/parser/eclipse/EclipseState/Edit/EDITNNC.hpp> #include <opm/parser/eclipse/EclipseState/Edit/EDITNNC.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/ASTNode.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Action/ASTNode.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Action/Condition.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Events.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Events.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Group/GuideRateConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/MessageLimits.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/MessageLimits.hpp>
@@ -1583,6 +1584,13 @@ std::size_t packSize(const Action::AST& data,
return packSize(data.getCondition(), comm); return packSize(data.getCondition(), comm);
} }
std::size_t packSize(const Action::Quantity& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.quantity, comm) +
packSize(data.args, comm);
}
////// pack routines ////// pack routines
template<class T> template<class T>
@@ -3193,6 +3201,14 @@ void pack(const Action::AST& data,
pack(data.getCondition(), buffer, position, comm); pack(data.getCondition(), buffer, position, comm);
} }
void pack(const Action::Quantity& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.quantity, buffer, position, comm);
pack(data.args, buffer, position, comm);
}
/// unpack routines /// unpack routines
template<class T> template<class T>
@@ -5486,6 +5502,13 @@ void unpack(Action::AST& data, std::vector<char>& buffer, int& position,
data = Action::AST(condition); data = Action::AST(condition);
} }
void unpack(Action::Quantity& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
unpack(data.quantity, buffer, position, comm);
unpack(data.args, buffer, position, comm);
}
#define INSTANTIATE_PACK_VECTOR(T) \ #define INSTANTIATE_PACK_VECTOR(T) \
template std::size_t packSize(const std::vector<T>& data, \ template std::size_t packSize(const std::vector<T>& data, \
Dune::MPIHelper::MPICommunicator comm); \ Dune::MPIHelper::MPICommunicator comm); \

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

@@ -67,6 +67,7 @@ class Actdims;
namespace Action { namespace Action {
class AST; class AST;
class ASTNode; class ASTNode;
class Quantity;
} }
class Aqudims; class Aqudims;
@@ -606,6 +607,7 @@ void unpack(char* str, std::size_t length, std::vector<char>& buffer, int& posit
ADD_PACK_PROTOTYPES(Actdims) ADD_PACK_PROTOTYPES(Actdims)
ADD_PACK_PROTOTYPES(Action::AST) ADD_PACK_PROTOTYPES(Action::AST)
ADD_PACK_PROTOTYPES(Action::ASTNode) ADD_PACK_PROTOTYPES(Action::ASTNode)
ADD_PACK_PROTOTYPES(Action::Quantity)
ADD_PACK_PROTOTYPES(Aqudims) ADD_PACK_PROTOTYPES(Aqudims)
ADD_PACK_PROTOTYPES(ColumnSchema) ADD_PACK_PROTOTYPES(ColumnSchema)
ADD_PACK_PROTOTYPES(Connection) ADD_PACK_PROTOTYPES(Connection)

14
tests/test_ParallelRestart.cpp
View File

@@ -40,6 +40,7 @@
#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/ASTNode.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Action/ASTNode.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Action/Condition.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Events.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Events.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Group/GConSale.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Group/GConSale.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Group/Group.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Group/Group.hpp>
@@ -2151,6 +2152,19 @@ BOOST_AUTO_TEST_CASE(AST)
} }
BOOST_AUTO_TEST_CASE(Quantity)
{
#ifdef HAVE_MPI
Opm::Action::Quantity val1;
val1.quantity = "test1";
val1.args = {"test2", "test3"};
auto val2 = PackUnpack(val1);
BOOST_CHECK(std::get<1>(val2) == std::get<2>(val2));
BOOST_CHECK(val1 == std::get<0>(val2));
#endif
}
bool init_unit_test_func() bool init_unit_test_func()
{ {