Arne Morten Kvarving
a76cf5cdb3
replace NULL with nullptr
2021-08-11 14:46:49 +02:00
Arne Morten Kvarving
8b539a46fc
trim some whitespace and fix a typo
2021-08-11 14:46:48 +02:00
Bård Skaflestad
f373afd526
Merge pull request #2596 from bska/refactor-sumthin
...
Refactor SUMTHIN Implementation
2021-08-09 18:18:10 +02:00
Bård Skaflestad
509878eb49
Refactor SUMTHIN Implementation
...
Report steps do not influence the SUMTHIN intervals and the special
value
SUMTHIN
0.0 /
turns off the "thinning" process. This refactoring introduces a new
helper variable, sumthin_active_, which caches whether SUMTHIN is
active (i.e., exists and has strictly positive value).
While here, also ensure that the ministep IDs have non-unit steps
when SUMTHIN ends up skipping an output event.
2021-08-09 17:59:13 +02:00
Joakim Hove
e6d7081950
Merge pull request #2582 from joakim-hove/igrp-simplification2
...
Igrp simplification2
2021-08-05 08:55:08 +02:00
Joakim Hove
edb4100457
Merge pull request #2580 from joakim-hove/zudl-roundtrip
...
Normalise input data in UDQ definitions
2021-08-05 08:54:39 +02:00
Joakim Hove
3502bbdc7f
Merge pull request #2595 from goncalvesmachadoc/enablePrecSalt
...
add enable PRECSALT
2021-08-05 00:15:56 +02:00
Cintia Goncalves Machado
c5a5bb2f1d
add enable PRECSALT
2021-08-04 16:24:58 +02:00
Bård Skaflestad
ee4987bf20
Merge pull request #2592 from akva2/janitoring
...
changed: use std::vector<char> instead of raw char arrays
2021-08-04 15:53:52 +02:00
Bård Skaflestad
fc378d510e
Merge pull request #2591 from goncalvesmachadoc/VAPWAT
...
Add enable WATVAP
2021-08-04 15:50:13 +02:00
Cintia Goncalves Machado
0427f45163
fix;
2021-08-04 13:35:21 +02:00
Arne Morten Kvarving
328882e820
changed: use std::vector<char> instead of raw char arrays
...
also fixes a harmless error where delete was used instead of delete[]
2021-08-04 13:03:31 +02:00
Joakim Hove
cbe2ba52fc
Use common function injectionGroup for both gas and water
2021-08-04 12:24:02 +02:00
Cintia Goncalves Machado
830cb81620
addEnableWATVAP
2021-08-04 12:23:17 +02:00
Joakim Hove
af3679980d
More shuffling about
2021-08-04 12:05:56 +02:00
Joakim Hove
a6ba80068b
Split out if (cgroup) { ... }
2021-08-04 12:05:56 +02:00
Joakim Hove
579463c2a0
Introduce local bool variable
2021-08-04 12:05:56 +02:00
Joakim Hove
01b93b15ec
Remove extra assignment
2021-08-04 12:05:56 +02:00
Joakim Hove
5369e4021b
Minor white space shuffle about
2021-08-04 12:05:56 +02:00
Joakim Hove
2c6f37bd88
Merge pull request #2587 from joakim-hove/guiderat-delay-throw
...
Delay error condition to GuideRateModel::eval() time
2021-08-04 11:52:52 +02:00
Joakim Hove
89d41ec087
Merge pull request #2585 from joakim-hove/validate-compord
...
Support 'DEPTH' ordering in COMPORD
2021-08-04 11:52:32 +02:00
Joakim Hove
3db1cfd8e5
Merge pull request #2584 from joakim-hove/irrevers-thpres
...
Support EQLOPTS option IRREVER in THPRES keyword
2021-08-04 10:07:04 +02:00
Joakim Hove
2fa5c48679
Support EQLOPTS option IRREVER in THPRES keyword
2021-08-04 07:55:36 +02:00
Joakim Hove
4a415e7ebf
Support DEPTH ordering in COMPDAT
2021-08-04 07:54:54 +02:00
Joakim Hove
c0601e183b
Do not trap invalid COMPORD input
2021-08-04 07:54:54 +02:00
Joakim Hove
1726ad8090
Delay error condition to GuideRateModel::eval() time
2021-08-04 07:54:12 +02:00
Joakim Hove
d36e5a86a2
Merge pull request #2586 from joakim-hove/foam-validation
...
Enforce keyword requirement with "requires": []
2021-08-04 07:53:15 +02:00
Joakim Hove
e61f47600d
Merge pull request #2588 from joakim-hove/handle-gridunit
...
GRIDUNIT
2021-08-04 07:53:00 +02:00
Joakim Hove
324f55684b
Merge pull request #2581 from joakim-hove/rst-cumulatives
...
Unconditionally store both production and injection cumulatives
2021-08-03 21:49:32 +02:00
Joakim Hove
36fbd90151
Merge pull request #2576 from joakim-hove/multiple-welsegs
...
Multiple welsegs
2021-08-03 21:49:18 +02:00
Joakim Hove
729631cd2a
Merge pull request #2575 from joakim-hove/skiprest
...
Skiprest
2021-08-03 21:48:51 +02:00
Joakim Hove
af03d417bb
Unconditionally store both production and injection cumulatives
2021-08-03 18:29:34 +02:00
Joakim Hove
691936d0fc
Allow scanning past restart date if SKIPREST is active
2021-08-03 18:28:42 +02:00
Joakim Hove
a897cfaa14
Add small struct ScheduleRestartInfo
2021-08-03 18:28:42 +02:00
Joakim Hove
f9aa081235
Remove [[maybe unused]]
2021-08-03 18:28:42 +02:00
Joakim Hove
597c7017e1
Allow for multiple WELSEGS keywords for the same well
2021-08-03 18:26:07 +02:00
Joakim Hove
106cc727c8
Allow scanning past restart date if SKIPREST is active
2021-08-03 18:26:07 +02:00
Joakim Hove
56bb0cacf3
Add small struct ScheduleRestartInfo
2021-08-03 18:26:07 +02:00
Joakim Hove
7c62eade08
Remove [[maybe unused]]
2021-08-03 18:26:07 +02:00
Joakim Hove
e4f5898457
Merge pull request #2579 from joakim-hove/rock-size
...
Set keyword size of ROCK to UNKNOWN
2021-08-03 18:25:33 +02:00
Joakim Hove
acbabab232
Merge pull request #2578 from joakim-hove/vfpprod-lookup
...
Check that VFP table exists before deref ...
2021-08-03 18:25:19 +02:00
Joakim Hove
342b5dfb8d
Merge pull request #2589 from joakim-hove/sumthin
...
Sumthin
2021-08-03 18:24:23 +02:00
Joakim Hove
c13edd0826
Handle GRIDUNIT in deck input
2021-08-03 18:22:32 +02:00
Joakim Hove
e9ca60944d
Fix typo
2021-08-03 18:15:26 +02:00
Joakim Hove
7c986e6891
Simplify setting of FOAM options
2021-08-03 18:10:57 +02:00
Joakim Hove
04a4cf46d9
Enforce keyword requirement with "requires": []
2021-08-03 18:10:04 +02:00
Joakim Hove
7d1bb870aa
Check that SUMTHIN requirement is respected in summary writer
2021-08-03 14:04:18 +02:00
Joakim Hove
055efd00fc
Add SUMTHIN member to ScheduleState
2021-08-03 14:04:18 +02:00
Joakim Hove
f9c792fe35
Set keyword size of ROCK to UNKNOWN
2021-08-03 14:03:02 +02:00
Joakim Hove
cff145095f
Merge pull request #2573 from joakim-hove/refactor-keyword-size
...
Expand KeywordSize class
2021-08-03 14:02:18 +02:00