From 2e8e6137226ee1156f12022a35ccc6e403daa7fa Mon Sep 17 00:00:00 2001 From: Williham Williham Totland Date: Fri, 25 Sep 2020 15:10:23 +0200 Subject: [PATCH] Makes use of braces consistent within if-else sections. --- .../EclipseState/Schedule/KeywordHandlers.cpp | 7 ++++--- .../eclipse/EclipseState/Schedule/Schedule.cpp | 13 ++++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp index 016d1fec4..83748a320 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp @@ -520,9 +520,9 @@ namespace { for (const auto& group_name : group_names) { auto group_ptr = std::make_shared(this->getGroup(group_name, handlerContext.currentStep)); - if (target_string == "NONE") + if (target_string == "NONE") { group_ptr->set_gpmaint(); - else { + } else { GPMaint gpmaint(record); group_ptr->set_gpmaint(std::move(gpmaint)); } @@ -1585,8 +1585,9 @@ namespace { new_well->updateSolventFraction(fraction); this->updateWell(std::move(new_well), handlerContext.currentStep); } - } else + } else { throw std::invalid_argument("The WSOLVENT keyword can only be applied to gas injectors"); + } } } } diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp index e1cd44eba..ccfb19b7c 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp @@ -317,9 +317,9 @@ namespace { if (action_keyword.name() == "ENDACTIO") break; - if (Action::ActionX::valid_keyword(action_keyword.name())) + if (Action::ActionX::valid_keyword(action_keyword.name())) { action.addKeyword(action_keyword); - else { + } else { std::string msg = "The keyword " + action_keyword.name() + " is not supported in a ACTIONX block."; parseContext.handleError( ParseContext::ACTIONX_ILLEGAL_KEYWORD, msg, errors); } @@ -637,8 +637,9 @@ namespace { preferredPhase = Phase::OIL; OpmLog::warning("LIQ_PREFERRED_PHASE", "LIQ preferred phase not supported for well " + wellName + ", using OIL instead"); - } else + } else { preferredPhase = get_phase(phaseStr); + } } const auto& refDepthItem = record.getItem("REF_DEPTH"); double refDepth = refDepthItem.hasValue( 0 ) @@ -806,10 +807,12 @@ namespace { if (prev) { if (!well_ptr->cmp_structure( *prev )) wells.push_back( well_ptr->name() ); - } else + } else { wells.push_back( well_ptr->name() ); - } else + } + } else { wells.push_back( well_ptr->name() ); + } } }