Update well data output integration.

Includes the following changes:
 - update to match API change in opm-output (vector not map for data::Wells::completions),
 - restore WellStateFullyImplicitBlackoil::perfPhaseRates() from output,
 - restore WellStateFullyImplicitBlackoil::currentControls() from output.

Remaining non-restored well-related data are:
 - well potentials,
 - the dynamic list of econ-limited completions.
This commit is contained in:
Atgeirr Flø Rasmussen
2016-10-25 10:31:02 +02:00
parent 77abb6de1c
commit 17a9f28fb8
2 changed files with 19 additions and 9 deletions

View File

@@ -227,16 +227,17 @@ namespace Opm
well.control = this->currentControls()[ w ];
int local_comp_index = 0;
for( auto& cpair : well.completions ) {
for( auto& comp : well.completions ) {
const auto rates = this->perfPhaseRates().begin()
+ (np * wt.second[ 1 ])
+ (np * local_comp_index);
++local_comp_index;
for( int i = 0; i < np; ++i ) {
cpair.second.rates.set( phs[ i ], *(rates + i) );
comp.rates.set( phs[ i ], *(rates + i) );
}
}
assert(local_comp_index == this->wells_->well_connpos[ w + 1 ] - this->wells_->well_connpos[ w ]);
}
return res;