Commit Graph

11073 Commits

Author SHA1 Message Date
Bård Skaflestad
7aae45a67f Adjust Whitespace
In preparation of adding restart support for Item 2 of GEFAC.
2021-11-02 12:41:19 +01:00
Joakim Hove
612706e02f
Merge pull request #2804 from jalvestad/rst_improv
Add item IGRP[NWGMAX + 39] to the Eclipse-compatible restart file
2021-11-02 11:57:32 +01:00
Joakim Hove
ea856e1484
Merge pull request #2791 from joakim-hove/alq-output
Use gas lift rate value for WALQ output when gas lift rate optimization is in action
2021-11-01 19:37:52 +01:00
Joakim Hove
1342b47f63 Calculate GLIR from liquid rates and fraction Gas / Liquid 2021-11-01 17:48:47 +01:00
Joakim Hove
5b2712490e Change argument type in utility functions 2021-11-01 17:48:47 +01:00
Joakim Hove
8fb66ef908 Fetch ALQ value from simulator if WLIFTOPT is enabled for well 2021-11-01 17:48:47 +01:00
Joakim Hove
03f440d064 Use named symbol zero for increased readability 2021-11-01 17:48:47 +01:00
Joakim Hove
5e84c8d935 Add function GLiftOpt::num_wells() 2021-11-01 17:48:47 +01:00
Joakim Hove
4eddb181c6
Merge pull request #2803 from akva2/remove_ebos_flags
changed: remove extra flags for ebos
2021-11-01 17:39:24 +01:00
Atgeirr Flø Rasmussen
af8fc94188
Merge pull request #2802 from akva2/remove_gcc7_compat
changed: drop gcc7 compatibility
2021-11-01 15:29:52 +01:00
Jostein Alvestad
ffad873b0f Added output of IGRP[NWGMAX + 39] - node sequence number for groups in external network 2021-11-01 15:04:02 +01:00
Arne Morten Kvarving
becfb799a5 changed: remove extra flags for ebos
ebos is no more
2021-11-01 13:52:05 +01:00
Arne Morten Kvarving
6465cfe1ea changed: drop gcc7 compatibility
this means getting rid of the Opm::filesystem namespace
and directly using std::filesystem, as well as dropping
some of the compat code for the tr filesystem.

we still need the FileSystem.hpp/cpp files though as unique_path
is not part of std::filesystem.
2021-11-01 12:36:42 +01:00
Joakim Hove
f8d33def59
Merge pull request #2786 from daniepin/completed_cells-refactor
Refactored ScheduleGrid to use public struct cell
2021-10-30 17:10:32 +02:00
Joakim Hove
30f44eff1d
Merge pull request #2789 from joakim-hove/deck-view-rename
Rename DeckView -> DeckViewInternal
2021-10-30 15:56:30 +02:00
Joakim Hove
0d6acd82e0
Merge pull request #2790 from joakim-hove/gaslift-rst-fixup
Gaslift rst fixup
2021-10-30 15:55:37 +02:00
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