Commit Graph

909 Commits

Author SHA1 Message Date
Andreas Lauser
09c5a24473 add GROUP_PROBE 2014-06-29 14:32:06 +02:00
Andreas Lauser
d4409dbae0 add BLOCK_PROBE 2014-06-29 14:32:06 +02:00
Andreas Lauser
49b48662ef change the TVDP keywords to use regular expressions instead of wildcards 2014-06-29 14:32:06 +02:00
Andreas Lauser
fee11596f8 allow underscores in deck names and disallow sharps
underscores are used by a few of the summary specifier keywords
(e.g. BPR_X), but after closer inspection '#' symbols are not.
2014-06-29 14:32:06 +02:00
Andreas Lauser
96904b00f4 allow keywords to match regular expressions as their deck name
the RE used is specified via the "deck_name_regex" in the JSON file of
the respective keyword. A deck name is assumed to match a given parser
internal keyword if the deck name is valid and if it is either in the
list specified by the "deck_names" entry or if it matches the regular
expression.

This functionality is useful to implement the well probes for the
tracers as well as replacing the current "wild card keyword"
implementation which only allows a star as a suffix.
2014-06-29 14:32:06 +02:00
Andreas Lauser
96ba492cf7 fix build
*grr* spurious comma! Though I'm wondering a bit why it compiled on my
 machine yesterday...
2014-06-26 11:18:22 +02:00
Kristian Flikka
81dbacc4e1 Changed from semicolon to comma, to fix compilation failure 2014-06-26 10:10:19 +02:00
Joakim Hove
6d88a8dabe Added SWATINIT as supported grid property. 2014-06-25 18:26:31 +02:00
Joakim Hove
93c5ac23f2 Typo in install target 2014-06-25 12:37:41 +02:00
Joakim Hove
c9f5e4682e Fixed trivial typo. 2014-06-25 12:22:25 +02:00
Joakim Hove
390f996f49 Merge pull request #245 from andlaus/add_ntg_gridproperty
grid properties: add support for the NTG keyword
2014-06-25 12:09:03 +02:00
Joakim Hove
09f928d52b Merge pull request #244 from joakim-hove/TransMultContainer
Trans mult container
2014-06-25 12:02:24 +02:00
Joakim Hove
59e6215967 Added TransMult object to EclipseState 2014-06-25 12:01:18 +02:00
Joakim Hove
a0ab4d4ecb Added transMult container - which only returns 1.0 2014-06-25 12:01:07 +02:00
Joakim Hove
afc83767d7 Added new enum to enumerate the different face directions. 2014-06-25 11:58:22 +02:00
Andreas Lauser
1a2bacf5d0 grid properties: add support for the NTG keyword
Whoever came up with that keyword deserves a spanking because its
semantics are adapting thickness of the grid layers using the rock
properties without modifying the grid (and thus the output is not
showing what is actually used). As I understood that whole affair,
this is also done incorrectly, because the flow is not distorted in
depth direction but this the permeability should be divided by the NTG
values as the fluids seep through the thinner layers more quickly...

Anyway, we have to implement it, so here we go.
2014-06-25 10:23:24 +02:00
Joakim Hove
e732564fb4 Merge pull request #242 from andlaus/deck_keyword_lists
Implement deck keyword lists
2014-06-20 13:54:30 +02:00
Andreas Lauser
7a015fcb76 use deck keyword name list for the well output specifier keywords 2014-06-13 13:54:24 +02:00
Andreas Lauser
5f949c11c3 add support for parser keywords specifying to multiple deck keywords
Say hello to the complete set of well, region, field and group output
specifiers soon...
2014-06-13 13:17:03 +02:00
Joakim Hove
a2d9d45da6 Added Parser test of deck with TOPS keyword. 2014-06-11 16:42:37 +02:00
Joakim Hove
5a13369b6d Added EclipseGrid::getCellVolume() and getCellCenter() 2014-06-11 16:42:37 +02:00
Joakim Hove
db2cbf9e87 Fixed bug in extending TOPS vector. 2014-06-11 16:42:36 +02:00
Andreas Lauser
d820a4d435 change construction of ParserKeyword objects to the factory paradigm
this makes it more explicit what the object is supposed to represent.
2014-06-11 15:08:58 +02:00
Andreas Lauser
b449a783f9 property operators: add quite a few additional keywords
These are all keywords which are used by the Norne deck within some
property modifiers plus all variants of these. (sans the variants for
radial grids which are completely pointless IMO.) The chances that
keywords which have not been added yet can also be used are very close
to 100%, though.

