OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,834 Commits 18 Branches 75 Tags
a3090fd88fe242150f0f213303f03da853e4c8d8
Commit Graph

193 Commits

Author SHA1 Message Date
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
92188eea8a Merge pull request #1167 from stefoss23/add_keyword 
Add keyword, python deck
 2019-10-29 16:54:22 +01:00
Joakim Hove
7e3c34c682 Only copy python files when they have changed 2019-10-29 12:34:46 +01:00
Joakim Hove
9d1b7a83d9 Changes in Python build: 
- Use python/install.py to copy from source tree to build tree
- List Cxx source files in CMakeLists_files.cmake
 2019-10-28 21:42:57 +01:00
Joakim Hove
99e32edd78 Use try: except: to import test utility code 2019-10-28 20:30:39 +01:00
Joakim Hove
d382c57145 Add small python script to determine extension suffix 2019-10-28 20:30:39 +01:00
Steinar Foss
576ddd4987 python deck: added member add(keyword). 2019-10-25 14:11:52 +02:00
Joakim Hove
390a29d425 Merge pull request #1164 from stefoss23/deckkeyword_vector_unit 
DeckKeyword w/ vectors: takes numpy vectors.
 2019-10-25 12:07:34 +02:00
Steinar Foss
02cc292f38 python numpy array conversion function in namespace conv ert. 2019-10-25 11:06:12 +02:00
Joakim Hove
a6db850230 Merge pull request #1165 from joakim-hove/python-testdata-path 
Python testdata path
 2019-10-25 10:54:24 +02:00
Joakim Hove
5ec24199de Merge pull request #1163 from joakim-hove/python-test-main 
Python test main
 2019-10-25 10:38:56 +02:00
Joakim Hove
e51b14f6fd Use utility function for path to testdata 2019-10-25 09:57:38 +02:00
Steinar Foss
ce3781775f DeckKeyword w/ vectors: takes unit system as arg. 
DeckKeyword w/ vector: added unit as arg.

DeckKeyword vector works with units.

DecValuetests: use zcorn instead of poro.

python: deckkweyword works with int data.

...

python deckkeyword. cant init with double array.

moved numpy_array converters to converters.hpp.
 2019-10-25 09:31:03 +02:00
Joakim Hove
2fb3ce4957 Add if __name__ == "__main__" in Python test 2019-10-25 09:14:25 +02:00
Joakim Hove
622409bfb6 White space change 2019-10-25 09:14:15 +02:00
Joakim Hove
162d0e0902 Minor change to python enable script 2019-10-25 08:54:40 +02:00
Steinar Foss
d05b3323b3 DeckKeyword: constr. with records takes unitsystem args. 
Deckkeyword constr w/ records also takes unit_systems.

DeckKeyword w/ records uses input args to get dims.

DeckValue unit system works w/ records.

Deckkeyword w/ records: rearranged default/active unit args.

..

python deckkeywords: workable.

python deckkeyword: testing rewrite.

python deckkeyword w/units: most test work.

...

python support for deckkeyword w/ dimensions.
 2019-10-24 07:13:31 +02:00
Steinar Foss
1a8e9979d8 BOX keyword: using defaultApplied. 
moved failed box-test from python to cpp.

setKeywordBox: using defaultApplied rather than hasvalue.

EclipseStateTEsts. TextBox: use 1* instead of *.

corrected box_bug.
 2019-10-23 15:47:25 +02:00
Joakim Hove
e7e25beea5 Use const& to avoiw warnings 2019-10-18 08:34:12 +02:00
Joakim Hove
0c50d96ed0 Remove trailing whitespace 2019-10-18 08:32:49 +02:00
Joakim Hove
e815194e21 Merge pull request #1112 from stefoss23/remove_common_state 
Remove common state
 2019-10-17 06:58:25 +02:00
Bård Skaflestad
288be7f0dc Drop libecl From Python Setup 
Suggested by [at]akva2.
 2019-10-16 20:03:08 -05:00
