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

removed usage of Deckitem::to_bool()

Browse Source
This commit is contained in:
Paul
2023-09-05 13:53:31 +02:00
parent ee8c0a28a1
commit ad076fc3c2
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/opm/input/eclipse/Deck/DeckItem.cpp
View File

@@ -503,9 +503,6 @@ bool DeckItem::to_bool(std::string string_value) {
if (string_value == "1")
return true;
if (string_value == "FLO")
return true;
if (string_value == "FALSE")
return false;

9
src/opm/input/eclipse/Schedule/KeywordHandlers.cpp
View File

@@ -795,10 +795,13 @@ File {} line {}.)", wname, location.keyword, location.filename, location.lineno)
this->invalidNamePattern(groupNamePattern, handlerContext);
const auto& pressure_item = record.getItem<ParserKeywords::GRUPNET::TERMINAL_PRESSURE>();
const int vfp_table = record.getItem<ParserKeywords::GRUPNET::VFP_TABLE>().get<int>(0);
// It is assumed here that item 6 (ADD_GAS_LIFT_GAS) has the two options ON and FLO. THe option ALQ is not supported.
// It is assumed here that item 6 (ADD_GAS_LIFT_GAS) has the two options NO and FLO. THe option ALQ is not supported.
// For standard networks the summation of ALQ values are weighted with efficiency factors.
// Note that, currently, extended networks uses always efficiency factors (this is the default set by WEFAC item 3 (YES), the value NO is not supported.)
const bool add_gas_lift_gas = DeckItem::to_bool(record.getItem<ParserKeywords::GRUPNET::ADD_GAS_LIFT_GAS>().get<std::string>(0));
const std::string& add_gas_lift_gas_string = record.getItem<ParserKeywords::GRUPNET::ADD_GAS_LIFT_GAS>().get<std::string>(0);
bool add_gas_lift_gas = false;
if (add_gas_lift_gas_string == "FLO")
add_gas_lift_gas = true;
for (const auto& group_name : group_names) {
const auto& group = this->snapshots.back().groups.get(group_name);
@@ -841,7 +844,7 @@ File {} line {}.)", wname, location.keyword, location.filename, location.lineno)
}
// To use update_node the node should be associated to a branch via add_branch()
// so the update of nodes is postponed after creation of branches
for(const auto& node: nodes)
for(const auto& node: nodes)
network.update_node(node);
this->snapshots.back().network.update( std::move(network));
}