Note that the default values for these keywords are currently
incorrect as the Eclipse RM states that the values must be looked up
in their corresponding table if the keyword is left unspecified (see
e.g. the documentation SWU). This probably means that we need to
implement "ghosty" keywords which magically appear if they have not
been explicitly specified or maybe we should only provide them in
EclipseState to be able to do the context dependent table look-up
"vodoo"...
2014-06-10 12:21:14 +02:00
Joakim Hove
90562916b5 Merge pull request #230 from andlaus/remove_dimensionString_from_integer_grid_properties
Grid properties: get rid of the dimension string for integer properties
2014-06-10 06:43:37 +02:00
Arne Morten Kvarving
d85782d9f5 fixed: keep a copy instead of a reference
storing string references are not a good idea, since temporaries are
often used. fixes RawRecordTest on my box
2014-06-05 11:48:17 +02:00
Andreas Lauser
6f290a750d Grid properties: get rid of the dimension string for integer properties
this uses a small amount of template magic, to automatically change
the API of the GridProperty class depending on wheter it is
instantiated for double or for int.
2014-06-05 10:12:23 +02:00
Kristian Flikka
ac5dc9e6aa Added missing headers, to fix install-based build of opm-polymer 2014-06-04 14:22:09 +02:00
Andreas Lauser
52c5d3fbcb make GCC 4.4 happy
there was a "typename" outside of a template, but because the
syntactic sugar is created by the Boost unit testing framework, it was
not clear wheter it was a template or not.

Also, some harmless warnings have been fixed. These only appeared
because a few variables have recently been converted from int to
size_t...
2014-06-03 22:51:03 +02:00
Andreas Lauser
7c53febf57 fix the ADD and EQUALS grid property modifiers 2014-06-03 22:42:23 +02:00
Joakim Hove
c7429dbb23 Fixed bug: intGridProperties -> doubleGridProperties 2014-06-03 22:42:23 +02:00
Joakim Hove
491ccd9a8d Added #include <cstddef> to Box.hpp 2014-06-03 22:42:23 +02:00
Joakim Hove
7a16646cd8 Added throw when trying to load from unsupported keyword. 2014-06-03 22:42:23 +02:00
Joakim Hove
052fb7afad Fix stupid typo 2014-06-03 22:42:23 +02:00
Joakim Hove
1fa84d1923 Removed unused method argument. 2014-06-03 22:42:23 +02:00
Joakim Hove
3da0c228b9 Using size_t instead of int for EclipseGrid::getN? 2014-06-03 22:42:23 +02:00
Joakim Hove
b52ffe5a4a Avoid use of {} in init to satisfy clang. 2014-06-03 22:42:23 +02:00
Joakim Hove
73d88280a5 Renamed getXXXProperty -> getXXXGridProperty 2014-06-03 22:42:23 +02:00
Joakim Hove
40b15c59b3 Added const qualifier to EclipseState::getxxxProperty() methods. 2014-06-03 22:42:23 +02:00
Joakim Hove
5e56f16369 Added double properties for e.g. PERM and PORO to the EclipseState 2014-06-03 22:42:23 +02:00
Joakim Hove
7269924543 Added name() property to section objects. 2014-06-03 22:42:23 +02:00
Joakim Hove
6b29eb5176 Supporting the ADD and EQUALS keywords. 2014-06-03 22:42:23 +02:00
Joakim Hove
eb9e11849e Added support for MULTIPLY keyword. 2014-06-03 22:42:23 +02:00
Joakim Hove
6301fd1ad7 EclipseState now handles COPY keyword. 2014-06-03 22:42:23 +02:00
Joakim Hove
bd1c756e30 Added copyFrom() property to GridProperty 2014-06-03 22:42:23 +02:00
Joakim Hove
22ed38b319 Added iterators begin() and end() to DeckKeyword class. 2014-06-03 22:42:23 +02:00
Joakim Hove
5c04cd4540 Basic BOX support when reading integer properties. 2014-06-03 22:42:23 +02:00
Joakim Hove
f5c5722508 ERT-656: Changed GridProperty to take (nx,ny,nz) instead of volume. 2014-06-03 22:42:23 +02:00
Joakim Hove
1d0e3c9772 Added BoxManager() to keep track of the currently active input box. 2014-06-03 22:42:23 +02:00
Joakim Hove
2a5ec9aac9 Added Box::equal() comparison function. 2014-06-03 22:42:23 +02:00