From 38c4d07282dd1efecbbddc4e43a6541d3f546e2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= Date: Mon, 10 Sep 2018 15:16:49 +0200 Subject: [PATCH] Aggregate Well Data: Miscellaneous Cleanup Fix a few white-space issues and use 'atm' unit of measurement for the default lower BHP limit of producers. --- src/opm/output/eclipse/AggregateWellData.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/opm/output/eclipse/AggregateWellData.cpp b/src/opm/output/eclipse/AggregateWellData.cpp index 87d8003f6..410ddeb60 100644 --- a/src/opm/output/eclipse/AggregateWellData.cpp +++ b/src/opm/output/eclipse/AggregateWellData.cpp @@ -433,7 +433,7 @@ namespace { // Initial data by Statoil ASA. return { // 122 Items (0..121) // 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) zero , zero , infty, infty, zero , dflt , // 12.. 17 ( 2) infty, infty, infty, infty, infty, zero , // 18.. 23 ( 3) @@ -496,8 +496,6 @@ namespace { if (well.isProducer(sim_step)) { const auto& pp = well.getProductionProperties(sim_step); - using PP = ::Opm::WellProducer::ControlModeEnum; - if (pp.OilRate != 0.0) { sWell[Ix::OilRateTarget] = swprop(M::liquid_surface_rate, pp.OilRate); @@ -526,8 +524,9 @@ namespace { sWell[Ix::ResVRateTarget] = swprop(M::rate, pp.ResVRate); } - //write out summary voidage production rate if target/limit is not set else { + // Write out summary voidage production rate if + // target/limit is not set sWell[Ix::ResVRateTarget] = get("WVPR"); } @@ -538,7 +537,7 @@ namespace { sWell[Ix::BHPTarget] = pp.BHPLimit != 0.0 ? 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)) { const auto& ip = well.getInjectionProperties(sim_step);