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

quell shadowing warnings

Browse Source
This commit is contained in:
Arne Morten Kvarving
2019-09-18 12:58:45 +02:00
parent 8c874bf741
commit 93439cf41e
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/opm/parser/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.cpp
View File

@@ -247,13 +247,13 @@ namespace Opm {
}
Well2::InjectionControls Well2::WellInjectionProperties::controls(const UnitSystem& unit_system, const SummaryState& st, double udq_default) const {
Well2::InjectionControls Well2::WellInjectionProperties::controls(const UnitSystem& unit_sys, const SummaryState& st, double udq_def) const {
InjectionControls controls(this->injectionControls);
controls.surface_rate = UDA::eval_well_uda_rate(this->surfaceInjectionRate, this->name, st, udq_default, this->injectorType, unit_system);
controls.reservoir_rate = UDA::eval_well_uda(this->reservoirInjectionRate, this->name, st, udq_default);
controls.bhp_limit = UDA::eval_well_uda(this->BHPLimit, this->name, st, udq_default);
controls.thp_limit = UDA::eval_well_uda(this->THPLimit, this->name, st, udq_default);
controls.surface_rate = UDA::eval_well_uda_rate(this->surfaceInjectionRate, this->name, st, udq_def, this->injectorType, unit_sys);
controls.reservoir_rate = UDA::eval_well_uda(this->reservoirInjectionRate, this->name, st, udq_def);
controls.bhp_limit = UDA::eval_well_uda(this->BHPLimit, this->name, st, udq_def);
controls.thp_limit = UDA::eval_well_uda(this->THPLimit, this->name, st, udq_def);
controls.temperature = this->temperature;
controls.injector_type = this->injectorType;

16
src/opm/parser/eclipse/EclipseState/Schedule/Well/WellProductionProperties.cpp
View File

@@ -274,16 +274,16 @@ bool Well2::WellProductionProperties::effectiveHistoryProductionControl(const We
}
Well2::ProductionControls Well2::WellProductionProperties::controls(const SummaryState& st, double udq_undefined) const {
Well2::ProductionControls Well2::WellProductionProperties::controls(const SummaryState& st, double udq_undef) const {
Well2::ProductionControls controls(this->m_productionControls);
controls.oil_rate = UDA::eval_well_uda(this->OilRate, this->name, st, udq_undefined);
controls.water_rate = UDA::eval_well_uda(this->WaterRate, this->name, st, udq_undefined);
controls.gas_rate = UDA::eval_well_uda(this->GasRate, this->name, st, udq_undefined);
controls.liquid_rate = UDA::eval_well_uda(this->LiquidRate, this->name, st, udq_undefined);
controls.resv_rate = UDA::eval_well_uda(this->ResVRate, this->name, st, udq_undefined);
controls.bhp_limit = UDA::eval_well_uda(this->BHPLimit, this->name, st, udq_undefined);
controls.thp_limit= UDA::eval_well_uda(this->THPLimit, this->name, st, udq_undefined);
controls.oil_rate = UDA::eval_well_uda(this->OilRate, this->name, st, udq_undef);
controls.water_rate = UDA::eval_well_uda(this->WaterRate, this->name, st, udq_undef);
controls.gas_rate = UDA::eval_well_uda(this->GasRate, this->name, st, udq_undef);
controls.liquid_rate = UDA::eval_well_uda(this->LiquidRate, this->name, st, udq_undef);
controls.resv_rate = UDA::eval_well_uda(this->ResVRate, this->name, st, udq_undef);
controls.bhp_limit = UDA::eval_well_uda(this->BHPLimit, this->name, st, udq_undef);
controls.thp_limit= UDA::eval_well_uda(this->THPLimit, this->name, st, udq_undef);
controls.bhp_history = this->BHPH;
controls.thp_history = this->THPH;