From 20231af0db57648ef2e704e7c4155b7ba0c75341 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Wed, 31 Mar 2021 09:22:27 +0200 Subject: [PATCH] Rename GCONINJE item and use compiled constants --- .../EclipseState/Schedule/KeywordHandlers.cpp | 17 +++++++++-------- .../share/keywords/000_Eclipse100/G/GCONINJE | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp index b9215ccd9..af17aedbf 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp @@ -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().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(0); - const auto reservoirInjectionRate = record.getItem("RESV_TARGET").get(0); - const auto reinj_target = record.getItem("REINJ_TARGET").get(0); - const auto voidage_target = record.getItem("VOIDAGE_TARGET").get(0); - const bool is_free = DeckItem::to_bool(record.getItem("FREE").getTrimmedString(0)); + const Group::InjectionCMode controlMode = Group::InjectionCModeFromString(record.getItem().getTrimmedString(0)); + const Phase phase = get_phase( record.getItem().getTrimmedString(0)); + const auto surfaceInjectionRate = record.getItem().get(0); + const auto reservoirInjectionRate = record.getItem().get(0); + const auto reinj_target = record.getItem().get(0); + const auto voidage_target = record.getItem().get(0); + const bool is_free = DeckItem::to_bool(record.getItem().getTrimmedString(0)); std::optional guide_rate_str; { diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONINJE b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONINJE index 86c1f04ae..f2b9f0f93 100644 --- a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONINJE +++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/G/GCONINJE @@ -41,7 +41,7 @@ "dimension": "1" }, { - "name": "FREE", + "name": "RESPOND_TO_PARENT", "value_type": "STRING", "default": "YES" },