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 EquilRecord

Browse Source
This commit is contained in:
Arne Morten Kvarving
2019-11-29 13:01:43 +01:00
parent f837a5f7eb
commit 21eab1aa6d
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@
#include "ParallelRestart.hpp"
#include <opm/parser/eclipse/EclipseState/Grid/NNC.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp>
#include <opm/parser/eclipse/EclipseState/Edit/EDITNNC.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/ColumnSchema.hpp>
@@ -190,6 +191,7 @@ std::size_t packSize(const std::unordered_map<T1,T2,H,P,A>& data, Dune::MPIHelpe
HANDLE_AS_POD(data::Connection)
HANDLE_AS_POD(data::Rates)
HANDLE_AS_POD(data::Segment)
HANDLE_AS_POD(EquilRecord)
std::size_t packSize(const data::Well& data, Dune::MPIHelper::MPICommunicator comm)
{

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

@@ -39,6 +39,7 @@ namespace Opm
class ColumnSchema;
class EDITNNC;
class EquilRecord;
class NNC;
struct NNCdata;
class Rock2dTable;
@@ -221,6 +222,7 @@ ADD_PACK_PROTOTYPES(data::Solution)
ADD_PACK_PROTOTYPES(data::Well)
ADD_PACK_PROTOTYPES(data::WellRates)
ADD_PACK_PROTOTYPES(EDITNNC)
ADD_PACK_PROTOTYPES(EquilRecord)
ADD_PACK_PROTOTYPES(NNC)
ADD_PACK_PROTOTYPES(NNCdata)
ADD_PACK_PROTOTYPES(RestartKey)

18
tests/test_ParallelRestart.cpp
View File

@@ -27,6 +27,7 @@
#include <opm/simulators/utils/ParallelRestart.hpp>
#include <opm/parser/eclipse/EclipseState/Edit/EDITNNC.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/NNC.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/ColumnSchema.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Rock2dTable.hpp>
@@ -149,6 +150,12 @@ Opm::SimpleTable getSimpleTable()
}
Opm::EquilRecord getEquilRecord()
{
return Opm::EquilRecord(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, true, false, 1);
}
}
@@ -393,6 +400,17 @@ BOOST_AUTO_TEST_CASE(TableContainer)
}
BOOST_AUTO_TEST_CASE(EquilRecord)
{
#if HAVE_MPI
Opm::EquilRecord val1 = getEquilRecord();
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()
{
return true;