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

6879 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steinar Foss
239d562581 testfile ACTIONC.cpp: removed 'if 0'. 
test ACTIONX, uncommented TestActions.

ACTIONX tests: uncommented all.
 2019-11-15 15:24:16 +01:00
Joakim Hove
c309c6a7e6 Merge pull request #1226 from blattms/fix-type-more-info-compareECL 
Fixed typos and included more info into compareECL's exceptions
 2019-11-15 11:41:11 +01:00
Markus Blatt
6761f3dc57 Fixed typos and included more info into compareECL's exceptions 2019-11-15 10:20:33 +01:00
Joakim Hove
6388fbe584 Merge pull request #1224 from joakim-hove/satfunc-init-refactor 
Satfunc lookup: prepare for only active cells
 2019-11-15 09:59:48 +01:00
Joakim Hove
d99d1dfcc3 Merge pull request #1220 from joakim-hove/COPYREG 
More 3D Property changes
 2019-11-15 09:59:33 +01:00
Joakim Hove
05e006e7a9 Changed SatfuncPropertyInitializers to use references internally 2019-11-15 08:03:03 +01:00
Joakim Hove
63f4b5494d Prepare saturation function lookup to only consider active cells 2019-11-15 08:03:03 +01:00
Joakim Hove
c8e2925134 Split saturation functions satnumApply and imbnumApply 2019-11-15 08:03:03 +01:00
Joakim Hove
7b2048ec22 Add assign(const std::vector<T>&) to FieldProps::FieldData 2019-11-15 07:55:29 +01:00
Joakim Hove
ffc67f05cf Reorganise in FieldProps 2019-11-15 07:55:29 +01:00
Joakim Hove
5d852bf3f1 Merge pull request #1223 from joakim-hove/fp-tables 
Add TableManager argument to FieldProps constructor
 2019-11-15 07:54:33 +01:00
Joakim Hove
36c1798a38 Merge pull request #1222 from joakim-hove/grid-properties-testdata 
Update testdata to one element for each cell
 2019-11-15 07:54:15 +01:00
Atgeirr Flø Rasmussen
0ea0f07b20 Merge pull request #1225 from atgeirr/fix-abs 
Fix abs() ambiguity, add copyright headers.
 2019-11-14 23:11:01 +01:00
Atgeirr Flø Rasmussen
87a0e0e402 Fix abs() ambiguity, add copyright headers. 2019-11-14 13:09:35 +01:00
Joakim Hove
feec9c150d Merge pull request #1219 from joakim-hove/box-keyword-constructor 
Simplify the BOX implementation - prepare to drop the manager
 2019-11-14 12:15:53 +01:00
Atgeirr Flø Rasmussen
6d83672f94 Merge pull request #1217 from joakim-hove/rename-well2 
Rename Well2 -> Well and  Group2 -> Group
 2019-11-14 10:33:45 +01:00
Joakim Hove
7fbbb6d71a Add TableManager argument to FieldProps constructor 2019-11-14 07:14:54 +01:00
Joakim Hove
60d3a074b9 Update testdata to one element for each cell 2019-11-13 23:57:59 +01:00
Joakim Hove
613ec70dab Rename Well2 -> Well and Group2 -> Group 2019-11-13 23:19:26 +01:00
Joakim Hove
3f1cf0bc8a Changed box implementation 2019-11-13 20:19:47 +01:00
Bård Skaflestad
8cd72f1ff0 Merge pull request #1209 from atgeirr/fix-timemap-restartintervals 
Fix TimeMap::isTimestepInFirstOfMonthsYearsSequence() method.
 2019-11-13 15:00:45 +01:00
Arne Morten Kvarving
dd8c328ca7 Merge pull request #1150 from tskille/summary 
new program summary
 2019-11-12 14:50:37 +01:00
