Commit Graph

10369 Commits

Author SHA1 Message Date
Joakim Hove
862dd4b180 Use unformatted IO in testcase 2021-06-18 15:02:02 +02:00
Joakim Hove
f45f787651 White space 2021-06-18 14:06:43 +02:00
Joakim Hove
92adc65bbe Merge pull request #2517 from joakim-hove/load-rst-group
Add Schedule::addGroup( const RstGroup& ) overload
2021-06-17 21:22:43 +02:00
Joakim Hove
419bdf23c4 Add Schedule::addGroup( const RstGroup& ) overload 2021-06-17 13:19:20 +02:00
Joakim Hove
33f4ec04c2 Merge pull request #2516 from joakim-hove/update-rst-output
Update restart output from EclRegressionTest
2021-06-17 10:11:30 +02:00
Joakim Hove
e561e3fb43 Update restart output from EclRegressionTest 2021-06-17 08:46:51 +02:00
Joakim Hove
bd3724068c Merge pull request #2512 from blattms/doxygen-no-timestamp
For discussion: Deactive timestamping in doxygen for reproducible builds.
2021-06-17 08:32:00 +02:00
Markus Blatt
d052e6e47d Merge pull request #2510 from blattms/debian-patches-2
Further patches to the build system from Debian unstable packaging.
2021-06-16 12:34:04 +02:00
Joakim Hove
59115f818d Merge pull request #2515 from joakim-hove/group-cmode
Group cmode
2021-06-16 12:24:51 +02:00
Markus Blatt
b1a0964cd1 Merge pull request #2511 from blattms/debian-spelling-and-encoding-fixes
Debian spelling and encoding fixes
2021-06-16 10:32:45 +02:00
Joakim Hove
d7eff6159f Use function Group::InjectionCMode2Int() to convert cmode -> int 2021-06-16 08:50:51 +02:00
Joakim Hove
0ff19fa453 Use function Group::ProductionCMode2Int() for enum -> int mapping 2021-06-16 08:50:51 +02:00
Markus Blatt
c957f31d40 Doygen: remove wrong usage of \example directive.
For whatever reason it produced a file like
_2tmp_2reprotest_81JBnX9_2build-experiment-1_2build-experiment-1_2opm_2output_2OutputWriter_8hpp-example.html
with the full path in it.

BTW: correct usage is "\example <cpp-file>" where the cpp file
includes the example code.
2021-06-15 23:14:23 +02:00
Markus Blatt
f8840e7152 Deactive timestamping in doxygen for reproducible builds. 2021-06-15 21:17:03 +02:00
Markus Blatt
b83919d1f3 Changed encoding of all installed headers to UTF-8
On Debian support for national encodings is being phased out.
Fixes lintian warnings about national-encoding.
2021-06-15 21:11:45 +02:00
Markus Blatt
50ec3bca05 Spelling fixes pointed out by lintian. 2021-06-15 21:11:36 +02:00
Markus Blatt
13bf65a73b Install build system documentation to doc and not next to CMake files. 2021-06-15 21:06:55 +02:00
Markus Blatt
ff9792e31c Work around issues of Boost >=1.70.0 and CMake 3.18.4
With that combination the first search seems to happen in CONFIG mode
but subsequent searches will use MODULE mode. This will result in the
following warning:

CMake Warning at /usr/share/cmake-3.18/Modules/FindBoost.cmake:1187 (message):
  New Boost version may have incorrect or missing dependencies and imported
  targets
Call Stack (most recent call first):
  /usr/share/cmake-3.18/Modules/FindBoost.cmake:1311 (_Boost_COMPONENT_DEPENDENCIES)
  /usr/share/cmake-3.18/Modules/FindBoost.cmake:1919 (_Boost_MISSING_DEPENDENCIES)
  cmake/Modules/OpmFind.cmake:135 (find_package)
  cmake/Modules/OpmFind.cmake:230 (find_and_append_package_to)
  cmake/Modules/OpmLibMain.cmake:83 (find_and_append_package_list_to)
  CMakeLists.txt:222 (include)

Also the variable Boost_LIBRARIES will look quite messed up by
occurrences of optimized and debug:
Boost_LIBRARIES=optimized;/usr/lib/x86_64-linux-gnu/libboost_system.so.1.74.0;debug;/usr/lib/x86_64-linux-gnu/libboost_system.so;optimized;/usr/lib/x86_64-linux-gnu/libboost_unit_test_framework.so.1.74.0;debug;/usr/lib/x86_64-linux-gnu/libboost_unit_test_framework.so

Which will make the modules unusable because of CMake errors during
linking:

CMake Error at /usr/share/dune/cmake/modules/DuneMacros.cmake:991 (target_link_libraries):
  The "debug" argument must be followed by a library.
Call Stack (most recent call first):
  src/CMakeLists.txt:2 (target_link_dune_default_libraries)
-- Configuring incomplete, errors occurred!

Note this fix is only needed for Boost versions 1.70 and higher.
Older versions do not provide cmake package configuration
files (BoostConfig.cmake) and hence there can be no mixup.

Note also that the alternative approach of setting
CMAKE_FIND_PACKAGE_PREFER_CONFIG does not work for OPM as with this
e.g. the Dune module versions would not be set correctly.
2021-06-15 21:04:41 +02:00
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