OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-07 15:03:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed: cannot simply deserialize the udq function table

Browse Source 
rather we simply create it based on the params as elsewhere.
This commit is contained in:
Arne Morten Kvarving 2020-01-13 11:58:24 +01:00
parent 6bf2f8e285
commit 72b33edf81
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1547,7 +1547,6 @@ std::size_t packSize(const UDQConfig& data,
Dune::MPIHelper::MPICommunicator comm)
{
return packSize(data.params(), comm) +
packSize(data.function_table(), comm) +
packSize(data.definitionMap(), comm) +
packSize(data.assignmentMap(), comm) +
packSize(data.unitsMap(), comm) +
@ -3267,7 +3266,6 @@ void pack(const UDQConfig& data,
Dune::MPIHelper::MPICommunicator comm)
{
pack(data.params(), buffer, position, comm);
pack(data.function_table(), buffer, position, comm);
pack(data.definitionMap(), buffer, position, comm);
pack(data.assignmentMap(), buffer, position, comm);
pack(data.unitsMap(), buffer, position, comm);
@ -5600,7 +5598,7 @@ void unpack(UDQConfig& data,
std::map<UDQVarType,std::size_t> typeCount;
unpack(params, buffer, position, comm);
unpack(function_table, buffer, position, comm);
function_table = UDQFunctionTable(params);
unpack(definitionsMap, buffer, position, comm);
unpack(assignmentsMap, buffer, position, comm);
unpack(units, buffer, position, comm);

3
tests/test_ParallelRestart.cpp
View File

@ -327,7 +327,6 @@ Opm::VFPProdTable getVFPProdTable()
Opm::UDQConfig getUDQConfig()
{
Opm::UDQParams params(true, 1, 2.0, 3.0, 4.0);
Opm::UDQFunctionTable::FunctionMap map{{"test", std::make_shared<Opm::UDQFunction>()}};
std::shared_ptr<Opm::UDQASTNode> n0;
Opm::UDQASTNode n1(Opm::UDQVarType::NONE,
Opm::UDQTokenType::error,
@ -343,7 +342,7 @@ Opm::UDQConfig getUDQConfig()
omap.insert({"test9", Opm::UDQIndex(3, 4, Opm::UDQAction::ASSIGN,
Opm::UDQVarType::WELL_VAR)});
return Opm::UDQConfig(params,
Opm::UDQFunctionTable(params, map),
Opm::UDQFunctionTable(params),
{{"test1", def}, {"test2", def}},
{{"test3", ass}, {"test4", ass}},
{{"test5", "test6"}, {"test7", "test8"}},