OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,758 Commits 18 Branches 75 Tags
baf4f7fbac0fb333d300d771673f79aa27935ea5
Commit Graph
6758 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove baf4f7fbac Merge pull request #1168 from stefoss23/add_keywords_N 
added keywords beginning w/ N.
 2019-10-27 16:12:50 +01:00
Steinar Foss cc11890e31 added keywords beginning w/ N. 
added keywords NETWORK, NEWTON.

added keywords NEXT, NEXTSTPL, NINENUM.
 2019-10-26 12:32:57 +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
Joakim Hove 0fb92e9121 Merge pull request #1157 from joakim-hove/udq-token-types 
Udq token types
 2019-10-25 11:58:08 +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 78b32803ff Merge pull request #1162 from joakim-hove/python-enable 
Minor change to python enable script
 2019-10-25 10:00:23 +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 464cf6a51f Merge pull request #1068 from GitPaean/fixing_aquifer 
improvements related to Aquifer modeling
 2019-10-25 09:01:19 +02:00
Joakim Hove 162d0e0902 Minor change to python enable script 2019-10-25 08:54:40 +02:00
Kai Bao b9bc222e81 addressing reviewing comments from PR #1068 2019-10-24 23:01:34 +02:00
Kai Bao 3691c6e724 an aquifer connection need to between active and inactive cells 
unless we specify we want to have aquifer within the inner cell of the
reservoir.
 2019-10-24 22:01:28 +02:00
Kai Bao a58daf17b5 correcting the definition of keyword AQUFETP 
default_value looks like not working in term of specifying default value
for the item.
 2019-10-24 22:01:28 +02:00
Joakim Hove 50b3aef1fa Merge pull request #1158 from joakim-hove/Q 
Keywords on Q
 2019-10-24 18:41:30 +02:00
Joakim Hove 4b8628a873 Keywords on Q 2019-10-24 17:06:28 +02:00
Joakim Hove 0af4a5510e Merge pull request #1154 from stefoss23/add_keywords_M1 
Added more keywords beginning with M.
 2019-10-24 16:53:25 +02:00
Joakim Hove 7e2d45cf66 Export all UDQTokens in use from UDQDefine 2019-10-24 16:51:15 +02:00
Joakim Hove 4c4bee4285 Merge pull request #1156 from atgeirr/add-missing-include 
Add missing <string> include, necessary on clang.
 2019-10-24 16:39:07 +02:00
Atgeirr Flø Rasmussen 4cc54aa324 Add missing <string> include, necessary on clang. 2019-10-24 15:44:34 +02:00
Steinar Foss 11a25e02c2 added more keywords beginning with M. 
added keywords MULTOUTS, MULTREAL, MULTREGD.

added keywords MULTREGH, MULTSIG, MULTSIGV.

added keywords NARROW, NCONSUMP, NEFAC.
 2019-10-24 11:48:02 +02:00
Joakim Hove a9a7166e3d Merge pull request #1153 from joakim-hove/move-fluxnum 
Moved FLUXNUM to GRID section
 2019-10-24 09:42:28 +02:00
Joakim Hove 0421173686 Merge pull request #1152 from joakim-hove/deckkeyword-unit 
Deckkeyword unit
 2019-10-24 08:43:18 +02:00
Joakim Hove 15eda478f3 Merge pull request #1149 from tskille/ESmry 
fixing severe performance issue with ESmry
 2019-10-24 08:42:50 +02:00
Joakim Hove d7a52167f3 Moved FLUXNUM to GRID section 2019-10-24 08:39:53 +02:00
Joakim Hove 8f0aa75509 Merge pull request #1148 from joakim-hove/extract-operate 
Extract operate
 2019-10-24 07:18:09 +02:00
Joakim Hove 6525a7b19f Merge pull request #1143 from joakim-hove/box-data-index 
Add data_index to Box::index_list
 2019-10-24 07:17:57 +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
Joakim Hove 1a05f2fcd1 Merge pull request #1151 from stefoss23/box_bug 
BOX keyword: using defaultApplied.
 2019-10-24 07:08:11 +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
Torbjørn Skille e3e2a6e8ea fixing severe performance issue with ESmry 2019-10-23 14:33:17 +02:00
Joakim Hove 35ed4bbca4 Use a lambda for the operate functions 2019-10-23 07:49:26 +02:00
Joakim Hove ccb3ddced9 Extracted OPERATE function to separate file 2019-10-23 07:25:41 +02:00
Joakim Hove cadadbde4d Merge pull request #1145 from joakim-hove/properties-testdata 
Properties testdata
 2019-10-22 17:18:48 +02:00
Arne Morten Kvarving 76c866f816 Merge pull request #1146 from akva2/fix_closed_tests_prs 
fixed: allow branch to exist in opm-tests PR repo, but no PR
 2019-10-22 10:11:59 +02:00
Joakim Hove 304791683f Merge pull request #1121 from joakim-hove/multregt-edit-warning 
Add warning for MULTREGT in EDIT section
 2019-10-22 10:02:00 +02:00
Arne Morten Kvarving d472485418 fixed: allow branch to exist in opm-tests PR repo, but no PR 
happens when people manually close a previously opened PR
for the branch.
 2019-10-22 08:38:41 +02:00
Joakim Hove fb63f61385 Merge pull request #1141 from joakim-hove/formatted-inf 
Formatted inf
 2019-10-22 08:25:16 +02:00
Joakim Hove 1af3ab2008 Merge pull request #1142 from joakim-hove/multz-edit 
Multiply MULT(XYZ) keywords in the EDIT section
 2019-10-22 08:24:32 +02:00
Joakim Hove f81a84da42 Update testdata for a stricter 3D property parser 
- Keywords should have correct number of elements
 - Should be in the correct section
 2019-10-22 08:23:00 +02:00
Joakim Hove 760140397d Add dimension "1" to factor in MULTIPLY keyword 2019-10-22 08:22:51 +02:00
Atgeirr Flø Rasmussen cf26ecac5e Merge pull request #1138 from bska/transpose-density-table 
TAB Vector (INIT): Store Phase Density Data By Columns
 2019-10-21 23:06:27 +02:00
Joakim Hove 2f8916392c Merge pull request #1144 from GitPaean/converting_aquifer_test_unix 
converting AquanconTests.cpp to be unix format.
 2019-10-21 18:27:19 +02:00
Kai Bao 18564a465c converting AquanconTests.cpp to be unix format. 2019-10-21 17:00:12 +02:00
Joakim Hove 1ad4a03ac1 Add data_index to Box::index_list 2019-10-21 15:45:39 +02:00
Joakim Hove 5741ff8034 Multiply MULT(XYZ) keywords in the EDIT section 2019-10-21 11:53:09 +02:00
Joakim Hove abb70835fb Read and write formatted representations of NAN and INF 2019-10-21 09:29:13 +02:00