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

Adjust Whitespace

Browse Source 
In preparation of adding restart support for Item 2 of GEFAC.
This commit is contained in:
Bård Skaflestad 2021-10-20 23:45:04 +02:00
parent 612706e02f
commit 7aae45a67f
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
opm/output/eclipse/VectorItems/group.hpp
View File

@ -24,10 +24,10 @@
namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems { namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems {
namespace SGroup {
namespace SGroup {
enum prod_index : std::vector<float>::size_type { enum prod_index : std::vector<float>::size_type {
GuideRate = 2, GuideRate = 2, // Group's guide rate value
OilRateLimit = 6, // Group's oil production target/limit OilRateLimit = 6, // Group's oil production target/limit
WatRateLimit = 7, // Group's water production target/limit WatRateLimit = 7, // Group's water production target/limit
GasRateLimit = 8, // Group's gas production target/limit GasRateLimit = 8, // Group's gas production target/limit
@ -41,7 +41,7 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
oilResRateLimit = 11, // Group's oil reservoir volume injection rate target/limit oilResRateLimit = 11, // Group's oil reservoir volume injection rate target/limit
oilReinjectionLimit = 12, // Group's oil reinjection fraction target/limit oilReinjectionLimit = 12, // Group's oil reinjection fraction target/limit
oilVoidageLimit = 13, // Group's oil voidage injection fraction target/limit oilVoidageLimit = 13, // Group's oil voidage injection fraction target/limit
waterSurfRateLimit = 15, //i Group's water surface volume injection rate target/limit waterSurfRateLimit = 15, // Group's water surface volume injection rate target/limit
waterResRateLimit = 16, // Group's water reservoir volume injection rate target/limit waterResRateLimit = 16, // Group's water reservoir volume injection rate target/limit
waterReinjectionLimit = 17, // Group's water reinjection fraction target/limit waterReinjectionLimit = 17, // Group's water reinjection fraction target/limit
waterVoidageLimit = 18, // Group's water voidage injection fraction target/limit waterVoidageLimit = 18, // Group's water voidage injection fraction target/limit
@ -49,7 +49,6 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
gasResRateLimit = 21, // Group's gas reservoir volume injection rate target/limit gasResRateLimit = 21, // Group's gas reservoir volume injection rate target/limit
gasReinjectionLimit = 22, // Group's gas reinjection fraction target/limit gasReinjectionLimit = 22, // Group's gas reinjection fraction target/limit
gasVoidageLimit = 23, // Group's gas voidage injection fraction target/limit gasVoidageLimit = 23, // Group's gas voidage injection fraction target/limit
}; };
} // SGroup } // SGroup

8
src/opm/output/eclipse/AggregateGroupData.cpp
View File

@ -767,12 +767,12 @@ template <class SGrpArray>
void staticContrib(const Opm::Group& group, void staticContrib(const Opm::Group& group,
const Opm::GasLiftOpt& glo, const Opm::GasLiftOpt& glo,
const Opm::SummaryState& sumState, const Opm::SummaryState& sumState,
const Opm::UnitSystem& units, const Opm::UnitSystem& units,
SGrpArray& sGrp) SGrpArray& sGrp)
{ {
using Isp = ::Opm::RestartIO::Helpers::VectorItems::SGroup::prod_index; using Isp = ::Opm::RestartIO::Helpers::VectorItems::SGroup::prod_index;
using Isi = ::Opm::RestartIO::Helpers::VectorItems::SGroup::inj_index; using Isi = ::Opm::RestartIO::Helpers::VectorItems::SGroup::inj_index;
using M = ::Opm::UnitSystem::measure; using M = ::Opm::UnitSystem::measure;
const auto dflt = -1.0e+20f; const auto dflt = -1.0e+20f;
const auto dflt_2 = -2.0e+20f; const auto dflt_2 = -2.0e+20f;
@ -782,14 +782,14 @@ void staticContrib(const Opm::Group& group,
const auto init = std::vector<float> { // 112 Items (0..111) const auto init = std::vector<float> { // 112 Items (0..111)
// 0 1 2 3 4 // 0 1 2 3 4
infty, infty, dflt , infty, zero , // 0.. 4 ( 0) infty, infty, dflt , infty , zero , // 0.. 4 ( 0)
zero , infty, infty, infty , infty, // 5.. 9 ( 1) zero , infty, infty, infty , infty, // 5.. 9 ( 1)
infty, infty, infty, infty , dflt , // 10.. 14 ( 2) infty, infty, infty, infty , dflt , // 10.. 14 ( 2)
infty, infty, infty, infty , dflt , // 15.. 19 ( 3) infty, infty, infty, infty , dflt , // 15.. 19 ( 3)
infty, infty, infty, infty , dflt , // 20.. 24 ( 4) infty, infty, infty, infty , dflt , // 20.. 24 ( 4)
zero , zero , zero , dflt_2, zero , // 24.. 29 ( 5) zero , zero , zero , dflt_2, zero , // 24.. 29 ( 5)
zero , zero , zero , zero , zero , // 30.. 34 ( 6) zero , zero , zero , zero , zero , // 30.. 34 ( 6)
infty ,zero , zero , zero , infty, // 35.. 39 ( 7) infty, zero , zero , zero , infty, // 35.. 39 ( 7)
zero , zero , zero , zero , zero , // 40.. 44 ( 8) zero , zero , zero , zero , zero , // 40.. 44 ( 8)
zero , zero , zero , zero , zero , // 45.. 49 ( 9) zero , zero , zero , zero , zero , // 45.. 49 ( 9)
zero , infty, infty, infty , infty, // 50.. 54 (10) zero , infty, infty, infty , infty, // 50.. 54 (10)