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

Aggregate Well Data: Miscellaneous Cleanup

Browse Source 
Fix a few white-space issues and use 'atm' unit of measurement for
the default lower BHP limit of producers.
This commit is contained in:
Bård Skaflestad 2018-09-10 15:16:49 +02:00 committed by Jostein Alvestad
parent 77904d6aab
commit 38c4d07282
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/opm/output/eclipse/AggregateWellData.cpp
View File

@ -433,7 +433,7 @@ namespace {
// Initial data by Statoil ASA. // Initial data by Statoil ASA.
return { // 122 Items (0..121) return { // 122 Items (0..121)
// 0 1 2 3 4 5 // 0 1 2 3 4 5
infty , infty , infty , infty ,infty , infty, // 0.. 5 ( 0) infty, infty, infty, infty, infty, infty, // 0.. 5 ( 0)
one , zero , zero , zero , zero , 1.0e-05f, // 6.. 11 ( 1) one , zero , zero , zero , zero , 1.0e-05f, // 6.. 11 ( 1)
zero , zero , infty, infty, zero , dflt , // 12.. 17 ( 2) zero , zero , infty, infty, zero , dflt , // 12.. 17 ( 2)
infty, infty, infty, infty, infty, zero , // 18.. 23 ( 3) infty, infty, infty, infty, infty, zero , // 18.. 23 ( 3)
@ -496,8 +496,6 @@ namespace {
if (well.isProducer(sim_step)) { if (well.isProducer(sim_step)) {
const auto& pp = well.getProductionProperties(sim_step); const auto& pp = well.getProductionProperties(sim_step);
using PP = ::Opm::WellProducer::ControlModeEnum;
if (pp.OilRate != 0.0) { if (pp.OilRate != 0.0) {
sWell[Ix::OilRateTarget] = sWell[Ix::OilRateTarget] =
swprop(M::liquid_surface_rate, pp.OilRate); swprop(M::liquid_surface_rate, pp.OilRate);
@ -526,8 +524,9 @@ namespace {
sWell[Ix::ResVRateTarget] = sWell[Ix::ResVRateTarget] =
swprop(M::rate, pp.ResVRate); swprop(M::rate, pp.ResVRate);
} }
//write out summary voidage production rate if target/limit is not set
else { else {
// Write out summary voidage production rate if
// target/limit is not set
sWell[Ix::ResVRateTarget] = get("WVPR"); sWell[Ix::ResVRateTarget] = get("WVPR");
} }
@ -538,7 +537,7 @@ namespace {
sWell[Ix::BHPTarget] = pp.BHPLimit != 0.0 sWell[Ix::BHPTarget] = pp.BHPLimit != 0.0
? swprop(M::pressure, pp.BHPLimit) ? swprop(M::pressure, pp.BHPLimit)
: swprop(M::pressure, 14.70*::Opm::unit::psia); : swprop(M::pressure, 1.0*::Opm::unit::atm);
} }
else if (well.isInjector(sim_step)) { else if (well.isInjector(sim_step)) {
const auto& ip = well.getInjectionProperties(sim_step); const auto& ip = well.getInjectionProperties(sim_step);