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 UDQFunction

Browse Source
This commit is contained in:
Arne Morten Kvarving
2019-12-11 14:31:39 +01:00
parent b2d454eaf2
commit abe09ae93d
3 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,7 @@
#include <opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunction.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp>
@@ -1277,6 +1278,13 @@ std::size_t packSize(const WListManager& data,
return packSize(data.lists(), comm); return packSize(data.lists(), comm);
} }
std::size_t packSize(const UDQFunction& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.name(), comm) +
packSize(data.type(), comm);
}
////// pack routines ////// pack routines
template<class T> template<class T>
@@ -2570,6 +2578,14 @@ void pack(const WListManager& data,
pack(data.lists(), buffer, position, comm); pack(data.lists(), buffer, position, comm);
} }
void pack(const UDQFunction& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.name(), buffer, position, comm);
pack(data.type(), buffer, position, comm);
}
/// unpack routines /// unpack routines
template<class T> template<class T>
@@ -4394,6 +4410,17 @@ void unpack(WListManager& data,
data = WListManager(lists); data = WListManager(lists);
} }
void unpack(UDQFunction& data,
std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::string name;
UDQTokenType type;
unpack(name, buffer, position, comm);
unpack(type, buffer, position, comm);
data = UDQFunction(name, type);
}
#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

@@ -112,6 +112,7 @@ class TableManager;
class TableSchema; class TableSchema;
class ThresholdPressure; class ThresholdPressure;
class UDAValue; class UDAValue;
class UDQFunction;
class UDQParams; class UDQParams;
class UnitSystem; class UnitSystem;
class Valve; class Valve;
@@ -627,6 +628,7 @@ ADD_PACK_PROTOTYPES(ThresholdPressure)
ADD_PACK_PROTOTYPES(TimeMap) ADD_PACK_PROTOTYPES(TimeMap)
ADD_PACK_PROTOTYPES(TimeMap::StepData) ADD_PACK_PROTOTYPES(TimeMap::StepData)
ADD_PACK_PROTOTYPES(UDAValue) ADD_PACK_PROTOTYPES(UDAValue)
ADD_PACK_PROTOTYPES(UDQFunction)
ADD_PACK_PROTOTYPES(UDQParams) ADD_PACK_PROTOTYPES(UDQParams)
ADD_PACK_PROTOTYPES(UnitSystem) ADD_PACK_PROTOTYPES(UnitSystem)
ADD_PACK_PROTOTYPES(Valve) ADD_PACK_PROTOTYPES(Valve)

12
tests/test_ParallelRestart.cpp
View File

@@ -43,6 +43,7 @@
#include <opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/MSW/Valve.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQFunction.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/VFPInjTable.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp>
@@ -1664,6 +1665,17 @@ BOOST_AUTO_TEST_CASE(WListManager)
} }
BOOST_AUTO_TEST_CASE(UDQFunction)
{
#ifdef HAVE_MPI
Opm::UDQFunction val1("test", Opm::UDQTokenType::binary_op_add);
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()
{ {
return true; return true;