Commit Graph

439 Commits

Author SHA1 Message Date
Joakim Hove
7ea0bb8e53 Changed getDouble() -> getRawDouble throughout. 2013-12-10 14:16:54 +01:00
Joakim Hove
4fce7703db Added dimension to DeckDoubleItem and method get SIData(). 2013-12-10 13:49:15 +01:00
Joakim Hove
bb8b3ab240 Added ability to push_back() dimension strings to ParserItems; and then to query the
ParserItem -> ParserRecord -> ParserKeyword() structure whether it has dimension.
2013-12-09 21:12:27 +01:00
Joakim Hove
2a6fc5973c Removed commented out code + moved micro function from header to cpp file. 2013-12-09 20:33:38 +01:00
Joakim Hove
02a9885727 Pure indentation change. 2013-12-09 20:19:29 +01:00
Joakim Hove
ff13036a58 Changed unit system to use more std::shared_ptr instead of instance variables. 2013-12-09 17:42:20 +01:00
Kristian Flikka
c74a86b3f5 Merge pull request #68 from joakim-hove/units
Units
2013-12-09 01:12:33 -08:00
Andreas Lauser
7be1af4bf3 Parser.hpp: make the guardian macro less prone to conflicts
as soon as this class is used with another project, the old macro name
basically screamed for a naming conflict and a _very_ confused user...
2013-12-09 07:55:58 +01:00
Joakim Hove
5bc27e91f2 Added basic system for units - not yet hooked into the Parser items. 2013-12-08 19:26:30 +01:00
Joakim Hove
acff0a4127 Changed "header" to <opm/parser/eclipse/xx/header>. 2013-12-08 19:17:33 +01:00
Kristian Flikka
a750fd422d Added constructor, moved ParserState struct to cpp file 2013-12-06 15:27:05 +01:00
Kristian Flikka
78337c7bda Added a ParserState struct, to encapsulate the temporary state of the parsing process 2013-12-06 14:18:05 +01:00
Kristian Flikka
30f5405961 Merge pull request #64 from joakim-hove/norne-keywords
NORNE keywords
2013-12-06 05:05:11 -08:00
Joakim Hove
1ab3b0285e Added many summary keywords for NORNE; many of the Region keywords suddenly aquired a '*'. 2013-12-05 09:35:48 +01:00
Joakim Hove
24e233a53c Support for parsing keywords with unknown size. 2013-12-05 08:26:29 +01:00
Joakim Hove
9ccc70b58d Added enum for size of rawkeywords. 2013-12-04 17:21:54 +01:00
Joakim Hove
ed06ebf4d3 Added UNKNOWN enum value in ParserKeywordSize enum throughout. 2013-12-04 15:31:28 +01:00
Kristian Flikka
d007e8400f Added new UNKNOWN for keywordSizeEnum 2013-12-04 14:26:08 +01:00
Kristian Flikka
ce692159c9 Trimming right side of each read line, to avoid line ending problems.
Removed C style parsing of numbers, using boost::lexical_cast instead.
2013-12-03 10:15:22 +01:00
Joakim Hove
c5b53141ba Merge remote-tracking branch 'upstream/master' into norne-keywords 2013-12-02 15:35:34 +01:00
Joakim Hove
20d3cf85a3 Modified VAPPARS keyword. Added 'required' E300 items to WCONPROD. 2013-12-02 15:23:03 +01:00
Joakim Hove
07b1b5dd52 Added keyword NETBALAN to test dataset. 2013-12-02 14:59:40 +01:00
Joakim Hove
29d171d3f6 Added misc keywords PIMULTAB, VAPPARS and ZIPPY2 2013-12-02 14:53:30 +01:00
Joakim Hove
e361b90b2c Added some Wxxx keywords. 2013-12-02 14:52:58 +01:00
Joakim Hove
329b34fdcd Added tracer keywords with wildcard. 2013-12-02 14:52:26 +01:00
Joakim Hove
ff0c6d1055 Changed name of items. 2013-12-02 14:39:40 +01:00
Joakim Hove
3f7a193f77 Fixed o -> O case f..up 2013-12-02 14:39:13 +01:00
Joakim Hove
163e129994 Added many Wxxx keywords from Norne. 2013-12-02 13:47:33 +01:00
Joakim Hove
8b31da3dac Changed some keyword item names. 2013-12-02 13:46:58 +01:00
Kristian Flikka
fa8b9e9aa3 Merge pull request #59 from joakim-hove/wildcard-keywords
Wildcard keywords
2013-12-02 04:24:45 -08:00
Joakim Hove
f1e9230911 Merge remote-tracking branch 'upstream/master' into norne-keywords 2013-12-02 13:21:00 +01:00
Joakim Hove
7619067e7a Merge pull request #61 from flikka/shared-ptr
Removed use of boost::shared_ptr, replaced with std::shared_ptr
2013-12-02 04:19:34 -08:00
Joakim Hove
58663ceee6 Merge pull request #60 from flikka/fix-internal
Changed initialization order in Schedule. Throws exception if time map i...
2013-12-02 04:17:44 -08:00
Kristian Flikka
1d0135da5e Removed use of boost::shared_ptr, replaced with std::shared_ptr 2013-12-02 13:07:01 +01:00
Kristian Flikka
d3c89752e6 Changed initialization order in Schedule. Throws exception if time map is not created when adding group 2013-12-02 11:47:14 +01:00
Joakim Hove
6b5367854a Factored out some common code from validName() and wildCardName(). 2013-12-02 11:19:22 +01:00
Joakim Hove
4bf1adc593 Changed unsigned int -> size_t. 2013-12-02 11:10:53 +01:00
Joakim Hove
679d79dd6f Added many summary related keywords. 2013-12-02 09:31:54 +01:00
Joakim Hove
6021d03548 Removed debug message on stdout 2013-12-02 09:31:19 +01:00
Joakim Hove
5095862298 Added integration test for parsing of TVDP* keywords. 2013-12-01 09:28:45 +01:00
Joakim Hove
abd0905171 Changed parser to support parsing of keywords with wildcard like
"TVDP*". An importtant change is that we now query the parser
canParseKeyword() instead of hasKeyword().
2013-12-01 09:28:14 +01:00
Joakim Hove
390d17aa3e Changed one item name in EQLDIMS table. 2013-12-01 09:26:21 +01:00
Joakim Hove
17ee1cca38 Added simple wildcard (trailing '*') support in ParserKeyword. 2013-12-01 09:25:52 +01:00
Joakim Hove
3abdd6dcaf Merged upstream/master 2013-11-29 16:36:28 +01:00
Joakim Hove
347d890850 Changed EclipseDoctor to strict parsing 2013-11-29 16:32:03 +01:00
Joakim Hove
6dec88fc44 Added some keywords for NORNE 2013-11-29 16:32:02 +01:00
Joakim Hove
0c9de954f2 Merge pull request #57 from flikka/norne-keywords
Changed NSTACK keyword, one too many keyword, added two other
2013-11-29 07:26:33 -08:00
Kristian Flikka
6e3b1007a4 Changed NSTACK keyword, one too many keyword, added two other 2013-11-29 15:42:56 +01:00
Joakim Hove
01b77e88df Changed EclipseDoctor to strict parsing 2013-11-29 08:31:26 +01:00
Joakim Hove
2b04379038 Added some keywords for NORNE 2013-11-28 12:12:07 +01:00