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 RestartSchedule

Browse Source
This commit is contained in:
Arne Morten Kvarving
2019-11-29 15:47:45 +01:00
parent 57dbcb5b5e
commit 7aa73eadd2
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@
#include <opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp> #include <opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.hpp> #include <opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp> #include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
#include <opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Edit/EDITNNC.hpp> #include <opm/parser/eclipse/EclipseState/Edit/EDITNNC.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp> #include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp> #include <opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp>
@@ -196,6 +197,7 @@ HANDLE_AS_POD(data::Rates)
HANDLE_AS_POD(data::Segment) HANDLE_AS_POD(data::Segment)
HANDLE_AS_POD(EquilRecord) HANDLE_AS_POD(EquilRecord)
HANDLE_AS_POD(FoamData) HANDLE_AS_POD(FoamData)
HANDLE_AS_POD(RestartSchedule)
std::size_t packSize(const data::Well& data, Dune::MPIHelper::MPICommunicator comm) std::size_t packSize(const data::Well& data, Dune::MPIHelper::MPICommunicator comm)
{ {

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

@@ -46,6 +46,7 @@ class FoamData;
class InitConfig; class InitConfig;
class NNC; class NNC;
struct NNCdata; struct NNCdata;
class RestartSchedule;
class Rock2dTable; class Rock2dTable;
class Rock2dtrTable; class Rock2dtrTable;
class SimulationConfig; class SimulationConfig;
@@ -235,6 +236,7 @@ ADD_PACK_PROTOTYPES(InitConfig)
ADD_PACK_PROTOTYPES(NNC) ADD_PACK_PROTOTYPES(NNC)
ADD_PACK_PROTOTYPES(NNCdata) ADD_PACK_PROTOTYPES(NNCdata)
ADD_PACK_PROTOTYPES(RestartKey) ADD_PACK_PROTOTYPES(RestartKey)
ADD_PACK_PROTOTYPES(RestartSchedule)
ADD_PACK_PROTOTYPES(RestartValue) ADD_PACK_PROTOTYPES(RestartValue)
ADD_PACK_PROTOTYPES(Rock2dTable) ADD_PACK_PROTOTYPES(Rock2dTable)
ADD_PACK_PROTOTYPES(Rock2dtrTable) ADD_PACK_PROTOTYPES(Rock2dtrTable)

12
tests/test_ParallelRestart.cpp
View File

@@ -30,6 +30,7 @@
#include <opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp> #include <opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.hpp> #include <opm/parser/eclipse/EclipseState/InitConfig/FoamConfig.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp> #include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
#include <opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp> #include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp> #include <opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/ColumnSchema.hpp> #include <opm/parser/eclipse/EclipseState/Tables/ColumnSchema.hpp>
@@ -478,6 +479,17 @@ BOOST_AUTO_TEST_CASE(SimulationConfig)
} }
BOOST_AUTO_TEST_CASE(RestartSchedule)
{
#if HAVE_MPI
Opm::RestartSchedule val1(1, 2, 3);
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;