Rename variable from i to injector

This commit is contained in:
Tor Harald Sandve 2015-09-03 11:29:12 +02:00
parent 944092bd89
commit 53c1195b64

View File

@ -470,14 +470,14 @@ namespace Opm
WellMap::const_iterator i = wmap.find(wells->name[w]); WellMap::const_iterator i = wmap.find(wells->name[w]);
if (i != wmap.end()) { if (i != wmap.end()) {
WellConstPtr wp = i->second; WellConstPtr wp = i->second;
const WellInjectionProperties& i = wp->getInjectionProperties(step); const WellInjectionProperties& injector = wp->getInjectionProperties(step);
if (!i.predictionMode) { if (!injector.predictionMode) {
//History matching WCONINJEH //History matching WCONINJEH
static const double invalid_alq = -std::numeric_limits<double>::max(); static const double invalid_alq = -std::numeric_limits<double>::max();
static const int invalid_vfp = -std::numeric_limits<int>::max(); static const int invalid_vfp = -std::numeric_limits<int>::max();
// For WCONINJEH the BHP limit is set to a large number // For WCONINJEH the BHP limit is set to a large number
// or a value specified using WELTARG // or a value specified using WELTARG
double bhp_limit = (i.BHPLimit > 0) ? i.BHPLimit : std::numeric_limits<double>::max(); double bhp_limit = (injector.BHPLimit > 0) ? injector.BHPLimit : std::numeric_limits<double>::max();
const int ok_bhp = const int ok_bhp =
well_controls_add_new(BHP, bhp_limit, well_controls_add_new(BHP, bhp_limit,
invalid_alq, invalid_vfp, invalid_alq, invalid_vfp,