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

Merge pull request #838 from joakim-hove/udq-ast-something

Browse Source 
UDQASTNode: check if well/group exists before assigning
This commit is contained in:
Joakim Hove 2019-06-21 18:04:16 +02:00 committed by GitHub
commit 036951444c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQASTNode.cpp
View File

@ -112,15 +112,19 @@ UDQSet UDQASTNode::eval(UDQVarType target_type, const UDQContext& context) const
else {
auto res = UDQSet::wells(this->string_value, wells);
for (const auto& well : wells) {
if (fnmatch(well_pattern.c_str(), well.c_str(), fnmatch_flags) == 0)
res.assign(well, context.get_well_var(well, this->string_value));
if (fnmatch(well_pattern.c_str(), well.c_str(), fnmatch_flags) == 0) {
if (context.has_well_var(well, this->string_value))
res.assign(well, context.get_well_var(well, this->string_value));
}
}
return res;
}
} else {
auto res = UDQSet::wells(this->string_value, wells);
for (const auto& well : wells)
res.assign(well, context.get_well_var(well, this->string_value));
for (const auto& well : wells) {
if (context.has_well_var(well, this->string_value))
res.assign(well, context.get_well_var(well, this->string_value));
}
return res;
}
}
@ -136,15 +140,19 @@ UDQSet UDQASTNode::eval(UDQVarType target_type, const UDQContext& context) const
else {
auto res = UDQSet::groups(this->string_value, groups);
for (const auto& group : groups) {
if (fnmatch(group_pattern.c_str(), group.c_str(), fnmatch_flags) == 0)
res.assign(group, context.get_group_var(group, this->string_value));
if (fnmatch(group_pattern.c_str(), group.c_str(), fnmatch_flags) == 0) {
if (context.has_group_var(group, this->string_value))
res.assign(group, context.get_group_var(group, this->string_value));
}
}
return res;
}
} else {
auto res = UDQSet::groups(this->string_value, groups);
for (const auto& group : groups)
res.assign(group, context.get_group_var(group, this->string_value));
for (const auto& group : groups) {
if (context.has_group_var(group, this->string_value))
res.assign(group, context.get_group_var(group, this->string_value));
}
return res;
}
}