Commit Graph

9418 Commits

Author SHA1 Message Date
Joakim Hove
f64f8fd30e Remove code which just resets default value -1 2020-11-19 11:42:17 +01:00
Joakim Hove
25731a67dd Minor refactor of function 2020-11-19 11:42:17 +01:00
Joakim Hove
618595e538 Rewrite branching logic in AggregateGroupData 2020-11-19 11:42:17 +01:00
Joakim Hove
2ae5d6634d Use std::optional<Group> when searching upwards for control group 2020-11-19 11:42:17 +01:00
Joakim Hove
05814ad90e Simplified initialization 2020-11-19 11:42:17 +01:00
Joakim Hove
4ca4e865c9 Rename pctl_mode -> active_cmode 2020-11-19 11:42:17 +01:00
Joakim Hove
a65bb1e969 Rename prod_cmode -> deck_cmode 2020-11-19 11:42:17 +01:00
Joakim Hove
ee662f8e38 Store GroupProductionControls in local variable 2020-11-19 11:42:17 +01:00
Joakim Hove
b28ed60b02 Reactor function groupProductionControllable() 2020-11-19 11:42:17 +01:00
Joakim Hove
4e5cc1c94d Refactor function groupInjectionControllable() 2020-11-19 11:42:17 +01:00
Joakim Hove
2820efc463 Extract assignment of GCONPROD cmode to separate function 2020-11-19 11:42:17 +01:00
Joakim Hove
2b6ffeb068 Refactor IGRP StaticContrib 2020-11-19 11:42:17 +01:00
Joakim Hove
5746c068c5 Add names for group type and level index 2020-11-19 11:42:17 +01:00
Bård Skaflestad
5338a1dd13
Merge pull request #2120 from joakim-hove/summary-store-ref
Store references to EclipseState and Schedule in Summary class
2020-11-19 11:00:06 +01:00
Joakim Hove
bd766a0277 Store references to EclipseState and Schedule in Summary class 2020-11-19 07:19:57 +01:00
Tor Harald Sandve
506ce18537
Merge pull request #2012 from osae/kwPVTEXTBO
New kw PVTSOL to accomodate an extension of the black oil model.
2020-11-18 14:00:43 +01:00
Joakim Hove
b8179b943d
Merge pull request #2115 from joakim-hove/all-connections-inactive
Automatically shut wells with no connections
2020-11-18 06:49:35 +01:00
Joakim Hove
e2cdd4d5e1
Merge pull request #2117 from joakim-hove/summaryconfig-rhpv
Load summary keyword RHPV_xxx
2020-11-17 22:20:46 +01:00
Joakim Hove
61c879e8cb Load summary keyword RHPV_xxx 2020-11-17 15:15:26 +01:00
Joakim Hove
91275cc0a5 Automatically shut wells with no connections 2020-11-17 14:55:48 +01:00
Joakim Hove
785a14dd25
Merge pull request #2116 from akva2/janitoring
fixed: initializer list order
2020-11-17 13:28:29 +01:00
Arne Morten Kvarving
ec2294ee77 fixed: initializer list order 2020-11-17 12:21:29 +01:00
Joakim Hove
8ffb918650
Merge pull request #2112 from joakim-hove/udq-update
Support UDQ UPDATE
2020-11-17 10:31:47 +01:00
Arne Morten Kvarving
a5a521e295
Merge pull request #2103 from akva2/build_flow_poly
build flow_poly on jenkins
2020-11-17 09:49:26 +01:00
Ove Sævareid
e489f1aced Serialize PvtsolTable. 2020-11-16 20:18:05 +01:00
Ove Sævareid
58aa93dcfe New kw PVTSOL to accomodate an extension of the back oil model. 2020-11-16 20:18:05 +01:00
Joakim Hove
c46488236a
Merge pull request #2110 from joakim-hove/actionx-welpi
Actionx welpi
2020-11-16 18:12:53 +01:00
Joakim Hove
278c2182bd Handle WELPI keyword in ACTIONX blocks 2020-11-16 16:55:34 +01:00
Joakim Hove
e4ab6c43ce
Merge pull request #2107 from joakim-hove/rrpv
Rrpv
2020-11-16 10:37:12 +01:00
Joakim Hove
bd9df4ec54
Merge pull request #2111 from joakim-hove/warnings
Warnings
2020-11-16 10:36:08 +01:00
Joakim Hove
ed5ed62203 Parse summary keyword ROEW_xxx 2020-11-16 07:12:59 +01:00
Joakim Hove
b2da0228b1 Support UDQ UPDATE action 2020-11-15 10:03:34 +01:00
Joakim Hove
e0e5ed1f91 Make sure UDQ can use also special summary values like TIME 2020-11-15 10:02:34 +01:00
Joakim Hove
e9e56fc5b5 Remove constructor declaration without implementation 2020-11-15 10:00:36 +01:00
Joakim Hove
25739a846c Suppress unused warning with (void) 2020-11-13 18:08:24 +01:00
Joakim Hove
7f2c06f5b0 Fix serialization object 2020-11-13 18:03:15 +01:00
Joakim Hove
e35febde59
Merge pull request #2108 from joakim-hove/actionx-gconinje
Hanlde GCONINJE in ACTIONX block
2020-11-13 17:48:05 +01:00
Joakim Hove
27883b8a3c
Merge pull request #2105 from GitPaean/aqunum_activating_cells
AQUNUM can activate inactive cells
2020-11-13 17:23:14 +01:00
Kai Bao
72d3346ab8 Numerical aquifer cells need to be active
even the cells are disabled with ACTNUM
2020-11-13 11:18:48 +01:00
Joakim Hove
e8cb3f37e0 Hanlde GCONINJE in ACTIONX block 2020-11-13 08:48:11 +01:00
Joakim Hove
54cae0f07e
Merge pull request #2095 from joakim-hove/nnc-location
Nnc location
2020-11-13 08:26:30 +01:00
Joakim Hove
c3b6da7bc3 Add RRPV as summary variable 2020-11-13 08:20:28 +01:00
Joakim Hove
cfbafc236a Allow deck_names in ParserKeyword to be interpreted as regexp 2020-11-13 08:19:43 +01:00
Joakim Hove
5c30077cd4
Merge pull request #2101 from joakim-hove/wpave
Internalize WPAVE and WWPAVE keywords
2020-11-13 07:00:14 +01:00
Joakim Hove
d4513d214f Internalize WPAVE and WWPAVE keywords 2020-11-12 23:59:10 +01:00
Joakim Hove
0fdc36d433
Merge pull request #2104 from GitPaean/correcting_aqucon_definition
correcting the definition of the keyword AQUCON
2020-11-12 16:19:20 +01:00
Kai Bao
c2b48ed34b correcting the definition of the keyword AQUCON
mostly related to default value.

default_value is used, while it looks like not working.
2020-11-12 14:01:39 +01:00
Arne Morten Kvarving
d6212f4a8b build flow_poly on jenkins 2020-11-12 11:12:19 +01:00
Bård Skaflestad
893fcbb9fb
Merge pull request #2100 from joakim-hove/intehead51
Update INTEHEAD[51] value based on presence of GCONPROD / GCONINJE
2020-11-11 23:44:09 +01:00
Joakim Hove
37b71e8be5 Skip NNCEDIT with multiplier = 1 2020-11-11 19:57:06 +01:00