Commit Graph

56 Commits

Author SHA1 Message Date
Joakim Hove
f2aa193a32 Added IntegrationTest of Schedule->Groups->injection properties 2013-11-18 16:06:50 +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
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
Kristian Flikka
8b4d052f9c Added parameter to parse function to indicate if strict (exception throwing) parsing should be performed 2013-08-21 14:54:38 +02:00
Kristian Flikka
5f1c2722b5 Now also reading unrecognized keywords, labeled such in DeckKeyword class 2013-08-21 10:41:18 +02:00
Kristian Flikka
c7fa8a2e0a Moved testdata into integration test folder. Added build folder to gitignore 2013-08-21 09:35:38 +02:00
Kristian Flikka
002ab45f77 Removed commented test 2013-08-21 08:51:00 +02:00
Joakim Hove
9848ef4d25 Updated integrationtest by adding summary keyword to parser 2013-08-21 07:41:06 +02:00
Joakim Hove
a0a20425f6 Updated tests to reflect that RawDeck has been removed 2013-08-13 14:51:33 +02:00
Joakim Hove
5ab04d4b17 Removed old Parser::parse() and replaced with new implementation 2013-08-12 14:39:11 +02:00
Joakim Hove
5c3de27077 1. Implemented support for inferring size from another kewyord - i.e EQLDIMS + EQUIL.
2. Cleaned up the main parser loop considerably; the RawKeyword instance now itself knows whether it is complete or not.
2013-08-11 12:36:16 +02:00
Joakim Hove
c864576424 Added FAILING: IntegrationTest to parse EQUIL 2013-08-06 16:28:48 +02:00
Joakim Hove
475b607faf Can now parse file with several WCONHIST keywords 2013-08-01 12:50:42 +02:00
Joakim Hove
75954575d5 Changed Deck::getKeyword() to take an additional inde argument 2013-08-01 10:57:25 +02:00
Joakim Hove
3bd3c7a306 Can parse one isolated WCONHIST keyword 2013-08-01 10:05:13 +02:00
Joakim Hove
a8d4a22894 Renamed DeckRecord::get() -> DeckRecord::getItem() 2013-08-01 09:52: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
b7397ca502 Parser instantiated with json config file 2013-07-31 11:30:52 +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
d79745ce4f Changed some KEYWORD->Keyword instances, search and replace hickup 2013-06-20 15:40:45 +02:00
Kristian Flikka
f1660460dc Replaced all instances of KW with Keyword. We can afford it. 2013-06-20 15:30:37 +02:00