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

Merge pull request #841 from joakim-hove/add-st-arg

Browse Source 
Add st arg
This commit is contained in:
Joakim Hove 2019-06-21 22:38:06 +02:00 committed by GitHub
commit f8aa13f6e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/parser/eclipse/EclipseState/Schedule/Well/Well2.hpp
View File

@ -109,8 +109,8 @@ public:
* water_injector.injection_rate( gas ) == 0
* * Mixed injection is not supported and always returns 0.
*/
double production_rate( Phase phase) const;
double injection_rate( Phase phase) const;
double production_rate( const SummaryState& st, Phase phase) const;
double injection_rate( const SummaryState& st, Phase phase) const;
static bool wellNameInWellNamePattern(const std::string& wellName, const std::string& wellNamePattern);
/*

4
src/opm/output/eclipse/Summary.cpp
View File

@ -578,7 +578,7 @@ inline quantity production_history( const fn_args& args ) {
for( const auto& sched_well : args.schedule_wells ){
double eff_fac = efac( args.eff_factors, sched_well.name() );
sum += sched_well.production_rate( phase ) * eff_fac;
sum += sched_well.production_rate( args.st, phase ) * eff_fac;
}
@ -591,7 +591,7 @@ inline quantity injection_history( const fn_args& args ) {
double sum = 0.0;
for( const auto& sched_well : args.schedule_wells ){
double eff_fac = efac( args.eff_factors, sched_well.name() );
sum += sched_well.injection_rate( phase ) * eff_fac;
sum += sched_well.injection_rate( args.st, phase ) * eff_fac;
}

4
src/opm/parser/eclipse/EclipseState/Schedule/Well/Well2.cpp
View File

@ -647,7 +647,7 @@ WellCompletion::CompletionOrderEnum Well2::getWellConnectionOrdering() const {
return this->ordering;
}
double Well2::production_rate( Phase phase_arg) const {
double Well2::production_rate(const SummaryState& st, Phase phase_arg) const {
if( !this->isProducer() ) return 0.0;
const auto& p = this->getProductionProperties();
@ -670,7 +670,7 @@ double Well2::production_rate( Phase phase_arg) const {
"This is likely a programming error." );
}
double Well2::injection_rate( Phase phase_arg) const {
double Well2::injection_rate(const SummaryState& st, Phase phase_arg) const {
if( !this->isInjector() ) return 0.0;
const auto& i = this->getInjectionProperties();