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

680 Commits

Author SHA1 Message Date
Arne Morten Kvarving
8cb2646995 fixed: initialize members 2014-05-15 14:46:16 +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
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
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
7cfbdf7904 The data of the mapaxes keyword was incorrectly accessed as a data() keyword. 2014-04-24 11:53:38 +02:00
Joakim Hove
02f88ce8ff Added EclipseGrid to the EclipseState class 2014-04-24 09:01:58 +02:00
Joakim Hove
0591acfc3c Merge pull request #188 from joakim-hove/EclipseGrid-fixes 
Eclipse grid fixes
 2014-04-23 22:56:14 +02:00
Kristian Flikka
c23ae4653d Merge pull request #189 from joakim-hove/eclipsegrid-export 
Eclipsegrid export
 2014-04-23 21:01:50 +02:00
Andreas Lauser
fc43fdd427 add a cmake test to check if the used file system is case sensitive 
And fix the unit test for INCLUDE. This should make the test pass on
case insensitive file systems like the one of MacOS X. (Who uses that
anyway? ;))
 2014-04-23 14:56:27 +02:00
Joakim Hove
5c8493b23f Changed working directory for test reading testdata. 2014-04-23 08:18:07 +02:00
Joakim Hove
3d4ea717db Merge pull request #186 from andlaus/check_file_existence 
make sure that the file we are attempting to parse actually exists
 2014-04-22 18:32:24 +02:00
Andreas Lauser
a1de9a0e9e add a test case for the INCLUDE statement 2014-04-22 17:09:02 +02:00
Joakim Hove
b2d99fb387 Added functionality to export MAPAXES data. 2014-04-22 01:14:34 +02:00
Joakim Hove
af6f18b5aa Added methods to export the ZCORN, COORD and ACTNUM keywords from the EclipseGrid. 2014-04-22 00:20:03 +02:00
Joakim Hove
7428e7862f Merge pull request #181 from andlaus/polymer_fixes 
Polymer fixes
 2014-04-17 23:09:42 +02:00
Joakim Hove
9a6afd2a6f The ability to only specify top layer applies DX and DY as well. Fixed 
resize() usage.
 2014-04-17 22:56:06 +02:00
Joakim Hove
5343414d97 Added missing dim argument in scatterDim function. 2014-04-17 22:54:35 +02:00
Andreas Lauser
0ca3a30697 make sure that the file we are attempting to parse actually exists 
before that case was identical to an empty data file...
 2014-04-15 13:52:08 +02:00
Atgeirr Flø Rasmussen
6b4ad26a9a Renamed function arguments to avoid shadowing. 2014-04-15 09:49:23 +02:00
Atgeirr Flø Rasmussen
79e4d51597 Renamed local variable to avoid shadowing. 2014-04-15 09:49:04 +02:00
Atgeirr Flø Rasmussen
e3d167048f Commented out unused function arguments. 2014-04-15 09:48:19 +02:00
Atgeirr Flø Rasmussen
b0d93977b9 Comment out unused function argument. 2014-04-15 09:26:04 +02:00
Andreas Lauser
406f294026 add table utility classes for the PLY{ADS,MAX,ROCK,VISC} and TLMIXPAR keywords 
these are not really used as tables in the current opm-polymer code,
but the Eclipse RM says they are tables, so we should add these
classes...
 2014-04-14 16:18:37 +02:00
Joakim Hove
eeb4403faf Fixed typo Pvdco -> Pvcdo in installed headers 2014-04-12 08:32:23 +02:00
Joakim Hove
6a1b887323 Merge pull request #178 from joakim-hove/data-with-default 
Data with default
 2014-04-11 13:45:02 +02:00
Joakim Hove
d5bf1726f2 Verified behaviour of defaults (i.e. *) for multivalued items. 2014-04-11 13:42:22 +02:00
Joakim Hove
f59fd25668 Added boolan flag scalar = true to DeckItem. 
The purpose of this flag is to keep track of whether a keyword is
supposed to have only one element, i.e. scalar, or several. The
defaultApplied method only makes sense in the case of scalar items, this
method will now throw if it is called on a non-scalar item.
 2014-04-11 13:42:22 +02:00
Joakim Hove
5becf79dd1 The ParserKeyword->parse() method will throw if the raw input argument is not finished. 
Requires several changes to assure that the rawkeyword instances are
marked as finished before reacing the ParserKeyword->parse method.
 2014-04-11 13:42:22 +02:00
Andreas Lauser
7eb19083ea add PVCDO keyword and fix typo pvdco -> pvcdo 
this is used in opm-core but I doubt that these code paths have
actually been tested recently because the parser would have thrown up
as soon as it had encountered PVCDO...
 2014-04-11 11:57:32 +02:00
Joakim Hove
72b183b0c6 Merge pull request #174 from joakim-hove/double-float-grid 
Will temporarily convert double -> float before instantiating an ERT ecl...
 2014-04-08 15:48:58 +02:00
Kristian Flikka
c0e17b79bb Added two dependencies to generated files, to avoid potential build failures due to premature use of them 2014-04-08 11:49:34 +02:00
Joakim Hove
e93a377eb6 Large changes to createDefaultkeywordlist: Will create both tests and testSource in one pass. The special sorce code to create test source is removed. The test source is marked with Generated_source attribute. 2014-04-08 01:44:27 +02:00
Joakim Hove
891b8ccb3e CMake beautification. 2014-04-08 01:43:05 +02:00
Joakim Hove
0a24d926c1 The createDefaultkeywordlist program will create the generated-source/ directory if it does not exist. 2014-04-07 17:07:24 +02:00
Joakim Hove
9ebd9a227b Moved test of valid keywordname to ensure that e.g editor backupfiles are not parsed. 2014-04-07 16:54:09 +02:00
Kristian Flikka
fa3e7582be Added PROPERTY GENERATED TRUE to generated file, to avoid cmake halt. File is always generated. 2014-04-07 14:42:52 +02:00
Joakim Hove
a14dc265b5 Will temporarily convert double -> float before instantiating an ERT eclipsegrid. 2014-04-07 12:28:07 +02:00
Atgeirr Flø Rasmussen
5a1c345e3f Add preferred phase to Well class. 
This entails:
 - Adding a new data member of type Opm::Phase::PhaseEnum.
 - Adding method getPreferredPhase().
 - Adding extra constructor argument.
 - Modifying constructor call in Schedule::addWell().
 - Adding unit test for the new preferredPhase property.
 - Modifying constructor call in all the well unit tests.
 2014-04-06 23:11:38 +02:00