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

Rename arguments to avoid shadowing

Browse Source
This commit is contained in:
Joakim Hove
2019-06-26 07:47:18 +02:00
parent cd43bb7a5f
commit 7475636610
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/opm/parser/eclipse/EclipseState/Schedule/RFTConfig.cpp
View File

@@ -148,8 +148,8 @@ std::size_t RFTConfig::firstRFTOutput() const {
first_rft = std::min(first_rft, rft_pair.second);
}
for (const auto& rft_pair : this->plt_config) {
const auto& dynamic_state = rft_pair.second;
for (const auto& plt_pair : this->plt_config) {
const auto& dynamic_state = plt_pair.second;
/*
We do not really output PLT, so this predictae will unconditionally
return false.
@@ -163,12 +163,12 @@ std::size_t RFTConfig::firstRFTOutput() const {
for (const auto& rft_pair : this->rft_config) {
const auto& dynamic_state = rft_pair.second;
auto pred = [] (const std::pair<RFTConnections::RFTEnum, std::size_t>& rft_pair) {
if (rft_pair.first == RFTConnections::RFTEnum::YES)
auto pred = [] (const std::pair<RFTConnections::RFTEnum, std::size_t>& pred_arg) {
if (pred_arg.first == RFTConnections::RFTEnum::YES)
return true;
if (rft_pair.first == RFTConnections::RFTEnum::REPT)
if (pred_arg.first == RFTConnections::RFTEnum::REPT)
return true;
if (rft_pair.first == RFTConnections::RFTEnum::TIMESTEP)
if (pred_arg.first == RFTConnections::RFTEnum::TIMESTEP)
return true;
return false;
};

4
src/opm/parser/eclipse/EclipseState/Schedule/Well/Well2.cpp
View File

@@ -663,12 +663,12 @@ WellCompletion::CompletionOrderEnum Well2::getWellConnectionOrdering() const {
return this->ordering;
}
double Well2::production_rate(const SummaryState& st, Phase phase) const {
double Well2::production_rate(const SummaryState& st, Phase prod_phase) const {
if( !this->isProducer() ) return 0.0;
const auto controls = this->productionControls(st);
switch( phase ) {
switch( prod_phase ) {
case Phase::WATER: return controls.water_rate;
case Phase::OIL: return controls.oil_rate;
case Phase::GAS: return controls.gas_rate;

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

@@ -34,8 +34,8 @@
namespace Opm {
WellInjectionProperties::WellInjectionProperties(const std::string& name)
: name(name),
WellInjectionProperties::WellInjectionProperties(const std::string& wname)
: name(wname),
injectorType(WellInjector::WATER),
controlMode(WellInjector::CMODE_UNDEFINED)
{