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

Merge pull request #2099 from bska/fix-oob-indexing

Browse Source 
Summary: Don't Index Out-of-Bounds During Node Configuration
This commit is contained in:
Bård Skaflestad 2020-11-10 11:55:40 +01:00 committed by GitHub
commit 3d928b8a7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -528,7 +528,13 @@ inline quantity rate( const fn_args& args ) {
template< rt phase, bool injection = true > template< rt phase, bool injection = true >
inline quantity ratel( const fn_args& args ) { inline quantity ratel( const fn_args& args ) {
const quantity zero = { 0, rate_unit< phase >() }; const auto unit = ((phase == rt::polymer) || (phase == rt::brine))
? measure::mass_rate : rate_unit<phase>();
const quantity zero = { 0.0, unit };
if (args.schedule_wells.empty())
return zero;
const auto& well = args.schedule_wells.front(); const auto& well = args.schedule_wells.front();
const auto& name = well.name(); const auto& name = well.name();
@ -554,13 +560,18 @@ inline quantity ratel( const fn_args& args ) {
} }
if( !injection ) sum *= -1; if( !injection ) sum *= -1;
if (phase == rt::polymer || phase == rt::brine) return { sum, measure::mass_rate }; return { sum, unit };
return { sum, rate_unit< phase >() };
} }
template< rt phase, bool injection = true > template< rt phase, bool injection = true >
inline quantity cratel( const fn_args& args ) { inline quantity cratel( const fn_args& args ) {
const quantity zero = { 0, rate_unit< phase >() }; const auto unit = ((phase == rt::polymer) || (phase == rt::brine))
? measure::mass_rate : rate_unit<phase>();
const quantity zero = { 0.0, unit };
if (args.schedule_wells.empty())
return zero;
const auto& well = args.schedule_wells.front(); const auto& well = args.schedule_wells.front();
const auto& name = well.name(); const auto& name = well.name();
@ -586,8 +597,7 @@ inline quantity cratel( const fn_args& args ) {
} }
if( !injection ) sum *= -1; if( !injection ) sum *= -1;
if (phase == rt::polymer || phase == rt::brine) return { sum, measure::mass_rate }; return { sum, unit };
return { sum, rate_unit< phase >() };
} }