OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2056 from joakim-hove/udq-extra-ficup

Browse Source 
Store extra summary parameters from UDQ and restart in common map
This commit is contained in:
Joakim Hove 2020-10-27 14:16:02 +01:00 committed by GitHub
commit 524e211247
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/opm/output/eclipse/Summary.cpp
View File

@ -2521,9 +2521,8 @@ private:
int prevReportStepID_{-1}; int prevReportStepID_{-1};
std::vector<MiniStep>::size_type numUnwritten_{0}; std::vector<MiniStep>::size_type numUnwritten_{0};
SummaryOutputParameters outputParameters_{}; SummaryOutputParameters outputParameters_{};
std::vector<EvalPtr> requiredRestartParameters_{}; std::unordered_map<std::string, EvalPtr> extra_parameters{};
std::vector<EvalPtr> udq_parameters;
std::vector<std::string> valueKeys_{}; std::vector<std::string> valueKeys_{};
std::vector<MiniStep> unwritten_{}; std::vector<MiniStep> unwritten_{};
@ -2613,12 +2612,9 @@ eval(const EclipseState& es,
evalPtr->update(sim_step, duration, input, simRes, st); evalPtr->update(sim_step, duration, input, simRes, st);
} }
for (auto& evalPtr : this->requiredRestartParameters_) { for (auto& [_, evalPtr] : this->extra_parameters) {
evalPtr->update(sim_step, duration, input, simRes, st); evalPtr->update(sim_step, duration, input, simRes, st);
} }
for (auto& eval_ptr : this->udq_parameters)
eval_ptr->update(sim_step, duration, input, simRes, st);
} }
void Opm::out::Summary::SummaryImplementation::write() void Opm::out::Summary::SummaryImplementation::write()
@ -2855,13 +2851,13 @@ void Opm::out::Summary::SummaryImplementation::configureUDQ(const SummaryConfig&
auto fun_pos = funs.find(node.keyword); auto fun_pos = funs.find(node.keyword);
if (fun_pos != funs.end()) if (fun_pos != funs.end())
this->udq_parameters.push_back( std::make_unique<Evaluator::FunctionRelation>(node, fun_pos->second) ); this->extra_parameters.emplace( node.unique_key(), std::make_unique<Evaluator::FunctionRelation>(node, fun_pos->second) );
else { else {
auto unit = single_values_units.find(node.keyword); auto unit = single_values_units.find(node.keyword);
if (unit == single_values_units.end()) if (unit == single_values_units.end())
throw std::logic_error(fmt::format("Evaluation function for: {} not found ", node.keyword)); throw std::logic_error(fmt::format("Evaluation function for: {} not found ", node.keyword));
this->udq_parameters.push_back( std::make_unique<Evaluator::GlobalProcessValue>(node, unit->second)); this->extra_parameters.emplace( node.unique_key(), std::make_unique<Evaluator::GlobalProcessValue>(node, unit->second));
} }
} }
} }
@ -2884,7 +2880,7 @@ configureRequiredRestartParameters(const SummaryConfig& sumcfg,
auto eval = std::make_unique< auto eval = std::make_unique<
Evaluator::FunctionRelation>(node, fcnPos->second); Evaluator::FunctionRelation>(node, fcnPos->second);
this->requiredRestartParameters_.push_back(std::move(eval)); this->extra_parameters.emplace(node.unique_key(), std::move(eval));
}; };
for (const auto& node : requiredRestartVectors(sched)) for (const auto& node : requiredRestartVectors(sched))