Commit Graph

487 Commits

Author SHA1 Message Date
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
Joakim Hove
e75bb7e968 Changed createTimeStep -> creationTimeStep for readability. 2013-11-27 14:21:23 +01:00
Joakim Hove
db274060e4 Will create and delete Group <-> Well relationships based on the WELSPECS keyword. 2013-11-26 12:48:20 +01:00
Joakim Hove
e8d9159a74 Added createTimeStep to Group constructor to keep track of group creation time 2013-11-25 16:31:44 +01:00
Joakim Hove
ea4f5df5ea Added createStep flag to Well constructor to be able to track well creation time. 2013-11-25 16:25:57 +01:00
Joakim Hove
26edb7735b Added groupName as a DyanmicState<std::string> property of the Well class 2013-11-25 16:06:10 +01:00
Joakim Hove
ffef620df3 Implemted Group with external WellSet class. 2013-11-22 22:35:15 +01:00
Joakim Hove
581ccb21dc Added new WellSet class - just a thin wrapper around std::map 2013-11-22 22:34:44 +01:00
Joakim Hove
5d0870581b Added wells to groups. 2013-11-22 19:10:23 +01:00
Kristian Flikka
0271e5fc03 Merge master into schedule_groups 2013-11-21 13:43:36 +01:00
Kristian Flikka
830050bd49 Merge branch 'master' of github.com:OPM/opm-parser 2013-11-21 11:38:05 +01:00
Kristian Flikka
8a825e5318 Added *.user to ignore pattern 2013-11-21 11:37:42 +01:00
Kristian Flikka
12993a9fbb Made updateTree function void, and removed an unnecessary recursive call 2013-11-21 08:55:24 +01:00
Joakim Hove
064e6d490b Merge remote-tracking branch 'upstream/master' into group-data 2013-11-20 17:39:17 +01:00
Joakim Hove
223383b692 Merge pull request #54 from joakim-hove/comment-after-keyword
Fixed a bug with comments after keywords, right-side trims away dashes a...
2013-11-20 08:18:43 -08:00
Joakim Hove
aed0d7efe9 Added productiondata to Group 2013-11-20 17:09:52 +01:00
Joakim Hove
8f352765b2 Fixed syntax errors in GCONPROD keyword 2013-11-20 17:07:09 +01:00
Kristian Flikka
e2d53f3777 Added forgotten (half-finished) test 2013-11-20 14:59:43 +01:00