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

Revert to Looping Well Names

Browse Source 
The wells maintain their own insertion index, so we do not need to
infer the index from the well name order.
This commit is contained in:
Bård Skaflestad
2021-01-20 11:40:20 +01:00
parent af66a6b5f5
commit 7318bc080f
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/opm/output/eclipse/AggregateConnectionData.cpp
View File

@@ -57,7 +57,6 @@ namespace {
template <class ConnOp>
void connectionLoop(const Opm::EclipseGrid& grid,
const Opm::Well& well,
const std::size_t wellID,
const Opm::data::Well* wellRes,
ConnOp&& connOp)
{
@@ -66,7 +65,7 @@ namespace {
const auto* dynConnRes = (wellRes == nullptr)
? nullptr : wellRes->find_connection(connPtr->global_index());
connOp(wellID, *connPtr, connID, dynConnRes);
connOp(well.seqIndex(), *connPtr, connID, dynConnRes);
++connID;
}
@@ -79,16 +78,13 @@ namespace {
const Opm::data::WellRates& xw,
ConnOp&& connOp)
{
std::size_t wellID = 0;
for (const auto& well : sched.getWells(sim_step)) {
const auto well_iter = xw.find(well.name());
for (const auto& wname : sched.wellNames(sim_step)) {
const auto well_iter = xw.find(wname);
const auto* wellRes = (well_iter == xw.end())
? nullptr : &well_iter->second;
connectionLoop(grid, well, wellID,
connectionLoop(grid, sched.getWell(wname, sim_step),
wellRes, std::forward<ConnOp>(connOp));
++wellID;
}
}