Commit Graph

18 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
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
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
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