Commit Graph

9404 Commits

Author SHA1 Message Date
Joakim Hove
22bf627d7b
Merge pull request #2098 from joakim-hove/ijk-warning
Fix shadow warning
2020-11-09 15:39:48 +01:00
Joakim Hove
f85884db71 Fix shadow warning 2020-11-09 14:41:16 +01:00
Joakim Hove
d896b2ce15 Support GCONPROD in ACTIONX 2020-11-09 14:34:47 +01:00
Joakim Hove
bb905eb545
Merge pull request #2059 from joakim-hove/summary-completion
Summary completion
2020-11-09 14:33:10 +01:00
Joakim Hove
5337306a55 Add summary evaluation for CxxxL connection completion keywords 2020-11-09 13:23:02 +01:00
Joakim Hove
523e099580 Add summary evaluation for WxxxL well completion keywords 2020-11-09 13:23:02 +01:00
Joakim Hove
2a6b623dcb Optionally strip off trailing __XX when looking for summary function 2020-11-09 13:23:02 +01:00
Joakim Hove
1dc6545bab Trivial white space 2020-11-09 13:23:02 +01:00
Joakim Hove
b9b918defa Add summary configuration for WxxxL and CxxxL completion keywords 2020-11-09 13:23:02 +01:00
Joakim Hove
e625623e49 Remove WGORL from WELL_PROBE configuration file 2020-11-09 12:47:25 +01:00
Joakim Hove
624ff50628
Merge pull request #2086 from joakim-hove/group-is-field
Add method Group::is_field()
2020-11-09 12:47:07 +01:00
Joakim Hove
84a2c3c209 Add method Group::is_field() 2020-11-09 12:46:30 +01:00
Joakim Hove
558cd2c1f7
Merge pull request #2088 from joakim-hove/welltype-injection-phase
Add method WellType::injection_phase()
2020-11-09 12:45:34 +01:00
Joakim Hove
c414aa52a9
Merge pull request #2089 from joakim-hove/udq-minus-bugx
Udq minus bugx
2020-11-07 14:58:45 +01:00
Joakim Hove
315187b8d6
Merge pull request #2093 from akva2/fix_system_header
workaround cmake issue
2020-11-06 11:10:15 +01:00
Arne Morten Kvarving
fac6695d15 workaround cmake issue
cmake does not properly interpret the SYSTEM marker in lists of
include directories. this causes issues downstream when using
dunecontrol / the in-tree cmake config files.
2020-11-06 10:16:02 +01:00
Joakim Hove
515a9ef258
Merge pull request #2090 from akva2/bump_version
bump version to 2021.04-pre
2020-11-06 09:11:29 +01:00
Arne Morten Kvarving
a194c8a1fc bump version to 2021.04-pre 2020-11-06 08:57:04 +01:00
Joakim Hove
47543641ee Testing of negative prefix 2020-11-05 15:38:23 +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
a383f55cf5 Add method WellType::injection_phase() 2020-11-05 12:32:24 +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