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

fixed: PLYSHLOG and ROCKTAB needs to be serialized as their actual types

Browse Source 
if not we lose the extra info that is not part of the SimpleTable base
classes.
This commit is contained in:
Arne Morten Kvarving 2020-03-06 09:57:24 +01:00
parent ab0b5dcec6
commit 49ace214ec
1 changed files with 78 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -851,9 +851,57 @@ std::size_t packSize(const RockTable& data, Dune::MPIHelper::MPICommunicator com
return packSize(static_cast<const std::vector<ROCKRecord>&>(data), comm);
}
namespace {
struct SplitSimpleTables {
size_t plyshMax = 0;
size_t rockMax = 0;
std::map<size_t, std::shared_ptr<PlyshlogTable>> plyshMap;
std::map<size_t, std::shared_ptr<RocktabTable>> rockMap;
};
SplitSimpleTables
splitSimpleTable(std::map<std::string, TableContainer>& simpleTables)
{
SplitSimpleTables result;
// PlyshlogTable need special treatment
auto it = simpleTables.find("PLYSHLOG");
if (it != simpleTables.end()) {
result.plyshMax = it->second.max();
for (const auto& mapIt : it->second.tables()) {
auto ptr = std::static_pointer_cast<PlyshlogTable>(mapIt.second);
result.plyshMap.insert(std::make_pair(mapIt.first, ptr));
}
simpleTables.erase(it);
}
// RocktabTable need special treatment
it = simpleTables.find("ROCKMAP");
if (it != simpleTables.end()) {
result.rockMax = it->second.max();
for (const auto& mapIt : it->second.tables()) {
auto ptr = std::static_pointer_cast<RocktabTable>(mapIt.second);
result.rockMap.insert(std::make_pair(mapIt.first, ptr));
}
simpleTables.erase(it);
}
return result;
}
}
std::size_t packSize(const TableManager& data, Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.getSimpleTables(), comm) +
auto simpleTables = data.getSimpleTables();
auto splitTab = splitSimpleTable(simpleTables);
return packSize(simpleTables, comm) +
packSize(splitTab.plyshMax, comm) +
packSize(splitTab.plyshMap, comm) +
packSize(splitTab.rockMax, comm) +
packSize(splitTab.rockMap, comm) +
packSize(data.getPvtgTables(), comm) +
packSize(data.getPvtoTables(), comm) +
packSize(data.getRock2dTables(), comm) +
@ -2528,7 +2576,14 @@ void pack(const RockTable& data, std::vector<char>& buffer, int& position,
void pack(const TableManager& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.getSimpleTables(), buffer, position, comm);
auto simpleTables = data.getSimpleTables();
auto splitTab = splitSimpleTable(simpleTables);
pack(simpleTables, buffer, position, comm);
pack(splitTab.plyshMax, buffer, position, comm);
pack(splitTab.plyshMap, buffer, position, comm);
pack(splitTab.rockMax, buffer, position, comm);
pack(splitTab.rockMap, buffer, position, comm);
pack(data.getPvtgTables(), buffer, position, comm);
pack(data.getPvtoTables(), buffer, position, comm);
pack(data.getRock2dTables(), buffer, position, comm);
@ -4500,6 +4555,7 @@ void unpack(TableManager& data, std::vector<char>& buffer, int& position,
Dune::MPIHelper::MPICommunicator comm)
{
std::map<std::string, TableContainer> simpleTables;
SplitSimpleTables split;
std::vector<PvtgTable> pvtgTables;
std::vector<PvtoTable> pvtoTables;
std::vector<Rock2dTable> rock2dTables;
@ -4534,7 +4590,12 @@ void unpack(TableManager& data, std::vector<char>& buffer, int& position,
std::size_t gas_comp_index;
std::shared_ptr<JFunc> jfunc;
double rtemp;
unpack(simpleTables, buffer, position, comm);
unpack(split.plyshMax, buffer, position, comm);
unpack(split.plyshMap, buffer, position, comm);
unpack(split.rockMax, buffer, position, comm);
unpack(split.rockMap, buffer, position, comm);
unpack(pvtgTables, buffer, position, comm);
unpack(pvtoTables, buffer, position, comm);
unpack(rock2dTables, buffer, position, comm);
@ -4577,6 +4638,21 @@ void unpack(TableManager& data, std::vector<char>& buffer, int& position,
unpack(gas_comp_index, buffer, position, comm);
unpack(rtemp, buffer, position, comm);
if (split.plyshMax > 0) {
TableContainer container(split.plyshMax);
for (const auto& it : split.plyshMap) {
container.addTable(it.first, it.second);
}
simpleTables.insert(std::make_pair("PLYSHLOG", container));
}
if (split.rockMax > 0) {
TableContainer container(split.rockMax);
for (const auto& it : split.rockMap) {
container.addTable(it.first, it.second);
}
simpleTables.insert(std::make_pair("ROCKTAB", container));
}
data = TableManager(simpleTables, pvtgTables, pvtoTables, rock2dTables,
rock2dtrTables, pvtwTable, pvcdoTable, densityTable,
plyvmhTable, rockTable, plmixparTable, shrateTable, stone1exTable,