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 Rock2dtrTable

Browse Source
This commit is contained in:
Arne Morten Kvarving
2019-11-28 15:46:13 +01:00
parent 5a1f1a6b36
commit e08a5c3046
3 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@
#include <opm/parser/eclipse/EclipseState/Edit/EDITNNC.hpp> #include <opm/parser/eclipse/EclipseState/Edit/EDITNNC.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp> #include <opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Rock2dTable.hpp> #include <opm/parser/eclipse/EclipseState/Tables/Rock2dTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Rock2dtrTable.hpp>
#include <dune/common/parallel/mpitraits.hh> #include <dune/common/parallel/mpitraits.hh>
namespace Opm namespace Opm
@@ -233,6 +234,12 @@ std::size_t packSize(const Rock2dTable& data, Dune::MPIHelper::MPICommunicator c
packSize(data.pressureValues(), comm); packSize(data.pressureValues(), comm);
} }
std::size_t packSize(const Rock2dtrTable& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.transMultValues(), comm) +
packSize(data.pressureValues(), comm);
}
////// pack routines ////// pack routines
template<class T> template<class T>
@@ -472,6 +479,13 @@ void pack(const Rock2dTable& data, std::vector<char>& buffer, int& position,
pack(data.pressureValues(), buffer, position, comm); pack(data.pressureValues(), buffer, position, comm);
} }
void pack(const Rock2dtrTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.transMultValues(), buffer, position, comm);
pack(data.pressureValues(), buffer, position, comm);
}
/// unpack routines /// unpack routines
template<class T> template<class T>
@@ -730,6 +744,16 @@ void unpack(Rock2dTable& data, std::vector<char>& buffer, int& position,
data = Rock2dTable(pvmultValues, pressureValues); data = Rock2dTable(pvmultValues, pressureValues);
} }
void unpack(Rock2dtrTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::vector<std::vector<double>> transMultValues;
std::vector<double> pressureValues;
unpack(transMultValues, buffer, position, comm);
unpack(pressureValues, buffer, position, comm);
data = Rock2dtrTable(transMultValues, pressureValues);
}
} // end namespace Mpi } // end namespace Mpi
RestartValue loadParallelRestart(const EclipseIO* eclIO, SummaryState& summaryState, RestartValue loadParallelRestart(const EclipseIO* eclIO, SummaryState& summaryState,
const std::vector<Opm::RestartKey>& solutionKeys, const std::vector<Opm::RestartKey>& solutionKeys,

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

@@ -40,6 +40,7 @@ class EDITNNC;
class NNC; class NNC;
struct NNCdata; struct NNCdata;
class Rock2dTable; class Rock2dTable;
class Rock2dtrTable;
class ThresholdPressure; class ThresholdPressure;
namespace Mpi namespace Mpi
@@ -196,6 +197,7 @@ ADD_PACK_PROTOTYPES(NNCdata)
ADD_PACK_PROTOTYPES(RestartKey) ADD_PACK_PROTOTYPES(RestartKey)
ADD_PACK_PROTOTYPES(RestartValue) ADD_PACK_PROTOTYPES(RestartValue)
ADD_PACK_PROTOTYPES(Rock2dTable) ADD_PACK_PROTOTYPES(Rock2dTable)
ADD_PACK_PROTOTYPES(Rock2dtrTable)
ADD_PACK_PROTOTYPES(std::string) ADD_PACK_PROTOTYPES(std::string)
ADD_PACK_PROTOTYPES(ThresholdPressure) ADD_PACK_PROTOTYPES(ThresholdPressure)

12
tests/test_ParallelRestart.cpp
View File

@@ -29,6 +29,7 @@
#include <opm/parser/eclipse/EclipseState/Grid/NNC.hpp> #include <opm/parser/eclipse/EclipseState/Grid/NNC.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp> #include <opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Rock2dTable.hpp> #include <opm/parser/eclipse/EclipseState/Tables/Rock2dTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Rock2dtrTable.hpp>
#include <opm/output/eclipse/RestartValue.hpp> #include <opm/output/eclipse/RestartValue.hpp>
@@ -285,6 +286,17 @@ BOOST_AUTO_TEST_CASE(Rock2dTable)
} }
BOOST_AUTO_TEST_CASE(Rock2dtrTable)
{
#if HAVE_MPI
Opm::Rock2dtrTable val1({{1.0,2.0},{3.0,4.0}}, {1.0, 2.0, 3.0});
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;