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 #833 from ANerd/output_present_phases

Browse Source 
Output well rates for present phases
This commit is contained in:
Atgeirr Flø Rasmussen 2016-09-20 11:03:31 +02:00 committed by GitHub
commit c84abe63a5
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.cpp
View File

@ -379,7 +379,7 @@ namespace Opm
substep, substep,
timer.simulationTimeElapsed(), timer.simulationTimeElapsed(),
simToSolution( state, phaseUsage_ ), simToSolution( state, phaseUsage_ ),
wellState.report(), wellState.report(phaseUsage_),
simProps); simProps);
} }
} }

20
opm/autodiff/WellStateFullyImplicitBlackoil.hpp
View File

@ -24,6 +24,7 @@
#include <opm/core/wells.h> #include <opm/core/wells.h>
#include <opm/core/well_controls.h> #include <opm/core/well_controls.h>
#include <opm/core/simulator/WellState.hpp> #include <opm/core/simulator/WellState.hpp>
#include <opm/core/props/BlackoilPhases.hpp>
#include <opm/common/ErrorMacros.hpp> #include <opm/common/ErrorMacros.hpp>
#include <vector> #include <vector>
#include <cassert> #include <cassert>
@ -191,8 +192,8 @@ namespace Opm
std::vector<double>& wellPotentials() { return well_potentials_; } std::vector<double>& wellPotentials() { return well_potentials_; }
const std::vector<double>& wellPotentials() const { return well_potentials_; } const std::vector<double>& wellPotentials() const { return well_potentials_; }
data::Wells report() const override { data::Wells report(const PhaseUsage &pu) const override {
data::Wells res = WellState::report(); data::Wells res = WellState::report(pu);
const int nw = this->numWells(); const int nw = this->numWells();
// If there are now wells numPhases throws a floating point // If there are now wells numPhases throws a floating point
@ -230,11 +231,16 @@ namespace Opm
const auto& wv = this->wellRates(); const auto& wv = this->wellRates();
data::Rates wellrates; data::Rates wellrates;
if( np == 3 ) { if( pu.phase_used[BlackoilPhases::Aqua] ) {
/* only write if 3-phase solution */ wellrates.set( rt::wat, wv[ wellrate_index + pu.phase_pos[BlackoilPhases::Aqua] ] );
wellrates.set( rt::wat, wv[ wellrate_index + 0 ] ); }
wellrates.set( rt::oil, wv[ wellrate_index + 1 ] );
wellrates.set( rt::gas, wv[ wellrate_index + 2 ] ); if( pu.phase_used[BlackoilPhases::Liquid] ) {
wellrates.set( rt::oil, wv[ wellrate_index + pu.phase_pos[BlackoilPhases::Liquid] ] );
}
if( pu.phase_used[BlackoilPhases::Vapour] ) {
wellrates.set( rt::wat, wv[ wellrate_index + pu.phase_pos[BlackoilPhases::Vapour] ] );
} }
const double bhp = this->bhp()[ w ]; const double bhp = this->bhp()[ w ];