Commit Graph

857 Commits

Author SHA1 Message Date
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
atleh
25a5578677 Fixed bug regarding dump file usage in createDefaultKeywordList 2014-04-04 12:02:40 +02:00
atleh
c21a667f0e Some adjustments to createDefaultKeywordList. Not complete. 2014-04-04 12:02:40 +02:00
atleh
bd150b5684 Marked parameter as const 2014-04-04 12:02:40 +02:00
atleh
a6cd64afb7 added support for dump files in createDefaultKeywordList.cpp 2014-04-04 12:02:40 +02:00
atleh
47713c7a00 createDefaultKeywordList - minor refactoring 2014-04-04 12:02:40 +02:00
atleh
0505c0a9ca createDefaultKeywordList now able to generate dump file. 2014-04-04 12:02:40 +02:00
osae
e6ad224f33 Keywords for endpoint scaling: SWL and ISWL family 2014-04-04 10:24:54 +02:00
Atgeirr Flø Rasmussen
2df1761922 Deleted unneeded default constructor.
Its implementation was buggy, initialising references to temporary objects.
2014-04-04 10:05:04 +02:00
Joakim Hove
3087f33fd8 Merge pull request #155 from andlaus/schedule_trim_names
schedule: do not let us be disturbed by leading or trailing white space in names
2014-04-03 20:22:10 +02:00
atleh
77e47433a7 Ready for merge? 2014-04-03 15:18:55 +02:00
Andreas Lauser
ea1df5347d schedule tests: add some spaces around some names 2014-04-03 14:55:38 +02:00
Andreas Lauser
2a9111b9d2 Schedule: trim strings which are received from the deck
for SPE-9 only the well/group names contain spurious white space, but
I suppose that other decks also feature them in control modes, status,
etc. so it's probably a good idea to trim these as well...
2014-04-03 14:55:38 +02:00
Andreas Lauser
debe11a8f3 DeckItem: introduce getTrimmedString()
which is like getString() but with the leading and trailing white
space removed. It is intended for names which seem to not care about
such white space in Eclipse.
2014-04-03 14:32:25 +02:00
atleh
8b5bcf7947 Adjustments in createDefaultKeywordList 2014-04-03 14:16:08 +02:00
Kristian Flikka
1b085a4ea1 Merge pull request #157 from joakim-hove/OPM-75-create-grid
Opm 75 create grid
2014-04-02 22:15:56 +02:00
atleh
b96273a0f0 Fixed bug regarding dump file usage in createDefaultKeywordList 2014-04-02 15:17:18 +02:00
atleh
3429b1d93e Some adjustments to createDefaultKeywordList. Not complete. 2014-04-02 11:47:23 +02:00
Joakim Hove
3355979466 Merge pull request #162 from joakim-hove/PVTG-unit-change
Changed unit in PVTG.
2014-04-01 14:37:00 +02:00
Joakim Hove
dd91cacac4 Changed unit in PVTG. 2014-04-01 14:36:38 +02:00
Joakim Hove
94a56621c7 Merge pull request #161 from osae/kw-PVDO
New keyword PVDO
2014-04-01 14:32:55 +02:00
Joakim Hove
75107fdd32 Added keywords for SPE9. 2014-04-01 14:27:31 +02:00
osae
d0c08f83d9 New keyword PVDO 2014-04-01 14:26:05 +02:00
atleh
4d495ed94e Marked parameter as const 2014-04-01 13:38:22 +02:00
Joakim Hove
9c29c00c2b Added ability to create EclipseGrid from cornerpoint keywords. 2014-04-01 09:06:43 +02:00
Joakim Hove
edde68fa6a Added float data accessors. 2014-04-01 09:05:33 +02:00
Joakim Hove
9b446b4db9 Changed cornerpoint related keywords to use FLOAT. 2014-04-01 09:04:27 +02:00
atleh
cd20741415 added support for dump files in createDefaultKeywordList.cpp 2014-04-01 08:52:07 +02:00
atleh
77cb3e844f createDefaultKeywordList - minor refactoring 2014-03-31 14:26:35 +02:00
atleh
a3b8b57445 createDefaultKeywordList now able to generate dump file. 2014-03-31 14:25:45 +02:00
Joakim Hove
8b0acc2242 Added class EclipseGrid with constructor for cartesian grid from deck. 2014-03-31 14:19:34 +02:00
Joakim Hove
df7244418f Added ERT dependency in build of opm-parser. 2014-03-31 14:18:05 +02:00
Joakim Hove
bc461eec9d Added new keywords for parsing cartesian grid. 2014-03-28 19:10:44 +01:00
Joakim Hove
6c9d03258e Added getKeyword() method to Section class. 2014-03-28 19:09:56 +01:00