Joakim Hove
f60b5d1c8c
Merge pull request #2794 from joakim-hove/gliftopt
...
Gliftopt
2021-10-30 15:55:16 +02:00
Joakim Hove
1d19c67cea
Merge pull request #2800 from bska/provide-stable-actionx-well-order
...
Ensure Stable Sort Order for Well Names in ACTIONX Block
2021-10-29 19:42:02 +02:00
Joakim Hove
82a16bc1e9
Use std::map::insert_or_assign() to update maps
2021-10-29 17:05:29 +02:00
Bård Skaflestad
7452d398e5
Ensure Stable Sort Order for Well Names in ACTIONX Block
...
This means we don't process wells in an order that's dictated by
the implementation's choices for the element order in an
unordered_set<string>.
2021-10-29 16:48:22 +02:00
Bård Skaflestad
1f03a0e726
Provide External Access to Well-Order Sorting
...
This commit extracts the 'NameOrder' sorting operation to a new
public member function, WellMatcher::sort(vector<string>). The
immediate use-case for this function is to provide a stable sorting
order for wells that are matched in an ACTIONX block. Well IDs
often end up in various output arrays in the restart files--e.g., in
the IUAP array the matching wells are used in a WCON* keyword that
employs a user-defined argument as part of setting its targets or
limits--and we should strive to keep those arrays as deterministic
as possible.
2021-10-29 16:48:22 +02:00
Joakim Hove
9685946196
Merge pull request #2799 from akva2/fix_suitesparse_warning
...
changed: use STRING type
2021-10-29 16:39:51 +02:00
Joakim Hove
34c87b45fe
Merge pull request #2795 from bska/add-guiderate-haspotentials-predicate
...
Add Predicate for Potential Rates of W/G Name
2021-10-29 16:39:33 +02:00
Joakim Hove
cabeff1eee
Merge pull request #2797 from akva2/fix_cjson
...
Fix some cjson issues
2021-10-29 16:39:18 +02:00
Bård Skaflestad
93df70417a
Add Predicate for Potential Rates of W/G Name
...
This commit adds a new predicate, GuideRate::hasPotentials(), that
checks whether or not rates exist in the 'potentials' array for a
particular well or group name. If neither explicit guide rate
values nor potential rates exist for a particular "wgname", then it
is an error to call GuideRate::get() and that member function will
throw an exception. This new predicate provides a way of avoiding
that exception.
2021-10-29 15:03:49 +02:00
Arne Morten Kvarving
fecd879840
changed: use STRING type
...
there is no such thing as INT type in cmake
2021-10-29 14:25:41 +02:00
Arne Morten Kvarving
f12f77ba46
Merge pull request #2796 from akva2/fix_pybind11_dep_warning
...
fix deprecation warning with pybind11 >= 2.6
2021-10-29 13:57:57 +02:00
Arne Morten Kvarving
129bc72273
fix deprecation warning with pybind11 >= 2.6
2021-10-29 13:41:50 +02:00
Arne Morten Kvarving
21cdcecb81
fixed: append cjson libraries to python module build when using system cjson
2021-10-29 13:15:47 +02:00
Arne Morten Kvarving
c979f25d02
fix cjson find module
...
the param to find_package_handle_standard_args should match module name
2021-10-29 13:15:47 +02:00
Joakim Hove
1849e2230c
Load GLIFTOPT properties from restart file
2021-10-28 16:27:36 +02:00
Joakim Hove
589191f532
Write options for GLIFTOPT to restart file
2021-10-28 16:27:36 +02:00
Joakim Hove
927b6c2cbb
Fetch GLIFT rate change from correct restart item
2021-10-27 11:11:25 +02:00
Joakim Hove
0e4f16dddc
Use correct item for GLIFT weight factor when loading from restart
2021-10-27 11:11:25 +02:00
Joakim Hove
7f3be89d9c
Use named constant for GASLIFT option
2021-10-27 11:11:25 +02:00
Joakim Hove
9eaf6b2fdf
Rename item in LIFTOPT keyword
2021-10-27 11:11:25 +02:00
daniepin
3e612b8407
Delete .vscode directory
2021-10-27 09:55:10 +02:00
Joakim Hove
705c3ac8c6
Rename DeckView -> DeckViewInternal
2021-10-26 23:10:19 +02:00
Daniel Pinjusic
f8b8cad95a
Refactored ScheduleGrid to use public struct cell
2021-10-26 13:36:54 +02:00
Joakim Hove
d96e5308a1
Merge pull request #2784 from akva2/janitoring
...
remove unused variables
2021-10-26 12:29:15 +02:00
Arne Morten Kvarving
f079ca3443
remove unused variables
2021-10-26 08:47:22 +02:00
Joakim Hove
af11f82d4d
Merge pull request #2770 from joakim-hove/rst-gaslift
...
Rst gaslift
2021-10-26 07:22:01 +02:00
Bård Skaflestad
147ecdd9c6
Merge pull request #2783 from akva2/janitoring
...
avoid sign/unsigned comparison warning
2021-10-25 23:01:35 +02:00
Joakim Hove
2c0a1b4cb6
Merge pull request #2779 from jalvestad/rst-netbalan
...
Add items for the NETBALAN keyword to the Eclipse-compatible restart file
2021-10-25 22:46:20 +02:00
Arne Morten Kvarving
8454f82ba3
avoid sign/unsigned comparison warning
2021-10-25 21:55:02 +02:00
Joakim Hove
a17fe175d2
Merge pull request #2775 from joakim-hove/actionx-compdat-compsegs-fix
...
Actionx compdat compsegs fix
2021-10-25 17:38:20 +02:00
Joakim Hove
5dc451f159
Merge pull request #2780 from joakim-hove/rst_fixup2
...
Rst fixup2
2021-10-25 17:37:47 +02:00
Bård Skaflestad
ff969f0048
Merge pull request #2782 from alfbr/wellgraph
...
Add helpful output at runtime for wellgraph
2021-10-25 16:47:46 +02:00
Alf Birger Rustad
d5d88ae8b8
Add helpful output at runtime for wellgraph
2021-10-25 14:41:30 +02:00
Jostein Alvestad
85367ec6d7
corrections/improvements based on comments from reviewer
2021-10-25 14:27:28 +02:00
Jostein Alvestad
6830a8581e
added incorrectly deleted files
2021-10-25 14:27:26 +02:00
Jostein Alvestad
6b7875765d
added unit tests to InteHead and DoubHead for NETBALAN
2021-10-25 14:27:23 +02:00
Jostein Alvestad
60d57f06b7
added DOUBHEAD items for NETBALAN
2021-10-25 14:27:20 +02:00
Jostein Alvestad
d1a1050e67
small correction to code
2021-10-25 14:27:18 +02:00
Jostein Alvestad
2911e11033
added changes to write NETBALAN keyword data to InteHead
2021-10-25 14:27:16 +02:00
Joakim Hove
e323c4a88c
Make sure Schdule keyword is retained in FileDeck::skip
2021-10-24 10:08:46 +02:00
Joakim Hove
5f0bd0a5c7
Implement FileDeck::Index::operator+(std::size_t shift)
2021-10-24 10:01:48 +02:00
Joakim Hove
344dd516a0
Fix rst_deck for non skiprest
2021-10-23 17:49:22 +02:00
Joakim Hove
822a97c8d9
Load LIFTOP options from restart file
2021-10-22 15:53:03 +02:00
Joakim Hove
737a76918f
Load WLIFTOPT wells from restart file
2021-10-22 15:25:38 +02:00
Joakim Hove
58c0e7d868
Load GasLift settings from restart file
2021-10-22 15:25:38 +02:00
Joakim Hove
741bd5da95
Merge pull request #2777 from joakim-hove/wliftopt-update
...
Add two extra items for WLIFTOPT restart output
2021-10-22 15:24:42 +02:00
Joakim Hove
a2d217ad36
Add two extra items for WLIFTOPT restart output
2021-10-22 13:30:24 +02:00
Joakim Hove
a1942ccec7
Merge pull request #2778 from atgeirr/bump-version
...
Bump version.
2021-10-22 13:24:20 +02:00
Atgeirr Flø Rasmussen
bd9bc77129
Bump version.
2021-10-22 10:17:59 +02:00
Williham Williham Totland
4134b98701
Introduce class SchduleGrid to be used as grid by Schedule class
2021-10-22 08:35:17 +02:00
