Commit Graph

75 Commits

Author SHA1 Message Date
Joakim Hove
7ea0bb8e53 Changed getDouble() -> getRawDouble throughout. 2013-12-10 14:16:54 +01:00
Joakim Hove
24e233a53c Support for parsing keywords with unknown size. 2013-12-05 08:26:29 +01:00
Joakim Hove
ed06ebf4d3 Added UNKNOWN enum value in ParserKeywordSize enum throughout. 2013-12-04 15:31:28 +01:00
Joakim Hove
07b1b5dd52 Added keyword NETBALAN to test dataset. 2013-12-02 14:59:40 +01:00
Joakim Hove
f1e9230911 Merge remote-tracking branch 'upstream/master' into norne-keywords 2013-12-02 13:21:00 +01: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
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
db274060e4 Will create and delete Group <-> Well relationships based on the WELSPECS keyword. 2013-11-26 12:48:20 +01:00
Kristian Flikka
0271e5fc03 Merge master into schedule_groups 2013-11-21 13:43:36 +01:00
Joakim Hove
064e6d490b Merge remote-tracking branch 'upstream/master' into group-data 2013-11-20 17:39:17 +01:00
Joakim Hove
aed0d7efe9 Added productiondata to Group 2013-11-20 17:09:52 +01:00
Kristian Flikka
9fddf998cf Fixed a bug with comments after keywords, right-side trims away dashes and spaces from the 8 char candidate 2013-11-20 14:35:48 +01:00
Kristian Flikka
2624a86790 Merge from master, fix conflict (injector introduction) 2013-11-20 14:11:17 +01:00
Kristian Flikka
c69beedb30 Added support for re-parenting a node 2013-11-20 13:48:55 +01:00
Joakim Hove
3170710303 Added several enums - with namespcae container 2013-11-19 17:20:18 +01:00
Joakim Hove
f2aa193a32 Added IntegrationTest of Schedule->Groups->injection properties 2013-11-18 16:06:50 +01:00
Kristian Flikka
de095b5cf9 Added Schedule initialization and basic checks to the internal data test 2013-11-18 15:40:48 +01:00
Kristian Flikka
6997561791 Added support for reading groups into GroupTree from WELSPECS keyword. Default root node is FIELD 2013-11-18 15:28:58 +01:00
Joakim Hove
176e0af7cc Added m_groups map to the Schedule container. Contains FIELD by default 2013-11-18 13:11:49 +01:00
Kristian Flikka
a8e3128ef8 Made Schedule handle the GRUPTREE keyword, Added testing to GroupTreeTests.cpp 2013-11-14 16:08:32 +01:00
Joakim Hove
8375a357db Loading WPR / GPR / IR from DeckKeywords + setting Prediction / History mode WCONINJX keywords 2013-11-12 10:02:09 +01:00
Joakim Hove
0f09746143 Added Schedule code to load Completions - with integrationTest 2013-11-11 10:55:02 +01:00
Joakim Hove
b9b9a984ae Created integrationTest for building a collections of Completions from COMPDAT Record & Keyword 2013-11-11 10:29:36 +01:00
Kristian Flikka
862d2ee302 Added support for WCONPROD, with use of predictionMode. Fixed a bug in the TSTEP reading in Schedule.cpp 2013-11-08 15:55:11 +01:00
Joakim Hove
df741dfc89 Changed Schedule::init() to load both time related and other keywords in the same main loop 2013-11-05 17:59:54 +01:00
Joakim Hove
ffc5dc3c53 1. Added well collection to Schedule object.
2. Adding wells from Welspecs and setting Oilrate from WCONHIST
2013-11-05 15:25:47 +01:00
Joakim Hove
77cc1fd03b Added Integration test to build TimeMap from Deck 2013-10-25 17:30:16 +02:00
Joakim Hove
803304d5f8 Deck->keywordContainer will set deckIndex of DeckKeyword when inserting: Have relaxed const properties of DeckKeyword 2013-10-22 11:42:15 +02:00
Joakim Hove
63fb47515b Relaxed internalParseLarge test 2013-10-22 10:48:39 +02:00
Joakim Hove
6dce82c5a5 Added action: THROW_EXCEPTION 2013-10-08 16:54:41 +02:00
Joakim Hove
8e550b7f32 Added warnings in Deck for keywords of type IGNORE_WARNING and unrecognized keywords 2013-10-08 16:19:18 +02:00
Joakim Hove
00c434614a Minor typo 2013-10-08 14:45:58 +02:00
Joakim Hove
f019d40dd4 Parser will inspect keyword->action; only INTERNALIZE are stored 2013-10-08 14:45:41 +02:00
Joakim Hove
b99d5d75cc Removed explicit keyword loading 2013-10-08 14:19:05 +02:00
Joakim Hove
e6b38c6445 Added action value to ParserKeyword constructor 2013-10-08 13:46:55 +02:00
Joakim Hove
b3cc1bee53 added missing file 2013-10-03 10:46:05 +02:00
Joakim Hove
b4b4a50092 Completed tableCollection implementation - added PVTG based testing 2013-10-01 17:13:40 +02:00
Joakim Hove
97750f851f Explicit cast 0 - > (size_t) 0 2013-10-01 16:36:49 +02:00
Joakim Hove
86e19fb7a9 Minor variable name rename 2013-10-01 16:36:18 +02:00
Joakim Hove
72aec8893b Added test for parsing PORO keyword from file 2013-09-22 18:54:14 +02:00
Joakim Hove
1ff18bb38a Removed constructor with one global JSON config file + addedd optional flag to include all built in keywords 2013-09-14 22:39:43 +02:00
Joakim Hove
0dce7e5aec Cmake if test update 2013-09-12 10:58:21 +02:00
Joakim Hove
41376779f0 Fixed handling of INCLUDE keyword 2013-09-02 10:08:37 +02:00
Joakim Hove
52b1cbdd2e Added option INCLUDE_STATOIL_TESTS wrapping usage of the Statoil internal test data 2013-08-28 13:50:32 +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
Kristian Flikka
375332eb99 Added check if rawRecord is empty, then default is used. Added some json data 2013-08-23 14:20:32 +02:00
Joakim Hove
b630140316 Merged upstream/master 2013-08-23 09:30:23 +02:00
Joakim Hove
19e42f4ce4 Based WCONHIST parse on KEYWORD directory 2013-08-23 00:19:09 +02:00
Joakim Hove
c05b90f4f9 Added #define symbol KEYWORD_DIRECTORY 2013-08-23 00:17:53 +02:00