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
|
07827a1751
|
Fixed an error in GRUPTREE, comma in stead of dot
|
2013-11-14 16:03:22 +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
|
fbb47a26a3
|
Added keyword GRUPTREE
|
2013-11-13 15:05:47 +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
|
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
|
b9b9a984ae
|
Created integrationTest for building a collections of Completions from COMPDAT Record & Keyword
|
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 |
|
flikka
|
cf0b1235a4
|
Merge pull request #47 from flikka/throw-on-too-long-records
Throw on too long records
|
2013-11-11 01:20:11 -08: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 |
|
Kristian Flikka
|
006ab6d35d
|
Added keywordName and dataFilename to RawRecord. Using these in the ParserRecord to give better error message when throwing on too long RawRecords
|
2013-11-07 12:32:07 +01:00 |
|
Kristian Flikka
|
e1b957a54e
|
Added an item to GCONINJE, test file has also the Eclipse300 item
|
2013-11-07 12:31:16 +01:00 |
|
Joakim Hove
|
e5b921fe1c
|
Added simple datafile parser which focuses on the Schedule section
|
2013-11-05 18:06:51 +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 |
|
Kristian Flikka
|
3de996acc3
|
Merged with upstream, fixed BXSAT conflict, joakim-hove updated
|
2013-11-04 10:22:35 +01:00 |
|
Joakim Hove
|
2ec09d4cf7
|
Added keywords GCONINJE/RPTRST/WPITAB/WRFTPLT/WTRACER
|
2013-11-03 22:30:43 +01:00 |
|
Joakim Hove
|
8d313d1e33
|
Added BOSAT and BGSAT keywords ~ BPR
|
2013-11-01 22:07:22 +01:00 |
|
Kristian Flikka
|
f4778b8e67
|
some ignored keywords
|
2013-11-01 15:17:34 +01:00 |
|
Kristian Flikka
|
e8a33b1e5d
|
Merge remote-tracking branch 'joakim/spe1-missing-keywords' into spe1-integration
|
2013-11-01 15:11:06 +01:00 |
|
Kristian Flikka
|
e457acda44
|
New keyword files missing in the SPE1 dataset
|
2013-11-01 15:10:27 +01:00 |
|
Joakim Hove
|
5252daa460
|
Added keyword: ROCK
|
2013-11-01 12:40:03 +01:00 |
|
Joakim Hove
|
c949e4a47b
|
Added keyword: PVDG
|
2013-11-01 12:33:10 +01:00 |
|
Joakim Hove
|
9d8e07a56e
|
Added keyword: PVTO
|
2013-11-01 12:14:14 +01:00 |
|
Joakim Hove
|
502d26afef
|
Added keyword: RPTPROPS
|
2013-11-01 12:11:02 +01:00 |
|
Joakim Hove
|
3d50023041
|
Added keywords SOLUTION & PRESSURE
|
2013-11-01 11:56:20 +01:00 |
|
Joakim Hove
|
133791706d
|
Added RS / SGAS / SWAT keywords for initial distributions
|
2013-11-01 11:53:40 +01:00 |
|
Joakim Hove
|
1a8c1f2098
|
Added RPTSOL keyword
|
2013-11-01 11:49:47 +01:00 |
|
Joakim Hove
|
5de0d8799e
|
Added EXCEL and RUNSUM keywords
|
2013-11-01 10:48:24 +01:00 |
|
Joakim Hove
|
5bb04cdbdd
|
Added WGOR keyword
|
2013-11-01 10:45:09 +01:00 |
|
Joakim Hove
|
809e0b8b23
|
Added WBHP keyword
|
2013-11-01 10:44:23 +01:00 |
|
Joakim Hove
|
4496592f9e
|
Added TUNING keryword
|
2013-11-01 10:40:25 +01:00 |
|
Joakim Hove
|
bc7f8d9666
|
Added WCONPROD keyword
|
2013-11-01 10:38:25 +01:00 |
|
Kristian Flikka
|
33b0bed250
|
Changed the test-program to include Deck.hpp in stead of Parser.hpp to avoid problem with cJSON.h
|
2013-10-30 10:27:39 +01:00 |
|
Joakim Hove
|
a30b5aae0d
|
Merge pull request #40 from joakim-hove/time-map
Time map
|
2013-10-28 02:30:53 -07:00 |
|
Joakim Hove
|
b4bd6a8ed1
|
Added test for DATES and TSTEP keyword respectively in TimeMap
|
2013-10-28 10:29:43 +01:00 |
|
Joakim Hove
|
bd289194f3
|
Merged with upstream/master
|
2013-10-28 10:12:53 +01:00 |
|