From 0e3839a6f1291b4c489a732c2ebcd51144ff394a Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Wed, 10 Feb 2021 09:19:39 +0100 Subject: [PATCH] Remove unused arguments --- opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp | 4 ++-- .../eclipse/EclipseState/Schedule/KeywordHandlers.cpp | 2 +- src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp b/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp index 0435eca70..b1047f988 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp @@ -453,7 +453,7 @@ namespace Opm void load_rst(const RestartIO::RstState& rst, const EclipseGrid& grid, const FieldPropsManager& fp); - void addWell(Well well, std::size_t report_step); + void addWell(Well well); void addWell(const std::string& wellName, const std::string& group, int headI, @@ -553,7 +553,7 @@ namespace Opm void handleGCONPROD(const DeckKeyword& keyword, std::size_t current_step, const ParseContext& parseContext, ErrorGuard& errors); void handleGCONINJE(const DeckKeyword& keyword, std::size_t current_step, const ParseContext& parseContext, ErrorGuard& errors); void handleGLIFTOPT(const DeckKeyword& keyword, std::size_t report_step, const ParseContext& parseContext, ErrorGuard& errors); - void handleWELPI (const DeckKeyword& keyword, std::size_t report_step, const ParseContext& parseContext, ErrorGuard& errors, bool actionx_mode = false, const std::vector& matching_wells = {}); + void handleWELPI (const DeckKeyword& keyword, std::size_t report_step, const ParseContext& parseContext, ErrorGuard& errors, const std::vector& matching_wells = {}); // Normal keyword handlers -- in KeywordHandlers.cpp void handleBRANPROP (const HandlerContext&, const ParseContext&, ErrorGuard&); diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp index 17419a993..1f7d6b4d4 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp @@ -1120,7 +1120,7 @@ namespace { this->handleWELPI(handlerContext.keyword, handlerContext.currentStep, parseContext, errors); } - void Schedule::handleWELPI(const DeckKeyword& keyword, std::size_t report_step, const ParseContext& parseContext, ErrorGuard& errors, bool actionx_mode, const std::vector& matching_wells) { + void Schedule::handleWELPI(const DeckKeyword& keyword, std::size_t report_step, const ParseContext& parseContext, ErrorGuard& errors, const std::vector& matching_wells) { // Keyword structure // // WELPI diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp index 3f03efd85..a0fe92b6e 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp @@ -790,7 +790,7 @@ void Schedule::iterateScheduleSection(std::size_t load_start, std::size_t load_e wellConnectionOrder); } - void Schedule::addWell(Well well, std::size_t report_step) { + void Schedule::addWell(Well well) { const std::string wname = well.name(); auto& sched_state = this->snapshots.back(); @@ -837,7 +837,7 @@ void Schedule::iterateScheduleSection(std::size_t load_start, std::size_t load_e pvt_table, gas_inflow); - this->addWell( std::move(well), timeStep ); + this->addWell( std::move(well) ); const auto& ts = this->operator[](timeStep); this->updateWPAVE( wellName, timeStep, ts.pavg.get() ); @@ -1385,7 +1385,7 @@ namespace { well.updateSegments( std::make_shared(std::move(segments) )); } - this->addWell(well, report_step); + this->addWell(well); this->addWellToGroup(well.groupName(), well.name(), report_step); } this->snapshots[report_step + 1].update_tuning(rst_state.tuning);