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

Using well->hasInjectionControl() to check whether a particular control is available.

Browse Source
This commit is contained in:
Joakim Hove 2014-01-30 16:37:20 +01:00
parent af79c27b9e
commit 4a36a72cdb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/core/wells/WellsManager.cpp
View File

@ -453,7 +453,7 @@ namespace Opm
int ok = 1; int ok = 1;
int control_pos[5] = { -1, -1, -1, -1, -1 }; int control_pos[5] = { -1, -1, -1, -1, -1 };
if (well->getSurfaceInjectionRate( timeStep ) >= 0.0) { if (well->hasInjectionControl(timeStep , WellInjector::RATE)) {
control_pos[InjectionControl::RATE] = well_controls_get_num(w_->ctrls[well_index]); control_pos[InjectionControl::RATE] = well_controls_get_num(w_->ctrls[well_index]);
double distr[3] = { 0.0, 0.0, 0.0 }; double distr[3] = { 0.0, 0.0, 0.0 };
WellInjector::TypeEnum injectorType = well->getInjectorType(timeStep); WellInjector::TypeEnum injectorType = well->getInjectorType(timeStep);
@ -473,7 +473,7 @@ namespace Opm
w_); w_);
} }
if (ok && well->getReservoirInjectionRate(timeStep) >= 0.0) { if (ok && well->hasInjectionControl(timeStep , WellInjector::RESV)) {
control_pos[InjectionControl::RESV] = well_controls_get_num(w_->ctrls[well_index]); control_pos[InjectionControl::RESV] = well_controls_get_num(w_->ctrls[well_index]);
double distr[3] = { 0.0, 0.0, 0.0 }; double distr[3] = { 0.0, 0.0, 0.0 };
WellInjector::TypeEnum injectorType = well->getInjectorType(timeStep); WellInjector::TypeEnum injectorType = well->getInjectorType(timeStep);
@ -493,7 +493,7 @@ namespace Opm
w_); w_);
} }
if (ok && well->getBHPLimit(timeStep) > 0.0) { if (ok && well->hasInjectionControl(timeStep , WellInjector::BHP)) {
control_pos[InjectionControl::BHP] = well_controls_get_num(w_->ctrls[well_index]); control_pos[InjectionControl::BHP] = well_controls_get_num(w_->ctrls[well_index]);
ok = append_well_controls(BHP, ok = append_well_controls(BHP,
well->getBHPLimit(timeStep), well->getBHPLimit(timeStep),
@ -502,7 +502,7 @@ namespace Opm
w_); w_);
} }
if (ok && well->getTHPLimit(timeStep) > 0.0) { if (ok && well->hasInjectionControl(timeStep , WellInjector::THP)) {
OPM_THROW(std::runtime_error, "We cannot handle THP limit for well " << well_names[well_index]); OPM_THROW(std::runtime_error, "We cannot handle THP limit for well " << well_names[well_index]);
} }