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

6944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joakim Hove
33e72c2a77 Slightly more relaxed conversion of formatted double string 2019-10-21 09:24:03 +02:00
Joakim Hove
e02cce3fde Use pass by value in string to double conversion 2019-10-21 09:24:03 +02:00
Joakim Hove
08d6888992 Remove trailing whitespace 2019-10-21 09:24:03 +02:00
Bård Skaflestad
18a840edba Add Unit Tests for Density Table Output 2019-10-21 00:16:30 -05:00
Bård Skaflestad
af97eaf821 TAB Vector (INIT): Store Phase Density Data By Columns 
Specifically, store oil density values for every region before water
density values for every region, and gas density values after water
density values for every region.

This is the format expected in ECLIPSE's INIT file, and used by
ResInsight's fall-back flux calculator mode for flow diagnostics.
 2019-10-20 23:25:57 -05:00
Joakim Hove
737b2127d8
Merge pull request #1100 from totto82/convertTargets 
convert targets.
 2019-10-20 17:50:25 +02:00
Joakim Hove
4fabb7b486
Merge pull request #1122 from joakim-hove/location 
Add small struct DeckKeyword::Location to simplify error reporting
 2019-10-19 23:30:43 +02:00
Joakim Hove
d3f33882b9
Merge pull request #1128 from joakim-hove/exc-warning 
Exc warning
 2019-10-19 22:34:15 +02:00
Joakim Hove
f39de00b4a Add warning for MULTREGT in EDIT section 2019-10-19 20:13:48 +02:00
Joakim Hove
2534bbe0a3
Merge pull request #1123 from blattms/fix-unused-parameter-oython 
Fixed unused parameter warning in PythonInterp.hpp
 2019-10-19 20:13:14 +02:00
Markus Blatt
5584d6bb0a Fixed unused parameter warning in PythonInterp.hpp 2019-10-18 08:36:28 +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
f274257c94 Pass location when constructing DeckKeyword 2019-10-18 08:26:33 +02:00