Commit Graph

9335 Commits

Author SHA1 Message Date
Arne Morten Kvarving
a194c8a1fc bump version to 2021.04-pre 2020-11-06 08:57:04 +01:00
Joakim Hove
2b24fba2c5
Merge pull request #2078 from joakim-hove/gliftopt-has
Add methods GasLiftOpt::has_well() and GasLiftOpt::has_group()
2020-11-05 12:41:21 +01:00
Joakim Hove
f5631549bf
Merge pull request #2074 from joakim-hove/handlercontext-units
Make section and keyword index optional in Schedule handlerContext
2020-11-05 12:40:53 +01:00
Joakim Hove
25dee84f81
Merge pull request #2073 from joakim-hove/summary-completion-commits
Summary completion commits
2020-11-05 12:40:06 +01:00
Joakim Hove
ef39f6a817
Merge pull request #2071 from joakim-hove/WWIRT
Add summary variable WWIRT
2020-11-05 12:39:45 +01:00
Joakim Hove
c883e738f0
Merge pull request #2087 from OPM/revert-2082-igrp-prod
Revert "Igrp prod"
2020-11-05 12:27:02 +01:00
Joakim Hove
57566ad768
Revert "Igrp prod" 2020-11-05 11:15:20 +01:00
Joakim Hove
f16375f5ee
Merge pull request #2082 from joakim-hove/igrp-prod
Igrp prod
2020-11-04 15:41:35 +01:00
Joakim Hove
7c1b2ff6b4 Simplified initialization 2020-11-04 14:13:44 +01:00
Joakim Hove
c392c5aaa2 Rename pctl_mode -> active_cmode 2020-11-04 14:13:44 +01:00
Joakim Hove
861be5d672 Rename prod_cmode -> deck_cmode 2020-11-04 14:13:44 +01:00
Joakim Hove
73f550ddb3 Store GroupProductionControls in local variable 2020-11-04 14:13:44 +01:00
Joakim Hove
6402ee098e Reactor function groupProductionControllable() 2020-11-04 14:13:44 +01:00
Joakim Hove
f32a3badc2 Refactor function groupInjectionControllable() 2020-11-04 14:13:44 +01:00
Joakim Hove
5738e60432 Add method WellType::injection_phase() 2020-11-04 14:13:44 +01:00
Joakim Hove
46bf4e394a Extract assignment of GCONPROD cmode to separate function 2020-11-04 09:56:09 +01:00
Joakim Hove
ce50cd5d3e Refactor IGRP StaticContrib 2020-11-04 09:07:47 +01:00
Joakim Hove
f508c23750 Add names for group type and level index 2020-11-04 08:45:24 +01:00
Joakim Hove
d88017def9
Merge pull request #2080 from joakim-hove/rst-commits
Rst commits
2020-11-04 07:25:51 +01:00
Joakim Hove
13c60d2008 Attach TUNING_CHANGE event to the correct report step 2020-11-03 21:09:48 +01:00
Joakim Hove
28d1256683 Change message when loading restart date 2020-11-03 21:09:48 +01:00
Joakim Hove
857617c0ef Cast to avoid warning 2020-11-03 21:09:48 +01:00
Joakim Hove
c392c24b6d Use named index/offset when assembling group result 2020-11-03 21:09:48 +01:00
Joakim Hove
fd7723ca61 Use const for local variables 2020-11-03 21:09:48 +01:00
Joakim Hove
6324b666c9 White space changes 2020-11-03 21:09:48 +01:00
Joakim Hove
da0ed1450e RstGroup: use raw values for rates which should enter UDA 2020-11-03 21:09:48 +01:00
Joakim Hove
4d5b4a9815 Add function converting from integer to GuideRateTarget 2020-11-03 20:38:26 +01:00
Joakim Hove
37443b8c38
Merge pull request #2079 from bska/expand-block-probe
Recognize Additional Relperm Keywords per Block
2020-11-03 14:37:18 +01:00
Bård Skaflestad
85cbe8c745 Recognize Additional Relperm Keywords per Block
The BKROG and BKROW keywords are the two-phase relative permeabilites
for oil in oil/gas and oil/water systems (per block.)
2020-11-03 12:45:00 +01:00
Joakim Hove
6c449a48b1
Merge pull request #2069 from joakim-hove/udq-wlist
Udq wlist
2020-11-03 11:22:02 +01:00
Joakim Hove
19090c2827 Add methods GasLiftOpt::has_well() and GasLiftOpt::has_group() 2020-11-03 08:47:15 +01:00
Joakim Hove
064559b9e4 Add UnitSystem member to Schedule class
Mkae Section and KeywordIndex members in HandleContext optional.
2020-11-02 21:27:18 +01:00
Bård Skaflestad
1d73d07f19
Merge pull request #2076 from joakim-hove/rm-printf
Remove extra printf
2020-11-02 19:19:10 +01:00
Joakim Hove
30bbee6e69
Merge pull request #2072 from alfbr/new-line
Added newline where natural.
2020-11-02 16:40:13 +01:00
Joakim Hove
7b8590f7ee Remove extra printf 2020-11-02 16:37:56 +01:00
Joakim Hove
5316d193ea White space 2020-11-02 14:44:05 +01:00
Joakim Hove
f3e9a02123 Add additional connection in testdata 2020-11-02 14:44:05 +01:00
Joakim Hove
64b9a49a20 Use multiline string literal for test data 2020-11-02 14:44:05 +01:00
Joakim Hove
f02437cdcb Use name based lookup in function getijk() 2020-11-02 14:44:05 +01:00
Joakim Hove
7d596e4e41 Make function parseKeyworType() in SummaryConfig public 2020-11-02 14:44:05 +01:00
Joakim Hove
a8f5dc6354 Add SummaryConfig::operator[](const std::size_t index) 2020-11-02 14:12:05 +01:00
Joakim Hove
0805249185
Merge pull request #2070 from joakim-hove/get-completion-connection
Get connections from global index
2020-11-02 14:04:05 +01:00
Alf Birger Rustad
a2cfd9a525 Added newline where natural. 2020-11-02 13:43:13 +01:00
Joakim Hove
855decfa56 Add summary variable WWIRT 2020-11-02 10:29:31 +01:00
Joakim Hove
5193cc48c6
Merge pull request #2067 from joakim-hove/group-uda
Group uda
2020-11-02 10:05:18 +01:00
Joakim Hove
9844b73bdb Add functions to get/query connections from global index 2020-11-02 07:57:19 +01:00
Joakim Hove
14df089f14 Use WellMatcher() in Schedule::wellNames() 2020-10-31 09:04:32 +01:00
Joakim Hove
7ef7e3017e Add class WellMatcher and use it UDQ evaluation 2020-10-30 22:17:59 +01:00
Joakim Hove
9bec2673ad Explicitly delete UDAValue::operator=() 2020-10-30 17:19:02 +01:00
Joakim Hove
f34f221be8 Properly initialize UDA values for group production and injection 2020-10-30 17:19:02 +01:00