Commit Graph

11327 Commits

Author SHA1 Message Date
Joakim Hove
aa77a9c6e9
Merge pull request #2903 from joakim-hove/repo-reorg
Suggestion: repo reorg
2022-01-03 10:36:48 +01:00
Joakim Hove
0a59bd8f61 Filesystem rename EclipseState/Schedule/ Schedule/ 2022-01-02 14:32:14 +01:00
Joakim Hove
aede532b9a Filesystem rename parser/eclipse/ input/eclipse 2022-01-02 14:32:14 +01:00
Bård Skaflestad
722a375f1c
Merge pull request #2915 from tskille/esmry_fix
ESmry - Ignore empty keys
2021-12-29 00:54:54 +01:00
Torbjørn Skille
3e69167bf9 ignore empty keys 2021-12-28 20:39:45 +01:00
Bård Skaflestad
5cdb5c7a6e
Merge pull request #2912 from tskille/blacklisted
update list of blacklisted keywords
2021-12-22 00:53:40 +01:00
Atgeirr Flø Rasmussen
3682e4b67a
Merge pull request #2914 from atgeirr/fix-for-posix-getopt
Fix driver, as POSIX or BSD getopt() stops on first non-option argument.
2021-12-21 21:46:57 +01:00
Atgeirr Flø Rasmussen
a8665b77d9 Fix driver, as POSIX or BSD getopt() stops on first non-option argument. 2021-12-21 18:40:38 +01:00
Torbjørn Skille
9255a7831c update list of blacklisted keywords 2021-12-21 10:47:12 +01:00
Markus Blatt
fae1278d82
Merge pull request #2911 from tskille/fix_x_option
fixing -x option for compareECL program
2021-12-21 10:22:02 +01:00
Torbjørn Skille
d94b809814 fixing -x option for compareECL program 2021-12-21 09:24:33 +01:00
Joakim Hove
435e7cf146
Merge pull request #2888 from joakim-hove/gconinje-rst
Gconinje rst
2021-12-20 10:11:28 +01:00
Jostein Alvestad
0478b91f24 Added correction to IGRP[nwgmax+5] for group control from FIELD level 2021-12-20 09:19:49 +01:00
Joakim Hove
9c54e324e9 Load injection guide rates from restart file 2021-12-20 09:19:49 +01:00
Joakim Hove
6d5ea77bf5 Rename rst::group.guide_rate_def 2021-12-20 09:19:49 +01:00
Joakim Hove
ad420a2b02 Save guiderate injection settings for group injection 2021-12-20 09:19:49 +01:00
Joakim Hove
a945a6fe9b
Merge pull request #2907 from joakim-hove/welsegs-delayed-name
Handle ACTIONX delayed WELSPECS for keywords WELSEGS and COMPSEGS
2021-12-19 13:52:19 +01:00
Joakim Hove
1121f03fe6
Merge pull request #2906 from OPMUSER/Actionx-WTMULT
Update ActionX.cpp with WTMULT
2021-12-19 13:51:23 +01:00
Joakim Hove
48fa6ecf3a
Merge pull request #2909 from bska/dont-emit-partial-rft-record
Don't Write RFT Records for Wells With No Connections
2021-12-19 12:13:44 +01:00
Joakim Hove
d867d63b78
Merge pull request #2908 from bska/dont-access-missing-refdepth
Don't Access Well BHP Reference Depth If Unavailable
2021-12-19 12:13:29 +01:00
Bård Skaflestad
17bcea4954 Don't Write RFT Records for Wells With No Connections
These render Flow's RFT files much more difficult to open in
post-processing software such as ResInsight.
2021-12-17 16:09:40 +01:00
Bård Skaflestad
cafa759b3d Don't Access Well BHP Reference Depth If Unavailable
This commit ensures that we do not access the well's BHP reference
depth unless that value is well defined.  If the input deck does not
define an explicit BHP reference depth (WELSPECS(5)), and if the
well does not have any active reservoir connections, then we are
supposed to output the usual sentinel value (-1.0E+20) as the datum
depth in 'SWEL'.

Account for this altered semantics in the restart reader too.
2021-12-17 15:20:40 +01:00
Bård Skaflestad
8306b7039f Extract Existence Predicate for Well BHP Reference Depth
This commit adds a new member function,

    bool Well::hasRefDepth() const

that allows the caller to query whether or not a particular well has
an active value for the well BHP reference depth.  The most common
cause of this value being missing is that the depth item of WELSPECS
is defaulted while the well is not connected to any active cells.

