OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,332 Commits 18 Branches 75 Tags 73 MiB
21e067beaa
Commit Graph

11332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
f1b3c73c65
Merge pull request #2852 from joakim-hove/add-kw-compsegs 
Add kw compsegs
 2021-11-16 20:01:11 +01:00
Joakim Hove
b30e51ccf0
Merge pull request #2851 from joakim-hove/replace-std-size 
Replace std size
 2021-11-16 19:28:27 +01:00
Joakim Hove
f95b0ad19e Rename inspect_actionx_keyword -> prefect_cell_properties 2021-11-16 19:25:45 +01:00
Joakim Hove
bef5f5b9f4 Small fixup in python wrapper 2021-11-16 18:37:59 +01:00
Daniel
fe24c0717c Replace Deck::getKeyword(size_t) with operator[size_t] 2021-11-16 18:36:27 +01:00
Joakim Hove
b6ec75eeb6
Merge pull request #2841 from joakim-hove/register-tests-in-files 
Register ecl io tests using the file list in CMakeLists_files.cmake
 2021-11-16 13:47:15 +01:00
Daniel
7435073568 Add keyword COMPSEGS to inspect_actionx_keyword() 2021-11-16 10:20:22 +01:00
Joakim Hove
df99685a92
Merge pull request #2844 from hakonhagland/py_rpath 
Add rpath to libopmcommon.so in the build directory.
 2021-11-15 17:50:39 +01:00
Joakim Hove
a8edbddbcd
Merge pull request #2845 from blattms/spelling-fixes-2021.10 
Fixes spelling errors pointed out by lintian
 2021-11-15 16:44:11 +01:00
Markus Blatt
388bb09162 Fixes spelling errors pointed out by lintian 2021-11-15 16:05:20 +01:00
Joakim Hove
b3bbd567e8
Merge pull request #2832 from joakim-hove/action-multxyz 
Action multxyz
 2021-11-15 14:24:56 +01:00
Håkon Hægland
a4d703b433 Add rpath to libopmcommon.so in the build directory. 
Currently, an rpath to the install directory of libopmcommon.so is
generated for libopmcommon_python.so, but a similar rpath is not added to
the libopmcommon.so in the build directory. It is useful to be able to
use the build directory libraries when not compiling with
-DOPM_INSTALL_PYTHON or when developing.

This PR fixes issue #2843.
 2021-11-15 13:50:06 +01:00
Markus Blatt
7554a16b4c
Merge pull request #2839 from joakim-hove/rm-sched-debug 
Remove stale compile definition SCHEDULE_DEBUG
 2021-11-15 12:16:55 +01:00
Joakim Hove
785188c45c
Merge pull request #2840 from joakim-hove/avoid-python-dep 
Avoid python dep
 2021-11-15 12:06:11 +01:00
Joakim Hove
0e5d7977c3
Merge pull request #2842 from blattms/pkgconfig-link-private 
List link dependencies as private.
 2021-11-15 12:05:16 +01:00
Markus Blatt
b21f5e248d List link dependencies as private. 
This hides them for shared libraries that do not need them.
Should fix the following lintian warnings:

W: libopm-common-dev: pkg-config-references-unknown-shared-library usr/lib/x86_64-linux-gnu/pkgconfig/opm-common.pc -lpython3.7m (line 12)
W: libopm-common-dev: pkg-config-references-unknown-shared-library usr/lib/x86_64-linux-gnu/pkgconfig/opm-common.pc -lstdc++fs (line 12)
W: libopm-common-dev: pkg-config-references-unknown-shared-library usr/lib/x86_64-linux-gnu/pkgconfig/opm-common.pc -lgomp (line 12)
W: libopm-common-dev: pkg-config-references-unknown-shared-library usr/lib/x86_64-linux-gnu/pkgconfig/opm-common.pc -lboost_system (line 12)
W: libopm-common-dev: pkg-config-references-unknown-shared-library usr/lib/x86_64-linux-gnu/pkgconfig/opm-common.pc -lcjson (line 12)

Gbp-Pq: Name 0002-List-link-dependencies-as-private.patch
 2021-11-15 11:03:55 +01:00
Joakim Hove
a8d3997c72 Register ecl io tests using the file list in CMakeLists_files.cmake 2021-11-15 10:20:36 +01:00
Joakim Hove
efc2b7c834 Only include builtin_pybind11 when building with embedded python 2021-11-15 09:58:00 +01:00
Joakim Hove
40dd50871c Remove unneeded include <pybind11/stl.h> 2021-11-15 09:48:08 +01:00
Joakim Hove
893363e225
Merge pull request #2833 from hakonhagland/py_sched2 
Implement support for adding keywords to the schedule from Python.
 2021-11-15 08:47:51 +01:00
Joakim Hove
1f8b79105a Remove stale build symbol SCHEDULE_DEBUG 2021-11-15 08:29:03 +01:00
Håkon Hægland
07f11585aa Fix rebase error. 2021-11-14 13:52:35 +01:00
Håkon Hægland
928a33d2ea Add comment about insert_keywords() 
Add comment explaining that one of the insert_keywords()
overloads does not work yet.
 2021-11-14 13:18:26 +01:00
