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
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
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
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
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
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
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
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
Joakim Hove
edde68fa6a
Added float data accessors.
2014-04-01 09:05:33 +02:00
Atgeirr Flø Rasmussen
3ab6a5388c
Suppress unused argument warnings.
2014-03-03 11:06:44 +01:00
Atle Haugan
c81fe99fec
Fixed definition for PATHS keyword + improved unit test for same
2014-02-26 15:03:04 +01:00
Atle Haugan
e4a404023c
Removed some logging output from Parser
2014-02-21 13:14:11 +01:00
Atle Haugan
9ac0401af5
Support for PATHS keyword - first take
2014-02-21 12:56:20 +01:00
Atle Haugan
0d134e8dcd
Removed special float/double handling in ParserFloatItem
2014-02-20 07:23:56 +01:00
Atle Haugan
442d0fb7bf
Added ParserFloatItem + some tests. More tests may be needed.
2014-02-18 11:02:38 +01:00
Atle Haugan
ed17058ad3
Renamed FLOAT to DOUBLE in JSON files, tests and some code using the enum
2014-02-17 15:02:40 +01:00
Atle Haugan
d672f4f5eb
Added DOUBLE enum to ParserValueTypeEnum
2014-02-17 14:32:32 +01:00
Andreas Lauser
50f2288148
units: rename "m" to "Mass"
2014-02-11 12:45:44 +01:00
Andreas Lauser
ae73345763
units: rename "K" to "Permeability"
2014-02-11 12:45:43 +01:00
Andreas Lauser
ac60eed7d6
units: rename "1/Rs to "OilDissolutionFactor" and "Rs to "GasDissolutionFactor"
2014-02-11 12:45:43 +01:00
Andreas Lauser
bc4d467322
units replace: "mu" by "Viscosity"
2014-02-11 12:45:43 +01:00
Andreas Lauser
19d89d44cd
units: Replace "P" by "Pressure"
2014-02-11 12:45:43 +01:00
Andreas Lauser
0129a382a8
units: Replace "L" by "Length"
2014-02-11 12:45:43 +01:00
Andreas Lauser
6a97d78cc6
units: replace "t" with "Time"
...
this makes things more explicit and more readable
2014-02-11 12:45:41 +01:00
Kristian Flikka
15682a71df
Merge pull request #114 from joakim-hove/valgrind
...
Valgrind
2014-02-06 16:39:30 +01:00
Joakim Hove
ae9b57409c
Made unit system a shared_ptr to avoid memleak in test.
2014-02-06 15:45:23 +01:00
Joakim Hove
b2d4363fae
Added explicit delete in keyword test code.
2014-02-06 15:35:18 +01:00
Joakim Hove
25221c78ad
Changed order of elements in comparison: To avoid unitialized variable warning.
2014-02-06 15:08:02 +01:00
Joakim Hove
1943a05b08
Changed order of variables in comparison: avoid warning of uninitialised data.
2014-02-06 15:05:24 +01:00
Atle Haugan
825e976566
New version based on feedback from code review
2014-01-29 19:39:33 +01:00
Atle Haugan
cd3d4f9337
First cut: TITLE keyword now being parsed correctly.
2014-01-28 10:01:11 +01:00
Arne Morten Kvarving
4a9c18ac9f
run tests through valgrind
2014-01-27 15:16:34 +01:00
Atle Haugan
51ac683ef2
OPM-17: Fixed bug in END[INC] logic.
2014-01-24 13:16:37 +01:00
Atle Haugan
ef11a2331f
OPM-17: First attempt to handle END and ENDINC keywords
2014-01-24 10:01:17 +01:00
