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
8137331d5d
Added new keyword PVTNUM
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
Joakim Hove
74f66a5f3c
Added constructor for sub box.
2014-06-03 22:42:23 +02:00
Joakim Hove
e820eadfeb
Added Box() class to book keep the indices in a box.
2014-06-03 22:42:23 +02:00
Andreas Lauser
ad1dfab8d7
fix spurious GCC warnings
...
The root cause are pretty (too?) strict flags w.r.t. compiler
warnings. In this case, the offenders are "-Wmissing-declarations" and
"-Wtype-limits".
2014-06-02 13:01:56 +02:00
Joakim Hove
c55cb6cb73
Fixed typo in item name
2014-05-30 23:41:25 +02:00
Joakim Hove
e6aca19601
Changed name of items in PVCDO keyword.
2014-05-30 15:28:26 +02:00
Joakim Hove
adab017f19
Merge pull request #222 from joakim-hove/fix-PVCDO
...
Changed name of oil compressibility item.
2014-05-27 13:59:07 +02:00
Joakim Hove
97f42219e8
Changed name of oil compressibility item.
2014-05-27 13:57:36 +02:00
Bård Skaflestad
317192ca63
Support 'SOIL' keyword
...
This commit introduces support for the SOIL (initial oil saturation)
keyword. This is similar to existing keywords 'SWAT' and 'SGAS' and
needed to input some decks.
2014-05-26 18:57:45 +02:00
Andreas Lauser
d71cb1aa51
parser integration test: use std::istream as a template argument for std::shared_ptr
...
gcc 4.4 has problems with such implicit conversions...
2014-05-20 13:27:37 +02:00
Andreas Lauser
0d92cd43b0
export possibility to parse an arbitrary std::istream
...
this has the potential to reduce the memory requirements of the parser
for opm-benchmarks considerably and is quite easy to add since
internally all parsing happend on istreams anyway...
The parser integration test has been extended to test the new method
as well as `parseString()` which was omitted previously. (I wonder who
introduced this without changing the test. ;)
2014-05-20 12:12:12 +02:00
Joakim Hove
4316a6fa54
Merge pull request #215 from akva2/fix_linking
...
fixed: linking due to several specializations being generated
2014-05-19 13:58:59 +02:00
Arne Morten Kvarving
c1a3cc5e2f
fixed: linking due to several specializations being generated
2014-05-19 13:43:05 +02:00
Arne Morten Kvarving
463eae9b07
fixed: don't mix member names and function parameters
2014-05-19 13:15:09 +02:00
Joakim Hove
e5c61b2816
Merge pull request #207 from joakim-hove/gridproperties
...
Gridproperties
2014-05-19 13:01:32 +02:00
Joakim Hove
b660cc1b6a
Merge pull request #213 from atgeirr/conversion-factors
...
Conversion factors
2014-05-19 12:18:34 +02:00
Atgeirr Flø Rasmussen
61d1c1a2cf
Make conversion factors more readable.
...
The using directives will put a lot into the Field and Metric
namespaces, but it should not be problematic.
2014-05-19 12:10:11 +02:00
Atgeirr Flø Rasmussen
799a52e8bc
Embedded unit system from opm-core to ensure proper conversion factors.
2014-05-19 12:10:11 +02:00
Joakim Hove
e72a0da8b1
Added GridProrpties to EclipseState.
2014-05-16 15:58:04 +02:00
Joakim Hove
ce0dc92822
Added grid properties container.
2014-05-16 15:57:47 +02:00
Joakim Hove
dc6ddc789a
Added GridProperty class.
2014-05-16 15:57:00 +02:00
Joakim Hove
2786b5e87b
Added isDataKeyword() property to deckKeyword.
2014-05-16 15:29:54 +02:00
Joakim Hove
0728dbe76a
Added grid method getCartesianSize()
2014-05-16 13:14:16 +02:00
Joakim Hove
30fe203932
Utility functions to check if deck has sections.
2014-05-16 13:10:20 +02:00
Andreas Lauser
03860714c8
fix build
...
from the error, it seems a bit like the well container was recently changed
from std::map to std::vector...
2014-05-16 12:36:13 +02:00
Kristian Flikka
82a38c1cc8
Merge pull request #208 from AtleH/wellnamewithwildcard
...
Added wildcard support in WCONINJE and WCONPROD
2014-05-16 12:28:39 +02:00
Atle Haugan
77ed32662c
Enabled integration tests in ParseWellWithWildcards
2014-05-16 11:07:01 +02:00
Arne Morten Kvarving
eef7b53fdd
fixed: don't check for unsigned values being positive
...
they definitely are. quells warnings
2014-05-15 14:46:16 +02:00
Arne Morten Kvarving
a8f216175a
fixed: remove misplaced semi-colons
2014-05-15 14:46:16 +02:00
Arne Morten Kvarving
3827ddca64
fixed: mark static symbols as such to quell warnings
2014-05-15 14:46:16 +02:00
Arne Morten Kvarving
670e8b692b
changed: don't use parameter names that conflicts with member function names
...
quells warnings (with gcc 4.8)
2014-05-15 14:46:16 +02:00
Arne Morten Kvarving
8cb2646995
fixed: initialize members
2014-05-15 14:46:16 +02:00
Atle Haugan
20380ca7c8
Changed name for (some) iterators in Schedule
2014-05-14 15:36:42 +02:00
Atle Haugan
0f4590a2f3
Removed obsolete include statements
2014-05-14 15:26:54 +02:00
Atle Haugan
47ef4ed0e6
Simplified implementation and (slightly) changed behaviour of Schedule::getWells(wellNamePattern)
...
Improved performance by checking for wildcard before entering the loop. Logic slightly changed since method now only supports wildcards at the end of the string.
2014-05-14 15:10:17 +02:00
Kristian Flikka
b5473ff1b4
Merge pull request #206 from joakim-hove/wellspecs-ordered-wells
...
Wellspecs ordered wells
2014-05-07 13:32:40 +02:00
Atle Haugan
344d02ad1c
Add support for wildcard in WCONPROD and WCONINJE keywords.
2014-05-06 09:54:37 +02:00
Joakim Hove
31c45768bf
Rename of installed headers.
2014-05-02 18:28:54 +02:00
Joakim Hove
142255268d
Using OrderedMap to hold wells in Schedule object - thereby preserving
...
well insert order.
2014-05-02 17:02:10 +02:00