OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
942 Commits 18 Branches 75 Tags
317192ca637a1ac9cbfc2b3831261c2ed57aae0e
Commit Graph

942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Joakim Hove
4c477b6f70 Added class OrderedMap which is insert-order preserving map. 2014-05-02 17:02:09 +02:00
Joakim Hove
71e9ac25b7 Merge pull request #201 from andlaus/table_improvements 
Table improvements
 2014-05-02 17:00:23 +02:00
Andreas Lauser
b7cbf1121a EclipseGrid: do not add integers to the addresses of const char* pointers 
this results in funny error messages and (if the integers are large
enough) in segfaults. thanks to @atgeirr for pointing this out!
 2014-04-30 12:27:01 +02:00
Joakim Hove
7bf588a166 Added DEPTHZ as alternative to TOPS. 2014-04-29 21:30:45 +02:00
Andreas Lauser
1909e22f48 fix the "number of table" calculation for multi-record tables 
It turns out that the empty-record detection worked fine, but that the
last empty record of a keyword is ignored by opm-parser for reasons
which are not clear to me...

Now all unit tests pass.
 2014-04-28 21:12:38 +02:00
Andreas Lauser
808e2d3717 rename SimpleTable to SingleRecordTable and SimpleMultiRecordTable to MultiRecordTable 
because what's simple is in the eye of the beholder...
 2014-04-28 18:29:44 +02:00
Andreas Lauser
de38673ce4 table tests: expand them considerably and actually run them 
In the current version, the runTimeMapTest binary was run because of a
copy-and-pasto. oops.

Also, not all of the tests pass but that is because of another problem
of opm-parser for which I don't know a good fix: It currently seems to
be impossible to specify empty records if there are non-defaulted
items in the JSON keyword specification, but such empty records are
used as table separators by Eclipse...
 2014-04-28 18:16:23 +02:00
Andreas Lauser
0713a3a767 add some comments to the capillary pressure retrival methods of S{g,w}ofTable 
that's because the Eclipse capillary pressure definitions
inconsistent: SWOF specifies the "water-oil capillary pressure" as $p_o
- p_w$, while SGOF uses $p_g - p_o$ as the "oil-gas capillary pressure".
 2014-04-28 17:05:31 +02:00
Andreas Lauser
4b2ab72eef add numTables() method to the table classes 
For SimpleTable, that is simply the number of records in a keyword, for
MultiRecordTables, it is the number of _empty_ records.

this patch makes supporting multi-PVT easier and cleaner.
 2014-04-28 17:05:31 +02:00
Joakim Hove
3718df3972 Added assert of the size of the vectors used to create a CornerPoint grid. 2014-04-27 23:51:43 +02:00
Joakim Hove
4672e386f0 Added getDataSize() method to DeckKeyword. 2014-04-27 23:51:43 +02:00
Joakim Hove
d1ac634991 Added keyword SMRYDIMS 2014-04-27 23:51:43 +02:00
Joakim Hove
62f935aad5 Merge pull request #192 from andlaus/check_filesystem_case_sensitiveness 
add a cmake test to check if the used file system is case sensitive
 2014-04-27 23:49:50 +02:00
Joakim Hove
6489c1269c Removed extra "," from WELTARG 2014-04-27 23:21:36 +02:00
Andreas Lauser
017e238d27 fix the PVCDO keyword 
this was just a copy of PVTW and is quite embarassing. We should
prevent this in the future by making sure that the filename
corresponds to the JSON name when generating the C++ keyword list...
 2014-04-26 11:44:09 +02:00
Joakim Hove
7cfbdf7904 The data of the mapaxes keyword was incorrectly accessed as a data() keyword. 2014-04-24 11:53:38 +02:00
Joakim Hove
1d672e53c1 Added keyword SMRYDIMS 2014-04-24 11:53:38 +02:00
Joakim Hove
4c9c690817 Added size:1 to some summary kewyords. 2014-04-24 11:51:50 +02:00
Joakim Hove
4579aa617c Added keyword SMRYDIMS 2014-04-24 11:51:50 +02:00