Commit Graph

6834 Commits

Author SHA1 Message Date
Joakim Hove
a3090fd88f Merge pull request #1181 from joakim-hove/tskille_pybind_eclio
Tskille pybind eclio
2019-11-06 16:39:30 +01:00
Joakim Hove
d66852d8de Rewrite EclFile wrapping
- Include the eclipse_io.cpp file in existing extension library - do not create
   a new library.

 - Remove Python class EclFile - just expose the C++ through Pybind1, include
   some monkey-patching of the class to ensure proper Python strings for CHAR
   keywords.

 - Remove string based keyword lookup.

 - Use standard Python methods __len__, __getitem__ and __contains__; get() is
   an equivalent alternative to __getitem__().

 - Add property arrays in addition to getListOfArrays()
2019-11-06 09:59:07 +01:00
Joakim Hove
629606c5d8 Use test utility to get test filenames 2019-11-06 09:59:07 +01:00
Joakim Hove
179be0d519 Add converter to convert CHAR arrays 2019-11-06 09:59:07 +01:00
Joakim Hove
438a71de1c Remove unused includes 2019-11-06 09:59:07 +01:00
Torbjørn Skille
7cacc734e8 python binding for EclFile 2019-11-06 09:59:07 +01:00
Joakim Hove
0b8a42fd1f Fix cmake find pythonlibs 2019-11-06 09:59:07 +01:00
Joakim Hove
3bf3c34899 Merge pull request #1194 from tskille/convertECL
updates of ERst API, supports multiple occurrence of array names
2019-11-06 09:06:00 +01:00
Joakim Hove
af34571d5f Merge pull request #1198 from akva2/janitoring
fixed: wrong init list order
2019-11-06 07:10:54 +01:00
Torbjørn Skille
c6f8a41c43 updates of ERst api, supports multiple occurrences of array names 2019-11-05 15:01:17 +01:00
Arne Morten Kvarving
dd8f0b2164 Merge pull request #1199 from akva2/bump_version
bump version to 2020.04-pre
2019-11-05 14:26:51 +01:00
Atgeirr Flø Rasmussen
d6cd0ff871 Merge pull request #1197 from atgeirr/add-regula-falsi-bisection
Add combined regula falsi + bisection method, and test.
2019-11-05 13:00:36 +01:00
Arne Morten Kvarving
a8e9ed2deb bump version to 2020.04-pre 2019-11-05 10:50:03 +01:00
Arne Morten Kvarving
845613c03a fixed: wrong init list order 2019-11-05 10:46:17 +01:00
Atgeirr Flø Rasmussen
2951df2bfb Add combined regula falsi + bisection method, and test. 2019-11-05 10:33:02 +01:00
Joakim Hove
810fc19ea3 Merge pull request #1196 from joakim-hove/actionresult-copy
Add copy constructor + contains() method to Action::Result
2019-11-04 16:07:55 +01:00
Joakim Hove
9e898055a8 Merge pull request #1185 from joakim-hove/field-properties-downstream
Field properties downstream
2019-11-04 16:04:21 +01:00
Joakim Hove
8c6768cc89 Merge pull request #1193 from stefoss23/gconsale
Adding keyword GCONSALE to Schedule.
2019-11-04 15:02:19 +01:00
Joakim Hove
450bb96c9b Add scalar auto create for SATNUM 2019-11-04 14:51:58 +01:00
Joakim Hove
02d4e98f1f Add WellConnections() overload which uses FieldPropsManager 2019-11-04 14:51:58 +01:00
Joakim Hove
56d32f7fa0 Use vectors with nactive elements in WellConnections 2019-11-04 14:51:58 +01:00
Joakim Hove
77ef195b46 Early exit in wellconnection code 2019-11-04 14:51:58 +01:00
Steinar Foss
17d11e9a60 GConSaleGroup: MaxProcedure static, simplified get and add. 2019-11-04 13:59:54 +01:00
Joakim Hove
015559b5cf Merge pull request #1187 from joakim-hove/field-props-has
Add has<T>() method to FieldPropsManager
2019-11-04 13:17:06 +01:00
Joakim Hove
0d2f57354a Merge pull request #1184 from joakim-hove/python-dep
Add Python library to opm-common_LIBRARIES cmake variable
2019-11-04 13:16:32 +01:00
Joakim Hove
cfcfc08520 Merge pull request #1192 from joakim-hove/box-constructor
Add constructor to Box::cell_index
2019-11-04 13:16:06 +01:00
Joakim Hove
b5b54cf162 Merge pull request #1190 from joakim-hove/eclfile-preload
Add optional argument preload=false to EclFile constructor
2019-11-04 13:15:30 +01:00
Joakim Hove
1750767a1f Merge pull request #1180 from joakim-hove/eclfile-size
Add size() method to EclFile
2019-11-04 13:15:16 +01:00
Joakim Hove
f33c4f749e Add copy constructor + contains() method to Action::Result 2019-11-04 12:54:14 +01:00
Steinar Foss
ec07dca68b Added GConSale.hpp to CMakeLists_files.cmake. 2019-11-04 09:31:45 +01:00
Steinar Foss
d2dce88411 Adding keyword GCONSALE to Schedule.
added files GConSale cpp/hpp.

