Some more cleaning in the output code in opm-output, ewoms and opm-

simulator

1) Don't depend on legacy code for communicating the data::wells
2) Bugfix. Store globalIdx instead localIdx in data::wells::complitions
3) Move ThreadHandle to ebos
This commit is contained in:
Tor Harald Sandve
2018-01-15 13:06:42 +01:00
parent 024344600e
commit a89a6af854
7 changed files with 16 additions and 256 deletions

View File

@@ -224,7 +224,7 @@ namespace Opm
return wellRates().size() / numWells();
}
virtual data::Wells report(const PhaseUsage& pu) const
virtual data::Wells report(const PhaseUsage& pu, const int* globalCellIdxMap) const
{
using rt = data::Rates::opt;
@@ -260,7 +260,7 @@ namespace Opm
const auto active_index = this->wells_->well_cells[ wi ];
auto& completion = well.completions[ i ];
completion.index = active_index;
completion.index = globalCellIdxMap[active_index];
completion.pressure = this->perfPress()[ itr.second[1] + i ];
completion.reservoir_rate = this->perfRates()[ itr.second[1] + i ];
}