OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-28 02:00:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3004 from joakim-hove/nupcol

Browse Source 
Use ScheduleState to access nupcol
This commit is contained in:
Joakim Hove 2021-01-07 15:48:49 +01:00 committed by GitHub
commit c6f0ea3ae2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/simulators/wells/BlackoilWellModel_impl.hpp
View File

@ -1391,7 +1391,7 @@ namespace Opm {
{
const int reportStepIdx = ebosSimulator_.episodeIndex();
const Group& fieldGroup = schedule().getGroup("FIELD", reportStepIdx);
const int nupcol = schedule().getNupcol(reportStepIdx);
const int nupcol = schedule()[reportStepIdx].nupcol();
const int iterationIdx = ebosSimulator_.model().newtonMethod().numIterations();
// This builds some necessary lookup structures, so it must be called
@ -1977,7 +1977,7 @@ namespace Opm {
{
const int reportStepIdx = ebosSimulator_.episodeIndex();
const int nupcol = schedule().getNupcol(reportStepIdx);
const int nupcol = schedule()[reportStepIdx].nupcol();
const int iterationIdx = ebosSimulator_.model().newtonMethod().numIterations();
// don't switch group control when iterationIdx > nupcol
// to avoid oscilations between group controls

2
opm/simulators/wells/StandardWell_impl.hpp
View File

@ -2715,7 +2715,7 @@ namespace Opm
const GasLiftOpt& glo = schedule.glo(report_step_idx);
const int iteration_idx = ebos_simulator.model().newtonMethod().numIterations();
if (glo.all_newton()) {
const int nupcol = schedule.getNupcol(report_step_idx);
const int nupcol = schedule[report_step_idx].nupcol();
if (this->glift_debug) {
const std::string msg = fmt::format(
"LIFTOPT item4 == YES, it = {}, nupcol = {} --> GLIFT optimize = {}",