Commit Graph

34 Commits

Author SHA1 Message Date
Kristian Flikka
e2d53f3777 Added forgotten (half-finished) test 2013-11-20 14:59:43 +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
Kristian Flikka
2648bb350b Added newlines to files 2013-11-18 15:32:14 +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
Kristian Flikka
a8e3128ef8 Made Schedule handle the GRUPTREE keyword, Added testing to GroupTreeTests.cpp 2013-11-14 16:08:32 +01:00
Kristian Flikka
d3e5b198af Fixed a bug in the getNode recursion, added deep copy and print tree (debugging function) 2013-11-14 16:05:13 +01:00
Kristian Flikka
ed57266f63 Added GroupTree that holds the root node, and supplies functions to add and find nodes 2013-11-14 11:48:37 +01:00
Kristian Flikka
3863df9734 Added functionality to build a GroupTree (from GRUPTREE). Only the groups, not any wells in the tree. 2013-11-13 10:17:55 +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
d6d7f148c5 Added methods to set injection rate, WPR, GPR and maintain injector/producer status 2013-11-11 17:12:44 +01:00
Joakim Hove
0f09746143 Added Schedule code to load Completions - with integrationTest 2013-11-11 10:55:02 +01:00
Joakim Hove
7d015772ee Added completionSet as DynamicState<> property to the Well Object 2013-11-11 10:35:57 +01:00
Joakim Hove
ad3d3adf21 ADded const qualifier to shallowCopy() method 2013-11-11 10:29:37 +01:00
Joakim Hove
bdc788d905 Whitespcae fix 2013-11-11 10:29:37 +01:00
Joakim Hove
011919ef0c Shallow copy now does new to create a heap instance; which should be wrapped by a smart pointer 2013-11-11 10:29:37 +01:00
Joakim Hove
88457973aa Added CompletionSet 2013-11-11 10:29:37 +01:00
Joakim Hove
59bc1d0ddd Renamed sameCell -> sameCoordinate 2013-11-11 10:29:36 +01:00
Joakim Hove
69f52542eb Added Completion class for holding one single completion 2013-11-11 10:29:36 +01:00
Joakim Hove
c0aa3c0417 Removed stale commented code 2013-11-11 10:29:36 +01:00
Joakim Hove
bc6e2ee2c6 Added ScheduleEnums file - with CompletionStateEnum 2013-11-11 10:25:58 +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
Kristian Flikka
f0def0cdff Added dynamic field inPredictionMode to Well 2013-11-08 09:39:37 +01:00
Kristian Flikka
e02cfe3878 Refactored tests into DefaultValues test and, actual set values test 2013-11-08 09:14:57 +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
ddc24927e4 Allow data to be added after the (currently) last TSTEP 2013-11-05 17:58:19 +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
6d30a6a7fa Added DynamicState template class 2013-11-05 12:57:25 +01:00
Joakim Hove
61b640f00f Added simple Schedule::Well object 2013-11-05 12:55:49 +01:00
Joakim Hove
b4bd6a8ed1 Added test for DATES and TSTEP keyword respectively in TimeMap 2013-10-28 10:29:43 +01:00
Joakim Hove
d511d2ee2d Added Schedule class 2013-10-25 17:28:56 +02:00
Joakim Hove
488782d8c5 TimeMap class can now be constructed from an Eclipse DECK 2013-10-25 17:26:37 +02:00
Joakim Hove
8cc555c5ac Added basic functionality to assemble a timeMap 2013-10-22 17:11:33 +02:00
Joakim Hove
2a09a6b2c1 Added (empty) TimeMap class 2013-10-22 14:24:31 +02:00