This predicate allows client code, e.g., the restart output module,
to safely access reference depth values in the case of potentially
missing reference depths.
2021-12-17 12:45:55 +01:00
Joakim Hove
b5e3137949 Handle ACTIONX delayed WELSPECS for keywords WELSEGS and COMPSEGS 2021-12-17 11:10:12 +01:00
Bård Skaflestad
25ea975171 Adjust Whitespace in Well::operator==(const Well&)
In preparation of making the comparator aware that reference depths
might not always be awailable.
2021-12-17 10:41:27 +01:00
OPMUSER
231066ea22 Update ActionX.cpp 2021-12-17 10:50:38 +08:00
Joakim Hove
0abdac2db6
Merge pull request #2895 from joakim-hove/actionx-welspecs
Actionx welspecs
2021-12-16 10:29:38 +01:00
Joakim Hove
aeb4c2bd8a
Merge pull request #2905 from OPMUSER/Actionx-NEXT
Update ActionX.cpp with NEXT
2021-12-15 14:25:18 +01:00
OPMUSER
41e2703222 Update ActionX.cpp 2021-12-15 16:36:11 +08:00
Atgeirr Flø Rasmussen
48fdc4fafd
Merge pull request #2896 from atgeirr/add-missing-include-and-copyright
Add missing include, and copyright header.
2021-12-14 12:53:16 +01:00
Joakim Hove
9bb9a6e2c8
Merge pull request #2904 from OPMUSER/Actionx-Typo-Fix
Update ActionX.cpp for Typo
2021-12-14 12:28:09 +01:00
OPMUSER
5fa54a99c8 Update ActionX.cpp 2021-12-14 18:10:28 +08:00
Joakim Hove
a507a3d9c4
Merge pull request #2902 from joakim-hove/nextstep-alias
Handle NEXT as an alias for NEXTSTEP
2021-12-14 08:14:33 +01:00
Joakim Hove
f3578ae716
Update NEXTSTEP 2021-12-14 08:03:59 +01:00
Joakim Hove
43f9e6bcf1 Handle NEXT as an alias for NEXTSTEP 2021-12-14 07:46:37 +01:00
Joakim Hove
e4be1e83b0 Log well and group names encountered in ACTIONX 2021-12-13 18:33:14 +01:00
Joakim Hove
aabc3b999b Utility class Action::WGNames to manage names introduced in ACTIONX 2021-12-13 18:33:14 +01:00
Joakim Hove
fb1e9d5d7a
Merge pull request #2900 from joakim-hove/handlercontext-refactor
Refactor Schedule handlerContext usage
2021-12-13 18:18:00 +01:00
Joakim Hove
e4a0eb7972 Refactor Schedule handlerContext usage 2021-12-13 13:50:33 +01:00
Joakim Hove
927f68bfc5
Merge pull request #2898 from joakim-hove/missing-actionx-cmp
Add missing ACTION comparison in ScheduleState
2021-12-13 13:50:11 +01:00
Joakim Hove
c7ffbf51a0
Merge pull request #2894 from joakim-hove/actionx-error-msg
Improve error message for unsupported ACTIONX keyword
2021-12-13 13:49:48 +01:00
Joakim Hove
73abb5ae58
Merge pull request #2901 from fgfuchs/missing_include_algorithm
added #include <algorithm>
2021-12-13 13:04:25 +01:00
Franz Fuchs
b509056474 added include algorithm, as it did not compile with GNU compiler versoin 11.1. 2021-12-13 12:08:13 +01:00
Joakim Hove
8345620813 Add missing ACTION comparison in ScheduleState 2021-12-13 10:47:32 +01:00
Atgeirr Flø Rasmussen
1a0c81fbd4 Add missing include, and copyright header. 2021-12-13 09:40:50 +01:00
Tor Harald Sandve
e2b0ad581c
Merge pull request #1956 from goncalvesmachadoc/watvap
Finalize VAPWAT keyword
2021-12-09 15:37:04 +01:00
Joakim Hove
221812d4d7
Merge pull request #2892 from OPMUSER/NEXTSTEP
Update ActionX.cpp with NEXTSTEP
2021-12-09 15:04:09 +01:00
Joakim Hove
30766c65dd Improve error message for unsupported ACTIONX keyword 2021-12-09 11:23:16 +01:00
OPMUSER
f5e449d1e6 Add WELTARG 2021-12-09 18:17:25 +08:00
OPMUSER
8b46e3e711 Update ActionX.cpp with NEXTSTEP 2021-12-09 16:34:50 +08:00