Torbjørn Skille
59e0c39558 New program summary based on OPM I/O classes 2019-11-12 13:27:26 +01:00
Joakim Hove
eda68f74ae Merge pull request #1191 from joakim-hove/field-properties-regions 
Field properties regions
 2019-11-12 08:37:19 +01:00
Joakim Hove
6afc118c94 Started on region operations in FieldProps implementation 2019-11-12 08:18:13 +01:00
Joakim Hove
3421b25d8e Merge pull request #1211 from joakim-hove/monkey-patch-rename 
Minor refactor to monkey-patching
 2019-11-11 16:38:43 +01:00
Joakim Hove
d0685c1e6c Merge pull request #1212 from joakim-hove/item-rename 
Item rename
 2019-11-11 16:38:26 +01:00
Joakim Hove
7356c76c58 Merge pull request #1204 from joakim-hove/summarynode-location 
Add Location member to SummaryNode instances
 2019-11-11 16:37:43 +01:00
Joakim Hove
f17eefcaf7 Add Location member to SummaryNode instances 2019-11-11 15:31:36 +01:00
Joakim Hove
0988f26ad9 Merge pull request #1213 from goncalvesmachadoc/patch-1 
Add summary keywords FCPR, FCPT and CCPT
 2019-11-11 13:26:44 +01:00
Cintia Goncalves Machado
7a274b2717 Add summary keywords FCPR, FCPT and CCPT 2019-11-11 09:26:36 +01:00
Joakim Hove
af4a2d78f9 Update test data to use correct region 2019-11-11 07:48:47 +01:00
Joakim Hove
24469f7a5e Renamed item in COPYEREG keyword 2019-11-11 07:35:25 +01:00
Joakim Hove
efac465ebd Minor refactor to monkey-patching 2019-11-10 21:09:35 +01:00
Atgeirr Flø Rasmussen
4fc71e352e Merge pull request #1205 from totto82/defaultNUPCOL 
Change default NUPCOL to 12
 2019-11-08 17:38:20 +01:00
Atgeirr Flø Rasmussen
b787a1a259 Fix TimeMap::isTimestepInFirstOfMonthsYearsSequence() method. 2019-11-08 17:26:02 +01:00
Tor Harald Sandve
0771e555a7 Change default NUPCOL to 12 2019-11-08 10:44:32 +01:00
Joakim Hove
1d95cd8248 Merge pull request #1200 from goncalvesmachadoc/goncalvesmachadoc-addProdInjReportPRT 
Add WVIR
 2019-11-07 16:22:06 +01:00
Joakim Hove
6a01e4af35 Merge pull request #1201 from stefoss23/gconsump 
Schedule handles keyword GCONSUMP.
 2019-11-07 12:07:31 +01:00
Joakim Hove
632708acd2 Merge pull request #1203 from GitPaean/fixing_aqufetp_unit 
correcting the unit in the AQUFETP definition
 2019-11-07 10:20:39 +01:00
Steinar Foss
a1c5aaa4d4 GConSump/sale: add does not rewrite groups. 2019-11-07 10:00:54 +01:00
Steinar Foss
d86ea3cb30 GConSump/Sale: using default constructor. 2019-11-07 09:42:41 +01:00
Kai Bao
cda9ba9363 correcting the unit in the AQUFETP definition 2019-11-06 22:05:35 +01:00
Joakim Hove
a3090fd88f Merge pull request #1181 from joakim-hove/tskille_pybind_eclio 
Tskille pybind eclio
 2019-11-06 16:39:30 +01:00
Steinar Foss
f75c3921e5 Schedule handles keyword GCONSUMP. 
GConSump: added and linked soruce files.

gconsump added to dynamicstate.

added handleGCONSUMP.

GConSump: add.

GConSump: has.

GConSump: get.

GConSump: added UDA values.

GConSump: added network_node.
 2019-11-06 15:12:25 +01:00
Cintia Goncalves Machado
db34bcaa21 Add WVIR 
Add well voidage injection rate.
 2019-11-06 14:58:35 +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