Commit Graph

10351 Commits

Author SHA1 Message Date
Markus Blatt
bf55667553 Allow installation of bash completion scripts to new location.
That location is /usr/share/bash-completion/completions and scripts
will be loaded on demand. Added option USE_BASH_COMPLETIONS_DIR (default OFF)
to request this. It is needed to prevent lintian warnings for Debian
packages.
2021-06-15 20:56:50 +02:00
Joakim Hove
428563e33a Merge pull request #2503 from joakim-hove/wells-output-json
Wells output json
2021-06-15 10:14:51 +02:00
Joakim Hove
702de267bc Add json output for data::Group 2021-06-15 07:38:41 +02:00
Joakim Hove
011845992f Add Json output from output::Wells 2021-06-15 07:38:34 +02:00
Joakim Hove
73d2f7812e Merge pull request #2504 from joakim-hove/rename-wellrates
Rename data::WellRates -> data::Wells
2021-06-14 18:21:33 +02:00
Joakim Hove
69dfff722b Merge pull request #2506 from joakim-hove/guiderate-model-const
Make method GuideRateModel::updateLINCOM() const
2021-06-14 15:30:46 +02:00
Joakim Hove
71ccf698ab Make method GuideRateModel::updateLINCOM() const 2021-06-14 12:52:28 +02:00
Joakim Hove
9fe4be5ebf Rename data::WellRates -> data::Wells 2021-06-12 09:33:05 +02:00
Bård Skaflestad
5e1d923647 Merge pull request #2500 from joakim-hove/del-timemap
Remove stale class TimeMap
2021-06-10 20:30:08 +02:00
Joakim Hove
37f07a1b18 Remove stale class TimeMap 2021-06-10 14:12:12 +02:00
Bård Skaflestad
b7c79c2da7 Merge pull request #2485 from bska/track-gconinje-udqactive
Track UDA Active Status for Group Injection Controls
2021-06-10 12:33:14 +02:00
Arne Morten Kvarving
e88909995f upadte-opm-tests: supply access token in header 2021-06-10 10:25:54 +02:00
Bård Skaflestad
5ab4bdc2db Track UDA Active Status for Group Injection Controls
This commit adds a new member function, updateUDQActive, to the
group injection properties.  This is inspired by the function of the
same name in the group production properties and fills the same
purpose.  This, in turn, enables tracking whether a GCONINJE keyword
activates a user-defined argument.  That status is in turn needed to
generate the 'IUAD' restart vector in the restart file in the face
of models for which the only UDA is in GCONINJE.
2021-06-09 20:41:03 +02:00
Bård Skaflestad
665a82b9cd Identify GCONINJE UDA Items
This commit adds UDA items for the GCONINJE keyword.  This is in
preparation of tracking UDA status in this context.  While here,
also add unit tests for the expected values of UDQ::keyword() and
UDQ::udaCode().
2021-06-09 20:41:03 +02:00
Bård Skaflestad
cefc083135 Associate Group Injection Properties to Named Group
This commit adds a new data member, group_name, to the injection
properties per group.  This is in preparation of tracking the UDQ
active status for group injection controls (keyword GCONINJE).
Group production properties already have a similar data member for
the same purpose.
2021-06-09 20:41:03 +02:00
Bård Skaflestad
1f26249ce9 Merge pull request #2498 from bska/public-rst-file-view
Promote RestartFileView to Public Access
2021-06-09 20:38:44 +02:00
Bård Skaflestad
82ccd15580 Promote RestartFileView to Public Access
In preparation of loading analytic aquifers from the restart file.
2021-06-09 00:35:13 +02:00
Bård Skaflestad
423b4a39e6 Merge pull request #2497 from joakim-hove/connections-num-open
Add method ConnectionSet::num_open()
2021-06-08 17:59:46 +02:00
Joakim Hove
9dd4c43209 Add method ConnectionSet::num_open() 2021-06-08 14:41:52 +02:00
Joakim Hove
59efd8e98e Merge pull request #2493 from akva2/add_missing_forward
add missing forward declaration
2021-06-05 22:56:07 +02:00
Joakim Hove
4127c45866 Merge pull request #2494 from blattms/prevent-further-reallocations
Prevent reallocations where possible when parsing items.
2021-06-04 18:25:18 +02:00
Markus Blatt
de37080dae Prevent reallocations where possible when parsing items.
We either reserve or use std::vector::insert instead of just
blindly using push_back.
2021-06-04 16:21:05 +02:00
Arne Morten Kvarving
ebadbdc0ac add missing forward declaration 2021-06-04 13:18:42 +02:00
Bård Skaflestad
4238209e8f Merge pull request #2492 from atgeirr/silence-warnings
Silence warnings.
2021-06-03 17:09:55 +02:00
Atgeirr Flø Rasmussen
51701f230e Silence warnings. 2021-06-03 12:22:45 +02:00
Joakim Hove
e01e8e9225 Merge pull request #2471 from bska/communicate-dynamic-aqudata
Communicate Dynamic Aquifer Data
2021-05-29 07:47:18 +02:00
Joakim Hove
542edd6fa9 Merge pull request #2487 from bska/nrsegz-actph
Account for RSEG Size Depending on Number of Active Phases
2021-05-29 07:45:57 +02:00
Bård Skaflestad
a1fd22d578 Make Aquifer Data a First Class RestartValue
This commit promotes the 'aquifer' data member of 'RestartValue' to
first class status.  In particular, this means that users must
provide aquifer data, albeit possibly empty, when constructing the
RestartValue object for input or output.

