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

Merge pull request #3091 from akva2/fix_uninitialized_access

Browse Source 
fixed: avoid use of uninitialized SummaryNode::number_
This commit is contained in:
Bård Skaflestad 2022-09-30 19:33:36 +02:00 committed by GitHub
commit cea1dea368
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2626,7 +2626,11 @@ namespace Evaluator {
explicit FunctionRelation(Opm::EclIO::SummaryNode node, ofun fcn) explicit FunctionRelation(Opm::EclIO::SummaryNode node, ofun fcn)
: node_(std::move(node)) : node_(std::move(node))
, fcn_ (std::move(fcn)) , fcn_ (std::move(fcn))
{} {
if (this->use_number()) {
this->number_ = this->node_.number;
}
}
void update(const std::size_t sim_step, void update(const std::size_t sim_step,
const double stepSize, const double stepSize,
@ -2651,7 +2655,7 @@ namespace Evaluator {
const fn_args args { const fn_args args {
wells, this->group_name(), this->node_.keyword, stepSize, static_cast<int>(sim_step), wells, this->group_name(), this->node_.keyword, stepSize, static_cast<int>(sim_step),
std::max(0, this->node_.number), std::max(0, this->number_),
this->node_.fip_region, this->node_.fip_region,
st, simRes.wellSol, simRes.grpNwrkSol, st, simRes.wellSol, simRes.grpNwrkSol,
input.reg, input.grid, input.sched, input.reg, input.grid, input.sched,
@ -2668,6 +2672,7 @@ namespace Evaluator {
private: private:
Opm::EclIO::SummaryNode node_; Opm::EclIO::SummaryNode node_;
ofun fcn_; ofun fcn_;
int number_{0};
std::string group_name() const std::string group_name() const
{ {
@ -2681,6 +2686,17 @@ namespace Evaluator {
? this->node_.wgname : std::string{""}; ? this->node_.wgname : std::string{""};
} }
bool use_number() const
{
using Cat = ::Opm::EclIO::SummaryNode::Category;
const auto cat = this->node_.category;
return ! ((cat == Cat::Well) ||
(cat == Cat::Group) ||
(cat == Cat::Field) ||
(cat == Cat::Node) ||
(cat == Cat::Miscellaneous));
}
}; };
class BlockValue : public Base class BlockValue : public Base