OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into frankenstein

Browse Source 
* master:
  Update to shared_ptr-less parser interface.
This commit is contained in:
Andreas Lauser
2016-10-20 20:16:42 +02:00
parent 2a9a803135 1697212b98
commit 6754bad00b
60 changed files with 433 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/autodiff/StandardWellsDense.hpp
View File

@@ -1269,7 +1269,7 @@ namespace Opm {
/// upate the dynamic lists related to economic limits
template<class WellState>
void
updateListEconLimited(ScheduleConstPtr schedule,
updateListEconLimited(const Schedule& schedule,
const int current_step,
const Wells* wells_struct,
const WellState& well_state,
@@ -1281,7 +1281,7 @@ namespace Opm {
// flag to check if the mim oil/gas rate limit is violated
bool rate_limit_violated = false;
const std::string& well_name = wells_struct->name[w];
const Well* well_ecl = schedule->getWell(well_name);
const Well* well_ecl = schedule.getWell(well_name);
const WellEconProductionLimits& econ_production_limits = well_ecl->getEconProductionLimits(current_step);
// economic limits only apply for production wells.