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

Merge pull request #2790 from joakim-hove/gaslift-rst-fixup

Browse Source 
Gaslift rst fixup
This commit is contained in:
Joakim Hove 2021-10-30 15:55:37 +02:00 committed by GitHub
commit 0d6acd82e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/opm/io/eclipse/rst/header.cpp
View File

@ -108,7 +108,7 @@ RstHeader::RstHeader(const Opm::UnitSystem& unit_system, const std::vector<int>&
reversible_eps(logihead[VI::logihead::RevEPS]), reversible_eps(logihead[VI::logihead::RevEPS]),
alt_eps(logihead[VI::logihead::AltEPS]), alt_eps(logihead[VI::logihead::AltEPS]),
group_control_active(intehead[VI::intehead::NGRNPH] == 1), group_control_active(intehead[VI::intehead::NGRNPH] == 1),
glift_all_nupcol(intehead[VI::intehead::EACHNCITS] == 2), glift_all_nupcol(intehead[VI::intehead::EACHNCITS] == VI::InteheadValues::LiftOpt::EachNupCol),
// //
next_timestep1(unit_system.to_si(M::time, doubhead[VI::doubhead::TsInit])), next_timestep1(unit_system.to_si(M::time, doubhead[VI::doubhead::TsInit])),
next_timestep2(0), next_timestep2(0),
@ -125,7 +125,7 @@ RstHeader::RstHeader(const Opm::UnitSystem& unit_system, const std::vector<int>&
udq_undefined(doubhead[VI::doubhead::UdqPar_3]), udq_undefined(doubhead[VI::doubhead::UdqPar_3]),
udq_eps(doubhead[VI::doubhead::UdqPar_4]), udq_eps(doubhead[VI::doubhead::UdqPar_4]),
glift_min_wait(unit_system.to_si(M::time, doubhead[VI::doubhead::LOminInt])), glift_min_wait(unit_system.to_si(M::time, doubhead[VI::doubhead::LOminInt])),
glift_rate_delta(unit_system.to_si(M::gas_surface_rate, doubhead[VI::doubhead::LOminInt])), glift_rate_delta(unit_system.to_si(M::gas_surface_rate, doubhead[VI::doubhead::LOincrsz])),
glift_min_eco_grad(unit_system.to_si(M::identity, doubhead[VI::doubhead::LOminEcGrad])) glift_min_eco_grad(unit_system.to_si(M::identity, doubhead[VI::doubhead::LOminEcGrad]))
{ {
} }

2
src/opm/io/eclipse/rst/well.cpp
View File

@ -97,7 +97,7 @@ RstWell::RstWell(const ::Opm::UnitSystem& unit_system,
wtest_startup( unit_system.to_si(M::time, swel[VI::SWell::WTestStartupTime])), wtest_startup( unit_system.to_si(M::time, swel[VI::SWell::WTestStartupTime])),
glift_max_rate( unit_system.to_si(M::gas_surface_rate, swel[VI::SWell::LOmaxRate])), glift_max_rate( unit_system.to_si(M::gas_surface_rate, swel[VI::SWell::LOmaxRate])),
glift_min_rate( unit_system.to_si(M::gas_surface_rate, swel[VI::SWell::LOminRate])), glift_min_rate( unit_system.to_si(M::gas_surface_rate, swel[VI::SWell::LOminRate])),
glift_weight_factor( swel[VI::SWell::LOmaxRate]), glift_weight_factor( swel[VI::SWell::LOweightFac]),
glift_inc_weight_factor( swel[VI::SWell::LOincFac]), glift_inc_weight_factor( swel[VI::SWell::LOincFac]),
// //
oil_rate( unit_system.to_si(M::liquid_surface_rate, xwel[VI::XWell::OilPrRate])), oil_rate( unit_system.to_si(M::liquid_surface_rate, xwel[VI::XWell::OilPrRate])),

2
src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp
View File

@ -692,7 +692,7 @@ namespace {
const double gaslift_increment = record.getItem<ParserKeywords::LIFTOPT::INCREMENT_SIZE>().getSIDouble(0); const double gaslift_increment = record.getItem<ParserKeywords::LIFTOPT::INCREMENT_SIZE>().getSIDouble(0);
const double min_eco_gradient = record.getItem<ParserKeywords::LIFTOPT::MIN_ECONOMIC_GRADIENT>().getSIDouble(0); const double min_eco_gradient = record.getItem<ParserKeywords::LIFTOPT::MIN_ECONOMIC_GRADIENT>().getSIDouble(0);
const double min_wait = record.getItem<ParserKeywords::LIFTOPT::MIN_INTERVAL_BETWEEN_GAS_LIFT_OPTIMIZATIONS>().getSIDouble(0); const double min_wait = record.getItem<ParserKeywords::LIFTOPT::MIN_INTERVAL_BETWEEN_GAS_LIFT_OPTIMIZATIONS>().getSIDouble(0);
const bool all_newton = DeckItem::to_bool( record.getItem<ParserKeywords::LIFTOPT::OPTIMISE_GAS_LIFT>().get<std::string>(0) ); const bool all_newton = DeckItem::to_bool( record.getItem<ParserKeywords::LIFTOPT::OPTIMISE_ALL_ITERATIONS>().get<std::string>(0) );
glo.gaslift_increment(gaslift_increment); glo.gaslift_increment(gaslift_increment);
glo.min_eco_gradient(min_eco_gradient); glo.min_eco_gradient(min_eco_gradient);

2
src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LIFTOPT
View File

@ -22,7 +22,7 @@
"default": 0 "default": 0
}, },
{ {
"name": "OPTIMISE_GAS_LIFT", "name": "OPTIMISE_ALL_ITERATIONS",
"value_type": "STRING", "value_type": "STRING",
"default": "YES" "default": "YES"
} }