Commit Graph

58 Commits

Author SHA1 Message Date
Kristian Flikka
d09975e142 Introducing WELSPECS data in constructor to Wells. Throws if WELSPECS with different data for an existing well occurs 2014-01-20 14:52:30 +01:00
Joakim Hove
1d80ffaed8 Added test example for parsing DENSITY keyword. 2013-12-18 12:32:02 +01:00
Joakim Hove
7be79cf450 Updated ParsePORO test to also parse PERMX and check dimensions. 2013-12-18 08:57:34 +01:00
Kristian Flikka
c6e5add467 Merge pull request #65 from joakim-hove/kw-size-unknown
Kw size unknown
2013-12-06 05:04:54 -08:00
Kristian Flikka
718e35607c Removed symbolinc link to statoil set 2013-12-05 08:26:58 +01:00
Joakim Hove
24e233a53c Support for parsing keywords with unknown size. 2013-12-05 08:26:29 +01:00
Joakim Hove
07b1b5dd52 Added keyword NETBALAN to test dataset. 2013-12-02 14:59:40 +01:00
Joakim Hove
5095862298 Added integration test for parsing of TVDP* keywords. 2013-12-01 09:28:45 +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
f2aa193a32 Added IntegrationTest of Schedule->Groups->injection properties 2013-11-18 16:06:50 +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
ad43aad3c4 Changed item names in WELSPECS 2013-11-18 14:05:35 +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
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
1cc16de2bd Added test for replace keyword functionality 2013-10-18 10:17:48 +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
f019d40dd4 Parser will inspect keyword->action; only INTERNALIZE are stored 2013-10-08 14:45:41 +02:00
Joakim Hove
5204b195c6 Added two files with test data 2013-10-04 13:38:40 +02:00
Joakim Hove
72aec8893b Added test for parsing PORO keyword from file 2013-09-22 18:54:14 +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
e865382406 Added (dummy) items for RADFIN4 keyword in testdata 2013-08-23 09:33:01 +02:00
Joakim Hove
b630140316 Merged upstream/master 2013-08-23 09:30:23 +02:00
Joakim Hove
c01cbcfa71 Modified testdata to have correct number of items 2013-08-23 00:15:56 +02:00
Kristian Flikka
c218b803bc Changed language 2013-08-22 15:53:26 +02:00
Joakim Hove
dfca913462 Added method to load keyword configurations from directory 2013-08-21 12:50:21 +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
Joakim Hove
7c30145435 Added testdata with single keyword files 2013-08-19 22:37:24 +02:00
Joakim Hove
54b8299897 Changed testdata to exclude invalid keywords 2013-08-13 14:44:59 +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
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
b3d9fb51a0 Parser object can be constructed with config file as input argument 2013-07-31 11:30:21 +02:00
Joakim Hove
17f440d6eb Added more json config files 2013-07-31 11:27:01 +02:00
Joakim Hove
42e7333392 Added JsonObject as thin wrapper around the cJSON source 2013-07-29 21:55:57 +02:00
Kristian Flikka
5fa04e5377 Added/implemented XStringItem for Parser and Deck, with tests. Added integration test for WWCT keyword. Moved DeckItem tests into type-specific files. Removed unused file. 2013-06-20 13:56:11 +02:00