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 SkprwatTable

Browse Source
This commit is contained in:
Arne Morten Kvarving
2019-12-02 23:34:31 +01:00
parent 81602af103
commit fab1b9eaf1
3 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,6 +44,7 @@
#include <opm/parser/eclipse/EclipseState/Tables/Rock2dtrTable.hpp> #include <opm/parser/eclipse/EclipseState/Tables/Rock2dtrTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp> #include <opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SkprpolyTable.hpp> #include <opm/parser/eclipse/EclipseState/Tables/SkprpolyTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SkprwatTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp> #include <opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp> #include <opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableSchema.hpp> #include <opm/parser/eclipse/EclipseState/Tables/TableSchema.hpp>
@@ -499,6 +500,11 @@ std::size_t packSize(const SkprpolyTable& data, Dune::MPIHelper::MPICommunicator
packSize(data.referenceConcentration(), comm); packSize(data.referenceConcentration(), comm);
} }
std::size_t packSize(const SkprwatTable& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(static_cast<const PolyInjTable&>(data), comm);
}
////// pack routines ////// pack routines
template<class T> template<class T>
@@ -984,6 +990,12 @@ void pack(const SkprpolyTable& data, std::vector<char>& buffer, int& position,
pack(data.referenceConcentration(), buffer, position, comm); pack(data.referenceConcentration(), buffer, position, comm);
} }
void pack(const SkprwatTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(static_cast<const PolyInjTable&>(data), buffer, position, comm);
}
/// unpack routines /// unpack routines
template<class T> template<class T>
@@ -1596,6 +1608,12 @@ void unpack(SkprpolyTable& data, std::vector<char>& buffer, int& position,
data.setReferenceConcentration(refConcentration); data.setReferenceConcentration(refConcentration);
} }
void unpack(SkprwatTable& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
unpack(static_cast<PolyInjTable&>(data), buffer, position, comm);
}
} // 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

@@ -72,6 +72,7 @@ class Runspec;
class SimulationConfig; class SimulationConfig;
class SimpleTable; class SimpleTable;
class SkprpolyTable; class SkprpolyTable;
class SkprwatTable;
class Tabdims; class Tabdims;
class TableColumn; class TableColumn;
class TableContainer; class TableContainer;
@@ -302,6 +303,7 @@ ADD_PACK_PROTOTYPES(std::string)
ADD_PACK_PROTOTYPES(SimulationConfig) ADD_PACK_PROTOTYPES(SimulationConfig)
ADD_PACK_PROTOTYPES(SimpleTable) ADD_PACK_PROTOTYPES(SimpleTable)
ADD_PACK_PROTOTYPES(SkprpolyTable) ADD_PACK_PROTOTYPES(SkprpolyTable)
ADD_PACK_PROTOTYPES(SkprwatTable)
ADD_PACK_PROTOTYPES(Tabdims) ADD_PACK_PROTOTYPES(Tabdims)
ADD_PACK_PROTOTYPES(TableColumn) ADD_PACK_PROTOTYPES(TableColumn)
ADD_PACK_PROTOTYPES(TableContainer) ADD_PACK_PROTOTYPES(TableContainer)

12
tests/test_ParallelRestart.cpp
View File

@@ -46,6 +46,7 @@
#include <opm/parser/eclipse/EclipseState/Tables/Rock2dtrTable.hpp> #include <opm/parser/eclipse/EclipseState/Tables/Rock2dtrTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp> #include <opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SkprpolyTable.hpp> #include <opm/parser/eclipse/EclipseState/Tables/SkprpolyTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/SkprwatTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/Tabdims.hpp> #include <opm/parser/eclipse/EclipseState/Tables/Tabdims.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp> #include <opm/parser/eclipse/EclipseState/Tables/TableColumn.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp> #include <opm/parser/eclipse/EclipseState/Tables/TableContainer.hpp>
@@ -851,6 +852,17 @@ BOOST_AUTO_TEST_CASE(SkprpolyTable)
} }
BOOST_AUTO_TEST_CASE(SkprwatTable)
{
#if HAVE_MPI
Opm::SkprwatTable val1({1.0}, {2.0}, 1, {{1.0}, {2.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;