This is in preparation of using more dynamic aquifer quantities from
the simulator layer as part of the restart I/O.
2021-05-28 17:41:29 +02:00
Bård Skaflestad
15150bee50 Add Communication Support for Dynamic Aquifer Data
This commit introduces 'MessageBuffer' read and write operations for
the CarterTracyData and FetkovichData structures in preparation of
communicating these substructures from parallel processes to the IO
rank.  This is foundational work for retrieving more of the dynamic
quantities pertaining to aquifers from the simulation layer.
2021-05-28 17:41:29 +02:00
Bård Skaflestad
096ef91b73 Account for RSEG Size Depending on Number of Active Phases
The number of data items per well segment in the RSEG restart vector
turns out to depend on the number of active phases (Oil, Gas, Water)
in the simulation run.  In particular, the following relations hold

  * Single phase (Oil, Gas, or Water):          NRSEGZ = 126
  * Two phases (Oil/Gas, Oil/Water, Gas/Water): NRSEGZ = 134
  * Three phases (Oil/Gas/Water):               NRSEGZ = 146

This commit implements that variability.

The output layer does not currently use any items above index 110 so
this does not alter the contents of RSEG, only the size, for 1p or
2p simulation runs.
2021-05-28 17:41:20 +02:00
Bård Skaflestad
1b4c833c2f Merge pull request #2491 from joakim-hove/remove-unused
Remove unused variables
2021-05-28 17:37:25 +02:00
Bård Skaflestad
46e336fbb4 Merge pull request #2490 from joakim-hove/expose-stdout
Expose function stdoutIsTerminal() as static member in OpmLog
2021-05-28 13:08:28 +02:00
Joakim Hove
c9325ccfcc Remove unused variables 2021-05-28 12:02:14 +02:00
Joakim Hove
e57febca9a Expose function stdoutIsTerminal() as static member in OpmLog 2021-05-28 10:12:30 +02:00
Joakim Hove
3c4935e10b Merge pull request #2489 from joakim-hove/nupcol-update
Nupcol updates
2021-05-28 07:22:27 +02:00
Joakim Hove
0d565f9c10 Nupcol updates 2021-05-28 00:59:09 +02:00
Bård Skaflestad
6ea6891ccb Merge pull request #2488 from joakim-hove/shrink-to-fit
Add shrink_to_fit() for underlying storage in DeckItem
2021-05-27 18:14:37 +02:00
Joakim Hove
503ad0b98c Add shrink_to_fit() for underlying storage in DeckItem 2021-05-27 12:45:03 +02:00
Bård Skaflestad
dee11eae41 Merge pull request #2475 from jalvestad/rst-wlist
Output of restart tables for Well list information to the Eclipse compatible restart files
2021-05-27 10:29:44 +02:00
Jostein Alvestad
589c6014a4 changed WLIST unit test - made consistent with WListManager - newList 2021-05-26 15:25:58 +02:00
Jostein Alvestad
60148fda30 modification-correction of serialization of well_wlist_names 2021-05-26 14:27:51 +02:00
Jostein Alvestad
7974fd219a modified code to handle new empty wlists and make action NEW more robust 2021-05-26 13:58:06 +02:00
Joakim Hove
bf6ca3ff58 Merge pull request #2481 from joakim-hove/min-nupcol
Min nupcol
2021-05-26 10:22:09 +02:00
Jostein Alvestad
d1eafd6919 removed comments and removed unnecessary include-headers 2021-05-26 09:02:46 +02:00
Joakim Hove
b3b73c6f02 Merge pull request #2484 from bska/fix-double-inc
Don't Increment Loop Counter Twice
2021-05-26 00:39:55 +02:00
Bård Skaflestad
32fa3df6b6 Don't Increment Loop Counter Twice 2021-05-25 17:31:44 +02:00
Jostein Alvestad
5907a7520a first complete version that satisfies all unit tests 2021-05-25 10:37:45 +02:00
Jostein Alvestad
31c55af919 first running rewritten version - use WListManager only 2021-05-25 10:37:43 +02:00
Jostein Alvestad
4c9832aedc minor change of variable name rptStep to simStep to be consistent 2021-05-25 10:37:42 +02:00
Jostein Alvestad
1ffbfded8e cleaned up code - removed comments 2021-05-25 10:37:41 +02:00