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

Merge pull request #2283 from joakim-hove/unused-arg-warning

Browse Source 
Remove unused arguments
This commit is contained in:
Joakim Hove
2021-02-10 11:01:24 +01:00
committed by GitHub
parent 994703e9db 0e3839a6f1
commit 23c1b15a46
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp
View File

@@ -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<std::string>& matching_wells = {});
void handleWELPI (const DeckKeyword& keyword, std::size_t report_step, const ParseContext& parseContext, ErrorGuard& errors, const std::vector<std::string>& matching_wells = {});
// Normal keyword handlers -- in KeywordHandlers.cpp
void handleBRANPROP (const HandlerContext&, const ParseContext&, ErrorGuard&);

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

@@ -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<std::string>& matching_wells) {
void Schedule::handleWELPI(const DeckKeyword& keyword, std::size_t report_step, const ParseContext& parseContext, ErrorGuard& errors, const std::vector<std::string>& matching_wells) {
// Keyword structure
//
// WELPI

6
src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
View File

@@ -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<WellSegments>(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);