From 9eaf6b2fdf9061bf3c18547520d56f5e936a971c Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Wed, 27 Oct 2021 11:11:08 +0200 Subject: [PATCH 1/4] Rename item in LIFTOPT keyword --- .../parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp | 2 +- src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LIFTOPT | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp b/src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp index 740397bc4..aba314276 100644 --- a/src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp +++ b/src/opm/parser/eclipse/EclipseState/Schedule/KeywordHandlers.cpp @@ -692,7 +692,7 @@ namespace { const double gaslift_increment = record.getItem().getSIDouble(0); const double min_eco_gradient = record.getItem().getSIDouble(0); const double min_wait = record.getItem().getSIDouble(0); - const bool all_newton = DeckItem::to_bool( record.getItem().get(0) ); + const bool all_newton = DeckItem::to_bool( record.getItem().get(0) ); glo.gaslift_increment(gaslift_increment); glo.min_eco_gradient(min_eco_gradient); diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LIFTOPT b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LIFTOPT index 470c2bcc9..cd7c0aac9 100644 --- a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LIFTOPT +++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LIFTOPT @@ -22,7 +22,7 @@ "default": 0 }, { - "name": "OPTIMISE_GAS_LIFT", + "name": "OPTIMISE_ALL_ITERATIONS", "value_type": "STRING", "default": "YES" } From 7f3be89d9cf48ebef82883660a49ce5bdc2638e1 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Wed, 27 Oct 2021 10:47:54 +0200 Subject: [PATCH 2/4] Use named constant for GASLIFT option --- src/opm/io/eclipse/rst/header.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opm/io/eclipse/rst/header.cpp b/src/opm/io/eclipse/rst/header.cpp index 142aca571..f7cc9eba9 100644 --- a/src/opm/io/eclipse/rst/header.cpp +++ b/src/opm/io/eclipse/rst/header.cpp @@ -108,7 +108,7 @@ RstHeader::RstHeader(const Opm::UnitSystem& unit_system, const std::vector& reversible_eps(logihead[VI::logihead::RevEPS]), alt_eps(logihead[VI::logihead::AltEPS]), 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_timestep2(0), From 0e4f16dddcd6760d6055f717902489ae1a648bac Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Wed, 27 Oct 2021 10:49:45 +0200 Subject: [PATCH 3/4] Use correct item for GLIFT weight factor when loading from restart --- src/opm/io/eclipse/rst/well.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opm/io/eclipse/rst/well.cpp b/src/opm/io/eclipse/rst/well.cpp index 321608e96..a7ac6ba8e 100644 --- a/src/opm/io/eclipse/rst/well.cpp +++ b/src/opm/io/eclipse/rst/well.cpp @@ -97,7 +97,7 @@ RstWell::RstWell(const ::Opm::UnitSystem& unit_system, 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_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]), // oil_rate( unit_system.to_si(M::liquid_surface_rate, xwel[VI::XWell::OilPrRate])), From 927b6c2cbb23386955fcd63224a010a3da421d5d Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Wed, 27 Oct 2021 10:56:20 +0200 Subject: [PATCH 4/4] Fetch GLIFT rate change from correct restart item --- src/opm/io/eclipse/rst/header.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opm/io/eclipse/rst/header.cpp b/src/opm/io/eclipse/rst/header.cpp index f7cc9eba9..9e2a1b6ef 100644 --- a/src/opm/io/eclipse/rst/header.cpp +++ b/src/opm/io/eclipse/rst/header.cpp @@ -125,7 +125,7 @@ RstHeader::RstHeader(const Opm::UnitSystem& unit_system, const std::vector& udq_undefined(doubhead[VI::doubhead::UdqPar_3]), udq_eps(doubhead[VI::doubhead::UdqPar_4]), 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])) { }