Håkon Hægland
372b7e86a4 Support for adding keywords to schedule from Python. 
Adds support for adding keywords to the SCHEDULE section of the deck
after the deck has been read from file from Python.
 2021-11-14 13:18:26 +01:00
Joakim Hove
84c551a6df Record use of GEO keywords as ACTIONX keyword 2021-11-12 16:52:23 +01:00
Joakim Hove
5a653d7464 Use handleGEOKeyword also for MULTFLT 2021-11-12 16:51:29 +01:00
Joakim Hove
cf640a62ad Fix Copyright comment 2021-11-12 16:51:29 +01:00
Joakim Hove
6056a4c7d0
Merge pull request #2828 from daniepin/activate-cells-during-actionx 
Activate cells during ACTIONX sequence if specific keywords are encountered
 2021-11-12 16:50:30 +01:00
Daniel
e4026b84e9 Made corrections to inspect_actionx_keyword() method 2021-11-12 15:59:44 +01:00
Daniel
ff638862d9 Inspect keywords during ACTIONX sequence and activate Cells. 2021-11-12 15:08:16 +01:00
Joakim Hove
1d6a930784 Add test for COMPDAT as ACTIONX keyword 2021-11-12 15:08:16 +01:00
Joakim Hove
10314ce169
Merge pull request #2826 from daniepin/applyAction-refactor 
Combine ScheduleGrid and FieldPropsManager
 2021-11-12 15:04:37 +01:00
Joakim Hove
e65639a2e6
Merge pull request #2836 from akva2/update_data_base 
added: tell update_data where to start branch from
 2021-11-12 14:10:44 +01:00
Joakim Hove
3a1679319f
Merge pull request #2809 from bska/ext-network-restart 
Support Loading Extended Network Model From Restart
 2021-11-12 14:04:46 +01:00
Daniel
6c1f2e4ded Add serializeOp() and serializeObject() methods to Prop struct 2021-11-12 13:56:33 +01:00
Arne Morten Kvarving
f7375c2638 added: tell update_data where to start branch from 
this to allow for update_data from opm-tests
 2021-11-12 13:30:44 +01:00
Bård Skaflestad
459fd67203 Incorporate Extended Network Objects From Restart into Schedule 
This commit hooks the new RstNetwork object into the restart feature
of the main Schedule object.  We form ExtNetwork Schedule subobjects
if there are active branches and nodes in the restart file.
 2021-11-12 13:06:31 +01:00
Bård Skaflestad
19ec3b34f9 Support Loading Extended Network Model From Restart 
This commit adds a new helper class, RstNetwork, that loads the raw
data representing the extended network model from restart vectors
IBRAN, INODE, RNODE, and ZNODE.  We support loading the information
that is currently output to those restart vectors, but those do not
include every option supported by the input keywords BRANPROP and
NODEPROP.

The RstNetwork type supports querying whether or not the extended
network model is active and, if so, to get iterable collections of
branches and nodes that are geared towards constructing ExtNetwork
objects.
 2021-11-12 13:06:31 +01:00
Bård Skaflestad
c3b3ce4832 Sort Headers in Restart State Object Implementation 
In preparation of adding restart support for the extended network
model.
 2021-11-12 13:06:31 +01:00
Bård Skaflestad
def4dd2c68 Return Restart State Object by Move() 
Useful since we don't get in-place construction when returning a
composite object.  Also useful if we decide to make RstState a
move-only type.
 2021-11-12 13:06:31 +01:00
Joakim Hove
d7c495e229
Merge pull request #2824 from joakim-hove/rst-deck-file-arg 
rst_deck: interpret restart argument as proper filename
 2021-11-12 13:03:08 +01:00
Joakim Hove
c6209872f6 Rename struct options -> struct Options in rst_deck 2021-11-12 12:22:15 +01:00
Joakim Hove
d950e3ceb1 rst_deck: optionally interpret restart argument as proper filename 2021-11-12 12:22:15 +01:00
Joakim Hove
01a7149b36
Merge pull request #2788 from joakim-hove/deck-view 
Refactor Deck and DeckView class hierarchy
 2021-11-12 10:14:09 +01:00
Joakim Hove
fe38dbb663
Merge pull request #2834 from joakim-hove/restart-throw-input-error 
Use OpmInputError for restart input problems
 2021-11-12 09:59:01 +01:00
Joakim Hove
c73e77b3de Use OpmInputError for restart input problems 2021-11-12 09:19:08 +01:00
Joakim Hove
ee105b7bbf Remove base class DeckViewInternal and create new class DeckView 2021-11-12 08:09:29 +01:00
Joakim Hove
fb1dcd0203
Merge pull request #2817 from joakim-hove/schedule-fp 
Schedule fp
 2021-11-12 07:52:58 +01:00
Joakim Hove
12dd45ca66
Merge pull request #2835 from joakim-hove/add-dimension-to-uda 
Add dimension to uda in Python
 2021-11-12 07:51:55 +01:00
Joakim Hove
08e29defd2 Remove python2 adaption 2021-11-11 15:53:21 +01:00