OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
453 Commits 18 Branches 75 Tags
db274060e4b8ee073ffb9eae8ea20afbe26def94
Commit Graph

50 Commits

Author SHA1 Message Date
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
Kristian Flikka
6e20bfda09 Added Deck class (empty), and some integration tests. WIP 2013-05-27 14:27:22 +02:00
Kristian Flikka
c76767b9aa Adding recursive reading of Include files. Fixed a performance bug when appending strings to a record 2013-04-05 16:14:43 +02:00
Kristian Flikka
3adb09cb5a Review updates: Keyword can have numbers, comment lines can start with space, data can start at pos 0 on line, must explicitly have end-of-keyword control 2013-04-04 09:56:00 +02:00
Kristian Flikka
8432334106 Changed working directory of tests to be project source dir. Added symlink to statoil data in testdata folder 2013-04-02 12:34:44 +02:00
Kristian Flikka
7002348e8e Added splitting of record into items in a string vector. Added tests. Must enhance readability of this splitting code before review 2013-03-26 14:31:05 +01:00
Kristian Flikka
4f65285828 Changed more heap and smart pointers 2013-03-26 10:27:48 +01:00
Kristian Flikka
ed0d04fcc6 Added classes for holding the raw deck structure 2013-03-22 15:35:40 +01:00
Kristian Flikka
488d7655f7 Moved files into structure similar to opm-core. Added KeywordRawData class to store 0th pass objects 2013-03-20 16:29:51 +01:00