Bård Skaflestad
fc378d510e
Merge pull request #2591 from goncalvesmachadoc/VAPWAT
...
Add enable WATVAP
2021-08-04 15:50:13 +02:00
Arne Morten Kvarving
1d4a3cc655
fixed: make WITH_NDEBUG cmake option work again
...
cmake now adds -DNDEBUG to default CXX flags
invert logic and use -UNDEBUG to remove instead
2021-08-04 15:21:37 +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
Joakim Hove
7939adf3e3
Normalise input data in UDQ definitions
...
The UDQDefine::input_string() function will return normalized input which is
equivalent to the deck input string, but not necessarily identical. Normalizing
which might give rise to differences:
- All selectors/qualifiers in expressions like "WWCT '*'" are quoted.
- Whether to pad operators with space like "170 + FU_PAR10" or "170+FU_PAR10" is
hardcoded and independent of the space used in the input.
- Floating point numbers is output with format "%g" - no trailing zeros.
2021-07-25 16:36:18 +02:00
Joakim Hove
3853356b22
Check that VFP table exists before deref
2021-07-25 13:08:13 +02:00
Joakim Hove
2482251c3d
Specify min_size for SAVE keyword
2021-07-23 10:42:47 +02:00
Joakim Hove
946fcca4fd
Add min_size setting ParserKeywords
2021-07-23 10:42:47 +02:00
Joakim Hove
48a0d91e49
Extract all data related to keyword size in class KeywordSize
2021-07-23 10:42:47 +02:00
Joakim Hove
f17b75ab53
Merge pull request #2570 from bska/dont-manage-resources
...
Don't Manage Resources Manually
2021-07-23 10:42:20 +02:00
Joakim Hove
647cdf2190
Merge pull request #2577 from joakim-hove/keyword-size
...
Keyword size
2021-07-23 10:42:07 +02:00
Joakim Hove
bfc94a0bdb
Use keyword/item scheme with shift for TRACERKM keyword
2021-07-23 09:07:10 +02:00