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

Rename GCONINJE item and use compiled constants

Browse Source
This commit is contained in:
Joakim Hove
2021-03-31 09:22:27 +02:00
parent 0f59fe900b
commit 20231af0db
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp
View File

@@ -316,19 +316,20 @@ namespace {
}
void Schedule::handleGCONINJE(const DeckKeyword& keyword, std::size_t current_step, const ParseContext& parseContext, ErrorGuard& errors) {
using GI = ParserKeywords::GCONINJE;
for (const auto& record : keyword) {
const std::string& groupNamePattern = record.getItem("GROUP").getTrimmedString(0);
const std::string& groupNamePattern = record.getItem<GI::GROUP>().getTrimmedString(0);
const auto group_names = this->groupNames(groupNamePattern);
if (group_names.empty())
invalidNamePattern(groupNamePattern, current_step, parseContext, errors, keyword);
const Group::InjectionCMode controlMode = Group::InjectionCModeFromString(record.getItem("CONTROL_MODE").getTrimmedString(0));
const Phase phase = get_phase( record.getItem("PHASE").getTrimmedString(0));
const auto surfaceInjectionRate = record.getItem("SURFACE_TARGET").get<UDAValue>(0);
const auto reservoirInjectionRate = record.getItem("RESV_TARGET").get<UDAValue>(0);
const auto reinj_target = record.getItem("REINJ_TARGET").get<UDAValue>(0);
const auto voidage_target = record.getItem("VOIDAGE_TARGET").get<UDAValue>(0);
const bool is_free = DeckItem::to_bool(record.getItem("FREE").getTrimmedString(0));
const Group::InjectionCMode controlMode = Group::InjectionCModeFromString(record.getItem<GI::CONTROL_MODE>().getTrimmedString(0));
const Phase phase = get_phase( record.getItem<GI::PHASE>().getTrimmedString(0));
const auto surfaceInjectionRate = record.getItem<GI::SURFACE_TARGET>().get<UDAValue>(0);
const auto reservoirInjectionRate = record.getItem<GI::RESV_TARGET>().get<UDAValue>(0);
const auto reinj_target = record.getItem<GI::REINJ_TARGET>().get<UDAValue>(0);
const auto voidage_target = record.getItem<GI::VOIDAGE_TARGET>().get<UDAValue>(0);
const bool is_free = DeckItem::to_bool(record.getItem<GI::RESPOND_TO_PARENT>().getTrimmedString(0));
std::optional<std::string> guide_rate_str;
{

2
src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONINJE
View File

@@ -41,7 +41,7 @@
"dimension": "1"
},
{
"name": "FREE",
"name": "RESPOND_TO_PARENT",
"value_type": "STRING",
"default": "YES"
},