Commit Graph

39 Commits

Author SHA1 Message Date
Andreas Lauser
d94097617b ParserKeyword: add the glue code so that it knows its sections 2014-10-13 16:05:59 +02:00
Kristian Flikka
e8310ffbca Changed from if to ifdef, to clarify the actual functionality 2014-07-08 12:49:12 +02:00
Andreas Lauser
1a72cade01 use std::regex if it is available
it turns out that boost::regex does not work for the libstdc++ debug
mode. This patch should fix this for sufficiently new compilers.

Note that this requires the FindCXX11Features.cmake tests pulled in
from opm-core and an additional compiler flag...
2014-07-07 17:50:46 +02:00
Andreas Lauser
96904b00f4 allow keywords to match regular expressions as their deck name
the RE used is specified via the "deck_name_regex" in the JSON file of
the respective keyword. A deck name is assumed to match a given parser
internal keyword if the deck name is valid and if it is either in the
list specified by the "deck_names" entry or if it matches the regular
expression.

This functionality is useful to implement the well probes for the
tracers as well as replacing the current "wild card keyword"
implementation which only allows a star as a suffix.
2014-06-29 14:32:06 +02:00
Andreas Lauser
5f949c11c3 add support for parser keywords specifying to multiple deck keywords
Say hello to the complete set of well, region, field and group output
specifiers soon...
2014-06-13 13:17:03 +02:00
Andreas Lauser
d820a4d435 change construction of ParserKeyword objects to the factory paradigm
this makes it more explicit what the object is supposed to represent.
2014-06-11 15:08:58 +02:00
Joakim Hove
edde68fa6a Added float data accessors. 2014-04-01 09:05:33 +02:00
Atle Haugan
ddd4563f97 Renamed from 'help' to 'description' for ParserKeyword and ParserItem 2014-01-10 10:57:35 +01:00
Atle Haugan
308cfda3c5 Improved some type usage based on code review feedback 2014-01-10 08:53:19 +01:00
Atle Haugan
3271156f9d First pull request candidate with help support 2014-01-09 13:33:32 +01:00
Atle Haugan
d3d6dc2c90 Added unit tests for ParserKeyword.help() 2014-01-09 08:42:27 +01:00
Joakim Hove
ae2260aa43 Table collection keywords PVTO and PVTG now have individual items: settings. 2013-12-19 13:54:51 +01:00
Joakim Hove
de16ff8da1 Added methods applyUnitsToDeck() which push units onto the deck. 2013-12-14 10:28:49 +01:00
Joakim Hove
39ef9e3798 Calling initDimension for table collections and data keywords like PERMX. 2013-12-11 13:27:21 +01:00
Joakim Hove
5a69f64aef Added functionality to apply dimensions to ParserItem from JsonConfig. 2013-12-10 17:35:20 +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
ed06ebf4d3 Added UNKNOWN enum value in ParserKeywordSize enum throughout. 2013-12-04 15:31:28 +01:00
Kristian Flikka
fa8b9e9aa3 Merge pull request #59 from joakim-hove/wildcard-keywords
Wildcard keywords
2013-12-02 04:24:45 -08:00
Kristian Flikka
1d0135da5e Removed use of boost::shared_ptr, replaced with std::shared_ptr 2013-12-02 13:07:01 +01:00
Joakim Hove
6b5367854a Factored out some common code from validName() and wildCardName(). 2013-12-02 11:19:22 +01:00
Joakim Hove
17ee1cca38 Added simple wildcard (trailing '*') support in ParserKeyword. 2013-12-01 09:25:52 +01:00
Joakim Hove
e6b38c6445 Added action value to ParserKeyword constructor 2013-10-08 13:46:55 +02:00
Joakim Hove
b4b4a50092 Completed tableCollection implementation - added PVTG based testing 2013-10-01 17:13:40 +02:00
Joakim Hove
2913b526d7 Added isTableCollection attribute on Parser and Raw keyword - mainly to parse PVTG keyword 2013-10-01 16:35:55 +02:00
Joakim Hove
d7ca4fee83 Added support for 'data' keywords ~ the PORO and PERMX keywords 2013-09-22 17:23:27 +02:00
Joakim Hove
79a59fc629 Added indent parameter to ParserKeyword::inlineNew() to beautify generated cpp source 2013-09-14 22:14:58 +02:00
Joakim Hove
f461ba6f07 Created code to create cpp representation of complete ParserKeyword 2013-09-13 22:23:12 +02:00
Kristian Flikka
480d14934b Added test for a case with fully, partial and empty record body, defaults are added 2013-08-26 15:17:52 +02:00
Joakim Hove
4b728a5196 Added function declaration in .hpp 2013-08-23 00:20:22 +02:00
Joakim Hove
4202ad027d Added static method ParserKeyword::validName() 2013-08-21 12:43:15 +02:00
Joakim Hove
75de3033f9 Renamed variables related keyword inferring size from other keyword 2013-08-14 08:43:54 +02:00
Joakim Hove
c046fb0bde Added support for keywords getting size from other keywords ~ EQUIL style 2013-08-06 16:26:49 +02:00
Joakim Hove
8bc176d63e Added full(?) Parser configuration from json 2013-07-31 17:58:05 +02:00
Joakim Hove
db60ee2b56 Removed setRecord() method ParserKeyword. Instead ParserRecord is created during ParserKeyword construction 2013-07-31 15:02:00 +02:00
Joakim Hove
e0995814f6 More JSON integration in Parser and ParserKeyword 2013-07-30 14:10:07 +02:00
Kristian Flikka
31b3031c1a Removed class ParserKeywordSize, and accompanying tests. Put info into ParserKeyword. Changed tests to expose same constraints. 2013-06-24 14:08:53 +02:00
Kristian Flikka
50ec3e0244 Changed from using RawParserKeywords to equivalent functionality now in Parser and ParserKeywordSize 2013-06-21 15:34:06 +02:00
Kristian Flikka
01abb91959 Renamed ParserRecordSize to ParserKeywordSize, because it is more consistent with ParserItemSize 2013-06-21 10:23:24 +02:00
Kristian Flikka
f1660460dc Replaced all instances of KW with Keyword. We can afford it. 2013-06-20 15:30:37 +02:00