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 StandardCond

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-03-03 12:15:48 +01:00
parent 89cb162c1f
commit bb1f27bce6
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,6 +85,7 @@
#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/SkprwatTable.hpp>
#include <opm/parser/eclipse/EclipseState/Tables/StandardCond.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/TableManager.hpp> #include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
@ -463,6 +464,7 @@ HANDLE_AS_POD(Regdims)
HANDLE_AS_POD(RockConfig::RockComp) HANDLE_AS_POD(RockConfig::RockComp)
HANDLE_AS_POD(ROCKRecord) HANDLE_AS_POD(ROCKRecord)
HANDLE_AS_POD(SatFuncControls) HANDLE_AS_POD(SatFuncControls)
HANDLE_AS_POD(StandardCond)
HANDLE_AS_POD(Tabdims) HANDLE_AS_POD(Tabdims)
HANDLE_AS_POD(TimeStampUTC::YMD) HANDLE_AS_POD(TimeStampUTC::YMD)
HANDLE_AS_POD(Tuning) HANDLE_AS_POD(Tuning)
@ -871,6 +873,7 @@ std::size_t packSize(const TableManager& data, Dune::MPIHelper::MPICommunicator
packSize(data.OilDenT(), comm) + packSize(data.OilDenT(), comm) +
packSize(data.GasDenT(), comm) + packSize(data.GasDenT(), comm) +
packSize(data.WatDenT(), comm) + packSize(data.WatDenT(), comm) +
packSize(data.stCond(), comm) +
packSize(data.gas_comp_index(), comm) + packSize(data.gas_comp_index(), comm) +
packSize(data.rtemp(), comm); packSize(data.rtemp(), comm);
} }
@ -2733,6 +2736,7 @@ void pack(const TableManager& data, std::vector<char>& buffer, int& position,
pack(data.OilDenT(), buffer, position, comm); pack(data.OilDenT(), buffer, position, comm);
pack(data.GasDenT(), buffer, position, comm); pack(data.GasDenT(), buffer, position, comm);
pack(data.WatDenT(), buffer, position, comm); pack(data.WatDenT(), buffer, position, comm);
pack(data.stCond(), buffer, position, comm);
pack(data.gas_comp_index(), buffer, position, comm); pack(data.gas_comp_index(), buffer, position, comm);
pack(data.rtemp(), buffer, position, comm); pack(data.rtemp(), buffer, position, comm);
} }
@ -4875,6 +4879,7 @@ void unpack(TableManager& data, std::vector<char>& buffer, int& position,
bool hasEntpvd; bool hasEntpvd;
bool hasEqlnum; bool hasEqlnum;
DenT oilDenT, gasDenT, watDenT; DenT oilDenT, gasDenT, watDenT;
StandardCond stcond;
std::size_t gas_comp_index; std::size_t gas_comp_index;
std::shared_ptr<JFunc> jfunc; std::shared_ptr<JFunc> jfunc;
double rtemp; double rtemp;
@ -4911,6 +4916,7 @@ void unpack(TableManager& data, std::vector<char>& buffer, int& position,
unpack(oilDenT, buffer, position, comm); unpack(oilDenT, buffer, position, comm);
unpack(gasDenT, buffer, position, comm); unpack(gasDenT, buffer, position, comm);
unpack(watDenT, buffer, position, comm); unpack(watDenT, buffer, position, comm);
unpack(stcond, buffer, position, comm);
unpack(gas_comp_index, buffer, position, comm); unpack(gas_comp_index, buffer, position, comm);
unpack(rtemp, buffer, position, comm); unpack(rtemp, buffer, position, comm);
@ -4920,7 +4926,7 @@ void unpack(TableManager& data, std::vector<char>& buffer, int& position,
bdensityTables, sdensityTables, plymwinjTables, bdensityTables, sdensityTables, plymwinjTables,
skprwatTables, skprpolyTables, tabdims, regdims, eqldims, skprwatTables, skprpolyTables, tabdims, regdims, eqldims,
aqudims, hasImptvd, hasEntpvd, hasEqlnum, jfunc, oilDenT, gasDenT, aqudims, hasImptvd, hasEntpvd, hasEqlnum, jfunc, oilDenT, gasDenT,
watDenT, gas_comp_index, rtemp); watDenT, stcond, gas_comp_index, rtemp);
} }
template<class Scalar> template<class Scalar>

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

@ -144,6 +144,7 @@ class SkprpolyTable;
class SkprwatTable; class SkprwatTable;
class SolventDensityTable; class SolventDensityTable;
class SpiralICD; class SpiralICD;
class StandardCond;
class SummaryConfig; class SummaryConfig;
class SummaryNode; class SummaryNode;
class Tabdims; class Tabdims;

1
tests/test_ParallelRestart.cpp
View File

@ -1221,6 +1221,7 @@ BOOST_AUTO_TEST_CASE(TableManager)
getDenT(), getDenT(),
getDenT(), getDenT(),
getDenT(), getDenT(),
{7.0, 8.0},
77, 77,
1.0); 1.0);
auto val2 = PackUnpack(val1); auto val2 = PackUnpack(val1);