Skip to content

Commit

Permalink
Remove target_wellpi argument of iterateScheduleSection - this is not…
Browse files Browse the repository at this point in the history
… needed anymore now
  • Loading branch information
lisajulia committed Dec 24, 2024
1 parent 9b65c1c commit 16de16f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
11 changes: 4 additions & 7 deletions opm/input/eclipse/Schedule/Schedule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -168,20 +168,20 @@ namespace Opm {

auto restart_step = this->m_static.rst_info.report_step;
this->iterateScheduleSection(0, restart_step, parseContext, errors,
grid, nullptr, "", keepKeywords);
grid, "", keepKeywords);
this->load_rst(*rst, *tracer_config, grid, fp);
if (! this->restart_output.writeRestartFile(restart_step))
this->restart_output.addRestartOutput(restart_step);
this->iterateScheduleSection(restart_step, this->m_sched_deck.size(),
parseContext, errors, grid, nullptr, "", keepKeywords);
parseContext, errors, grid, "", keepKeywords);
// Events added during restart reading well be added to previous step, but need to be active at the
// restart step to ensure well potentials and guide rates are available at the first step.
const auto prev_step = std::max(static_cast<int>(restart_step-1), 0);
this->snapshots[restart_step].update_wellgroup_events(this->snapshots[prev_step].wellgroup_events());
this->snapshots[restart_step].update_events(this->snapshots[prev_step].events());
} else {
this->iterateScheduleSection(0, this->m_sched_deck.size(),
parseContext, errors, grid, nullptr, "", keepKeywords);
parseContext, errors, grid, "", keepKeywords);
}
}
catch (const OpmInputError& opm_error) {
Expand Down Expand Up @@ -575,7 +575,6 @@ void Schedule::iterateScheduleSection(std::size_t load_start, std::size_t load_e
const ParseContext& parseContext,
ErrorGuard& errors,
const ScheduleGrid& grid,
const std::unordered_map<std::string, double> * target_wellpi,
const std::string& prefix,
const bool keepKeywords,
const bool log_to_debug)
Expand Down Expand Up @@ -1703,7 +1702,6 @@ File {} line {}.)", pattern, location.keyword, location.filename, location.linen
parseContext,
errors,
grid,
&(this->m_wellPIMap),
prefix,
/* keepKeywords = */ true);
}
Expand Down Expand Up @@ -1779,7 +1777,7 @@ File {} line {}.)", pattern, location.keyword, location.filename, location.linen
const auto keepKeywords = true;
const auto log_to_debug = true;
this->iterateScheduleSection(reportStep + 1, this->m_sched_deck.size(),
parseContext, errors, grid, &(this->m_wellPIMap),
parseContext, errors, grid,
prefix, keepKeywords, log_to_debug);
}

Expand Down Expand Up @@ -1863,7 +1861,6 @@ File {} line {}.)", pattern, location.keyword, location.filename, location.linen
const auto log_to_debug = true;
this->iterateScheduleSection(reportStep + 1, this->m_sched_deck.size(),
parseContext, errors, grid,
/* target_wellpi = */ nullptr,
prefix, keepKeywords, log_to_debug);
}

Expand Down
1 change: 0 additions & 1 deletion opm/input/eclipse/Schedule/Schedule.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,6 @@ namespace Opm {
const ParseContext& parseContext,
ErrorGuard& errors,
const ScheduleGrid& grid,
const std::unordered_map<std::string, double> * target_wellpi,
const std::string& prefix,
const bool keepKeywords,
const bool log_to_debug = false);
Expand Down

0 comments on commit 16de16f

Please sign in to comment.