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

813 Commits

Author SHA1 Message Date
Joakim Hove
02f88ce8ff Added EclipseGrid to the EclipseState class 2014-04-24 09:01:58 +02:00
Joakim Hove
7905cbf462 Removed extra , 2014-04-23 23:01:35 +02:00
Joakim Hove
8f1a9953d5 Removed contextDependent dimension 2014-04-23 23:00:42 +02:00
Joakim Hove
1f04b4d3b8 Merge pull request #180 from andlaus/add_weltarg 
add WELTARG keyword
 2014-04-23 22:59:35 +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
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
Joakim Hove
86ee7b5805 Merge pull request #182 from atgeirr/warning-suppresssion 
Warning suppresssion
 2014-04-17 22:34:08 +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
41ddb2c460 Rename local variable to avoid shadowing. 2014-04-15 09:26:25 +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
Andreas Lauser
5d0c2283a6 add the TLMIXPAR keyword 
this is used by opm-polymer...
 2014-04-14 14:16:05 +02:00
Andreas Lauser
0bcd958c31 fix the PLYMAX keyword 
- fix typo: use "POLYMER" instead of "PLOYMER"
- according to the Eclipse RM, the size of the table is given by the
  "NTMISC" item of the "MISCIBLE" keyword...
 2014-04-14 14:16:04 +02:00
Andreas Lauser
262fa27d1e add the MISCIBLE keyword 
it's only specified by R300, but it is required TLMIXPARAM which is used by
opm-polymer...
 2014-04-14 14:16:04 +02:00
osae
475f1aede6 New keywords ENDNUM; IMBNUM and SATNUM. 2014-04-14 12:47:41 +02:00
Joakim Hove
eeb4403faf Fixed typo Pvdco -> Pvcdo in installed headers 2014-04-12 08:32:23 +02:00
Andreas Lauser
204a4b6742 add WELTARG keyword 
this one is used deep inside opm-porsol and features a nasty context
dependent parameter...
 2014-04-11 16:56:36 +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
osae
c26ba00794 Added default values for keywords ENPTVD/ENKRVD 
Setting defaulted parameters to -1 for later identification.
 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
Kristian Flikka
666ba3e607 Temporary revert and test removal - pending float/double cleanups 2014-04-04 15:39:29 +02:00
Kristian Flikka
029e461cd4 Desperate fix for build dependency on generated source file 2014-04-04 15:33:36 +02:00
Joakim Hove
71edc6336a Merge pull request #164 from atgeirr/remove-wrong-constructor 
Deleted unneeded default constructor.
 2014-04-04 14:35:14 +02:00
Joakim Hove
4625f079e6 Merge pull request #156 from AtleH/improvedbuild 
Auto-detect of keyword changes in build
 2014-04-04 13:40:03 +02:00
atleh
9d1d161def Merged CMake conflicts 2014-04-04 13:39:11 +02:00
atleh
07809cae2e Ready for merge? 2014-04-04 12:04:21 +02:00
atleh
02a915ba2d Adjustments in createDefaultKeywordList 2014-04-04 12:02:40 +02:00