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

1820 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
760140397d Add dimension "1" to factor in MULTIPLY keyword 2019-10-22 08:22:51 +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
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
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
f274257c94 Pass location when constructing DeckKeyword 2019-10-18 08:26:33 +02:00
Joakim Hove
781ced7294 Use struct Location to record file position for keywords 2019-10-17 23:57:01 +02:00
Joakim Hove
2be6235ab7 Add small struct DeckKeyword::Location to simplify error reporting 2019-10-17 23:56:34 +02:00
Markus Blatt
a3daeb9c45 Fix memory error during EclipseGrid creation with Actnum. 
We pass an int pointer to the function initCornerPointGrid.
With ACTNUM  this pointer was initialized with data pointer
of an int vector that we threw away before the function call
(otherwise it was null). To fix this we move the int-vector up one
scope.
 2019-10-17 19:09:24 +02:00
Joakim Hove
a0d5776eb9 Merge pull request #1119 from stefoss23/add_keywords_M 
Added keywords beginning w/ M.
 2019-10-17 15:06:19 +02:00
Joakim Hove
65095af82e Merge pull request #1101 from joakim-hove/R 
Add keywords starting with R
 2019-10-17 14:53:22 +02:00
Steinar Foss
f5c1ede8ee Added keywords beginning w/ M. 
added keywords MINPORV, MLANG, MLANGSLV.
 2019-10-17 13:00:28 +02:00
Joakim Hove
8bed569f7e Merge pull request #1021 from joakim-hove/use-parser-dimensions 
Use parser dimensions
 2019-10-17 11:34:49 +02:00
Tor Harald Sandve
d1d665c343 Convert targets. Tested on simple problems. 2019-10-17 11:33:17 +02:00
Joakim Hove
60870b0f5a Add keywords starting with R 2019-10-17 11:24:13 +02:00
Bård Skaflestad
428d4c41f0 Reimplement TimeMap in Terms of TimeStampUTC 2019-10-16 20:03:08 -05:00
Bård Skaflestad
eea51a12b4 Add Simple Time-Service Protocol 
Mostly for converting between std::time_t and broken-down time
stamps.  Uses UTC and std::chrono::system_clock.  May wrap in as
little as 292 years, depending on the period of system_clock.

Intended to replace various timestamping utility functions from
libecl.  A comprehensive time-service protocol for Flow is much more
work than this, and will likely not be easily realized before we
have C++17 and its much expanded time/calendar library.
 2019-10-16 20:03:08 -05:00
Bård Skaflestad
738f98a4ac Defaulted Table Column: Don't Use 'ssize_t' 
Instead, switch to 'int' for the 'before' and 'after' row indices.
The 'ssize_t' Posix type alias is not appropriate for this usage
since its range is only guaranteed to be [ -1 .. (1<<15)-1 ].
 2019-10-16 20:03:08 -05:00