Steinar Foss
fe8692f623 schedule.cpp: removed unused function. 2019-10-16 14:20:16 +02:00
Steinar Foss
0e5c14568e removed common_state. 2019-10-16 13:59:00 +02:00
Joakim Hove
0f03777b16 Merge pull request #1106 from joakim-hove/setup-test-fixup 
Fix spelling error
 2019-10-15 09:51:50 +02:00
Joakim Hove
1bab7f7aa3 Fix spelling error 2019-10-15 08:11:04 +02:00
Joakim Hove
2c6d1e0e37 Use absolute import for test util 2019-10-15 00:39:13 +02:00
Joakim Hove
5269f52291 Merge pull request #1075 from joakim-hove/python-install 
Add Python copy/install hack
 2019-10-14 18:46:48 +02:00
Joakim Hove
7dc77d1ca3 Install PYTHON Modules when running jenkins 2019-10-14 15:53:31 +02:00
Joakim Hove
59b73a0667 Change the python installation code 
- Main cmake based python installation is based on small script install.py and
  not setup.py
- Python installation is guarded by cmake switch OPM_INSTALL_PYTHON
- Configure convenience shell script setup-install.sh for setup.py based
  installation.
- Remove PYTHONPATH hacks from setup.py
 2019-10-14 13:13:09 +02:00
Steinar Foss
a2a016951f python unit_system name. 2019-10-13 22:53:56 +02:00
Steinar Foss
a177d3b887 python/cxx/export.hpp: rearranged UnitSystem position. 2019-10-11 22:40:35 +02:00
Steinar Foss
c0bd19c59e python: added class UnitSystem. 2019-10-11 22:02:54 +02:00
Joakim Hove
9af248f889 Merge pull request #1072 from stefoss23/python_deck_values 
python: new DeckKeyword constructor takes DeckRecords
 2019-10-11 10:57:14 +02:00
Steinar Foss
92f69d7648 removed sunbeam.py. 2019-10-10 12:57:49 +02:00
Steinar Foss
bad1b1d3fb removed parser_module.py. 2019-10-10 12:56:51 +02:00
Steinar Foss
0e1339e648 removed all test suppoert for parser_module.py. 2019-10-10 12:54:22 +02:00
Steinar Foss
3cc205ee93 ELIMINATED 'properties.py'. 2019-10-10 12:54:22 +02:00
Steinar Foss
ad564ad651 python connection: exposed directly via pybind11. 
python connection. added property pos.

removed shedule.py.

test_connection.py passed.

test_wells.py: test_completion passes.

removed opm.io.config.

renamed test_state2.py -> test_state.py.
 2019-10-10 12:54:40 +02:00
Steinar Foss
223fe5e7df python: rewrite of tests using ParseContext. 
test_state: recalled slash test and made it work.

...

test_parse_deck ok.
 2019-10-08 17:30:56 +02:00
Steinar Foss
3bce48586a Python: DeckKeyword: can accept DeckValues( parserkw, [["5*$VALUE"]]) 
python : deckkeyword accepts 5*.

...
 2019-10-08 11:04:15 +02:00
Steinar Foss
7555c00ac3 python DeckKeyword constr. resolved nested try blocks. 
...
 2019-10-06 19:17:14 +02:00
Joakim Hove
cefdd86f1b Merge pull request #1071 from joakim-hove/python-install 
Use ${PYTHON_EXECUTABLE} instead of 'python' in CMakeLists.txt
 2019-10-05 07:37:38 +02:00
Steinar Foss
6865278ac5 pyhon DeckKeyword: New constructor takes parserkeyword and list of records. 
python Deckkeyword: can init with empty records.

python Deckkeyword: can record simple records, but not defaults.

python deckvalue: can take defauløt values.
 2019-10-04 21:07:06 +02:00
Joakim Hove
204ea1a1a2 Use ${PYTHON_EXECUTABLE} instead of 'python' in CMakeLists.txt 2019-10-04 20:14:27 +02:00
Joakim Hove
1aa4685b62 Link to zlib in setup.py libraries 2019-10-02 18:42:23 +02:00