Schedule: adde GConSale as DynamicState.

Shcedule: added function gConSale.

added function handleGCONSALE.

GConsale: added substruct GCONSALEGroup.

GConSale: empty records added.

GConSale: all values set to zero.

GCONSALE: values stored as UDA.

GConSale: UDAValues to SI.

GConSale: max_proc parsed.
2019-11-03 11:37:28 +01:00
Joakim Hove
8b2cab3244 Add constructor to Box::cell_index 2019-11-02 14:45:58 +01:00
Joakim Hove
53619980c5 Merge pull request #1188 from joakim-hove/P
Keywords on P
2019-11-02 09:10:13 +01:00
Joakim Hove
74aa7bbd48 Add optional argument preload=false to EclFile constructor 2019-11-01 17:01:07 +01:00
Joakim Hove
bb4426ff6b Keywords on P 2019-11-01 15:14:33 +01:00
Joakim Hove
d3aec121f1 Merge pull request #1189 from totto82/supportSepGroup
Add support for item 11 and 12 in GCONINJE
2019-11-01 13:41:21 +01:00
Tor Harald Sandve
64f4919085 Add support for item 11 and 12 in GCONINJE 2019-11-01 13:15:52 +01:00
Joakim Hove
8268c877fd Add has<T>() method to FieldPropsManager 2019-11-01 08:13:42 +01:00
Joakim Hove
e296140f75 Merge pull request #1186 from stefoss23/add_keywords_P
added keywords beginning w/ P.
2019-10-31 16:48:52 +01:00
Steinar Foss
59fddbf998 added keywords beginning w/ P.
added keywords PINCHXY, PLYATEMP, PLYCAMAX.
2019-10-31 13:05:49 +01:00
Joakim Hove
0fb55b23c0 Merge pull request #1056 from joakim-hove/field-properties
Add FieldProps skeleton
2019-10-31 11:36:29 +01:00
Joakim Hove
64095f0885 Create default FieldPropsManager - for the testing phase 2019-10-31 11:18:55 +01:00
Joakim Hove
a7187abc17 Initial implementation of 3D properties 2019-10-31 11:18:55 +01:00
Joakim Hove
18eb7a2de3 Check if have grid before fault initialization 2019-10-31 11:18:54 +01:00
Joakim Hove
176e7f75ed Add Python library to opm-common_LIBRARIES cmake variable 2019-10-31 07:07:07 +01:00
Joakim Hove
abe2013624 Merge pull request #1182 from stefoss23/add_keyword_N1
Added keywords beginning with N, O, P.
2019-10-30 23:34:40 +01:00
Markus Blatt
bea4a81a3c Merge pull request #1176 from blattms/changelog-2019.10
Added entries to changelog concerning 2019.10 release
2019-10-30 21:51:53 +01:00
Steinar Foss
78a37d2a33 added keywords beginning with N, O, P.
added keywords NODPPM, NOHMD, NOHMO.

added keywords NOHYST, NOWARNEP, NRSOUT.

added keywords NWATREM, NXFIN, NYFIN, NZFIN.

added keywords OFM, OILAPI, OLDTRAN, OLDTRANR.

added keywords PARTTRAC, PBUB, PCW.

added keywords PDEW, PEBI, PECOEFS.

removed keyword NEWTON.

added keywords PEDIMS, PEGTABX.

added keywords PEKTABX, PENUM, PERMAVE.

added keywords PETGRID, PICOND.
2019-10-30 15:37:14 +01:00
Joakim Hove
290368985a Add size() method to EclFile 2019-10-30 09:31:10 +01:00
Joakim Hove
292d00417c Merge pull request #1166 from joakim-hove/parsetest-model2-decks
Add parse testing of model2 decks
2019-10-30 07:40:20 +01:00