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

487 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
549dfc3c5c Added GCONPROD keyword 2013-11-19 17:20:54 +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
de095b5cf9 Added Schedule initialization and basic checks to the internal data test 2013-11-18 15:40:48 +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
Joakim Hove
ad43aad3c4 Changed item names in WELSPECS 2013-11-18 14:05:35 +01:00
Joakim Hove
8718027a34 Renamed some items in the GCONINJE keyword 2013-11-18 13:47:28 +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
Joakim Hove
a0acac1b4c Added miscellaneous injection properties to the Group object 2013-11-18 12:37:18 +01:00
Joakim Hove
8ba6fc2ac7 Added group class with basic properties to support GCONINJE keyword 2013-11-17 22:44:54 +01:00
Joakim Hove
a288373177 Added enum GroupInjectionControlEnum 2013-11-17 22:34:40 +01:00
Joakim Hove
3efe37dc37 Added size() property to DynamicState 2013-11-15 15:58:06 +01:00
Joakim Hove
a74375a62f Added CJSON_INCLUDE_DIR to the OPM_PARSER_INCLUDE_DIR variable 2013-11-15 15:28:03 +01:00
Joakim Hove
468a2330f0 Added PhaseEnum:{OIL, GAS, WATER} 2013-11-15 14:11:01 +01:00
Joakim Hove
e23bb8f290 Added cJSON as a not required dependency in the list of opm-parser depencies 2013-11-15 13:03:14 +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
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
8375a357db Loading WPR / GPR / IR from DeckKeywords + setting Prediction / History mode WCONINJX keywords 2013-11-12 10:02:09 +01:00
Joakim Hove
48f80595b0 Updated / added WCONxxx keywords 2013-11-11 17:12:44 +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
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