OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-27 09:40:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3338 from joakim-hove/remove-unused

Browse Source 
Use perfrates.size() instead of storing num_perf explicitly
This commit is contained in:
Joakim Hove 2021-06-03 07:58:56 +02:00 committed by GitHub
commit 702dc3a924
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opm/simulators/wells/WellState.cpp
View File

@ -285,7 +285,6 @@ void WellState::init(const std::vector<double>& cellPressures,
perf_skin_pressure_.clear();
perf_skin_pressure_.resize(nperf, 0.0);
num_perf_.resize(nw, 0);
first_perf_index_.resize(nw, 0);
first_perf_index_[0] = 0;
for (int w = 0; w < nw; ++w) {
@ -307,7 +306,6 @@ void WellState::init(const std::vector<double>& cellPressures,
}
perf_press[perf] = cellPressures[well_perf_data[w][perf].cell_index];
}
num_perf_[w] = num_perf_this_well;
first_perf_index_[w] = connpos;
this->well_reservoir_rates_.add(wname, std::vector<double>(np, 0));
@ -1020,19 +1018,19 @@ WellState::calculateSegmentRates(const std::vector<std::vector<int>>& segment_in
double WellState::solventWellRate(const int w) const
{
const auto * perf_rates_solvent = &perfRateSolvent_[first_perf_index_[w]];
return parallel_well_info_[w]->sumPerfValues(perf_rates_solvent, perf_rates_solvent + this->num_perf_[w]);
return parallel_well_info_[w]->sumPerfValues(perf_rates_solvent, perf_rates_solvent + this->numPerf(w));
}
double WellState::polymerWellRate(const int w) const
{
const auto * perf_rates_polymer = &perfRatePolymer_[first_perf_index_[w]];
return parallel_well_info_[w]->sumPerfValues(perf_rates_polymer, perf_rates_polymer + this->num_perf_[w]);
return parallel_well_info_[w]->sumPerfValues(perf_rates_polymer, perf_rates_polymer + this->numPerf(w));
}
double WellState::brineWellRate(const int w) const
{
const auto * perf_rates_brine = &perfRateBrine_[first_perf_index_[w]];
return parallel_well_info_[w]->sumPerfValues(perf_rates_brine, perf_rates_brine + this->num_perf_[w]);
return parallel_well_info_[w]->sumPerfValues(perf_rates_brine, perf_rates_brine + this->numPerf(w));
}
int WellState::topSegmentIndex(const int w) const
@ -1065,7 +1063,7 @@ void WellState::shutWell(int well_index)
}
const auto first = this->first_perf_index_[well_index]*np;
const auto last = first + this->num_perf_[well_index]*np;
const auto last = first + this->numPerf(well_index)*np;
std::fill(this->conn_productivity_index_.begin() + first,
this->conn_productivity_index_.begin() + last, 0.0);
}

3
opm/simulators/wells/WellState.hpp
View File

@ -449,6 +449,8 @@ public:
const std::vector<double>& perfPress(const std::string& wname) const { return perfpress_[wname]; }
std::size_t numPerf(std::size_t well_index) const { return this->perfpress_[well_index].size(); }
private:
WellMapType wellMap_;
@ -477,7 +479,6 @@ private:
// iterate over all perforations of a given well
// for (int perf = first_perf_index_[well_index]; perf < first_perf_index_[well_index] + num_perf_[well_index]; ++perf)
std::vector<int> first_perf_index_;
std::vector<int> num_perf_;
WellContainer<Opm::Well::InjectorCMode> current_injection_controls_;
WellContainer<Well::ProducerCMode> current_production_controls_;