OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2977 from joakim-hove/connpos

Browse Source 
Change access to connpos to use WellMap instead of index counting
This commit is contained in:
Bård Skaflestad
2020-12-09 20:50:03 +01:00
committed by GitHub
parent 0e938c0ca7 e4303c6784
commit a9e739d0a2
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp
View File

@@ -137,13 +137,16 @@ namespace Opm
perf_skin_pressure_.clear(); perf_skin_pressure_.clear();
perf_skin_pressure_.resize(nperf, 0.0); perf_skin_pressure_.resize(nperf, 0.0);
int connpos = 0;
first_perf_index_.resize(nw+1, 0); first_perf_index_.resize(nw+1, 0);
first_perf_index_[0] = connpos; first_perf_index_[0] = 0;
for (int w = 0; w < nw; ++w) { for (int w = 0; w < nw; ++w) {
// Initialize perfphaserates_ to well // Initialize perfphaserates_ to well
// rates divided by the number of perforations. // rates divided by the number of perforations.
const int num_perf_this_well = well_perf_data[w].size(); const auto& wname = wells_ecl[w].name();
const auto& well_info = this->wellMap().at(wname);
const int connpos = well_info[1];
const int num_perf_this_well = well_info[2];
for (int perf = connpos; perf < connpos + num_perf_this_well; ++perf) { for (int perf = connpos; perf < connpos + num_perf_this_well; ++perf) {
if (wells_ecl[w].getStatus() == Well::Status::OPEN) { if (wells_ecl[w].getStatus() == Well::Status::OPEN) {
for (int p = 0; p < np; ++p) { for (int p = 0; p < np; ++p) {
@@ -152,8 +155,8 @@ namespace Opm
} }
perfPress()[perf] = cellPressures[well_perf_data[w][perf-connpos].cell_index]; perfPress()[perf] = cellPressures[well_perf_data[w][perf-connpos].cell_index];
} }
connpos += num_perf_this_well;
first_perf_index_[w+1] = connpos; first_perf_index_[w+1] = connpos + num_perf_this_well;
} }
is_producer_.resize(nw, false); is_producer_.resize(nw, false);
@@ -178,7 +181,6 @@ namespace Opm
// intialize wells that have been there before // intialize wells that have been there before
// order may change so the mapping is based on the well name // order may change so the mapping is based on the well name
if (prevState && !prevState->wellMap().empty()) { if (prevState && !prevState->wellMap().empty()) {
connpos = 0;
auto end = prevState->wellMap().end(); auto end = prevState->wellMap().end();
for (int w = 0; w < nw; ++w) { for (int w = 0; w < nw; ++w) {
const Well& well = wells_ecl[w]; const Well& well = wells_ecl[w];
@@ -224,6 +226,11 @@ namespace Opm
const int num_perf_old_well = (*it).second[ 2 ]; const int num_perf_old_well = (*it).second[ 2 ];
// copy perforation rates when the number of perforations is equal, // copy perforation rates when the number of perforations is equal,
// otherwise initialize perfphaserates to well rates divided by the number of perforations. // otherwise initialize perfphaserates to well rates divided by the number of perforations.
const auto new_iter = this->wellMap().find(well.name());
if (new_iter == this->wellMap().end())
throw std::logic_error("Fatal error in WellStateFullyImplicitBlackoil - could not find well: " + well.name());
int connpos = new_iter->second[1];
if( num_perf_old_well == num_perf_this_well ) if( num_perf_old_well == num_perf_this_well )
{ {
int old_perf_phase_idx = oldPerf_idx_beg *np; int old_perf_phase_idx = oldPerf_idx_beg *np;
@@ -294,9 +301,6 @@ namespace Opm
if (!has_thp) { if (!has_thp) {
thp()[w] = 0.0; thp()[w] = 0.0;
} }
// Increment connection position offset.
connpos += num_perf_this_well;
} }
} }