Commit Graph

106 Commits

Author SHA1 Message Date
Joakim Hove
8598fa279e Added throw() in Schedule if trying to control well on an item which has been defaulted. 2014-03-03 15:06:26 +01:00
Joakim Hove
7dc8767c80 Made sure that groups were added when reading the GRUPTREE keyword. 2014-03-03 15:06:26 +01:00
Joakim Hove
ceb4a8df8d Added check on Well->status before reading controlmode. 2014-03-03 15:06:25 +01:00
Joakim Hove
1907a8e467 Merge pull request #129 from andlaus/refactor_timemap
Refactor timemap
2014-02-26 23:09:50 +01:00
Andreas Lauser
18eb2fd8f4 TimeMap: replace boost::gregorian::date by boost::posix_time::ptime
this is necessary because boost::gregorian::date does not have a
notion of "time during a day" which is required to specify time step
lengths less than a day...
2014-02-21 17:06:21 +01:00
Kristian Flikka
b3dc1ea5ca Added rest of WGRUPCON handlingin Well and Schedule 2014-02-21 12:48:36 +01:00
Kristian Flikka
b69f41f32d Added support for guide rate 2014-02-19 15:43:42 +01:00
Kristian Flikka
bd564ad944 Added WGRUPCON, and simple YES/NO handling in Schedule 2014-02-17 16:10:31 +01:00
Kristian Flikka
56c3dd2085 Make sure that the tree is updated correctly after reading WELSPECS 2014-02-14 12:36:26 +01:00
Kristian Flikka
46b3a364d8 Added test to run through the iter functionality in GroupTreeNode 2014-02-14 11:38:49 +01:00
Kristian Flikka
720cd21b0e Merged from upstream/master 2014-02-12 10:13:49 +01:00
Andreas Lauser
03d6e9a20b correct the context dependent rates in the schedule code 2014-02-11 12:45:44 +01:00
Andreas Lauser
849bc7df93 units: introduce a "ContextDependent" dimension
this is meant for those nasty keywords where the dimension of an entry
depends on a user-defined value of some field of a (potentially
different) keyword. One example for this are the surface rates of the
produced fluids for the .CON(INJ|PROD).* keywords which exhibit
different units depending on whether the user choses to control for
the surface gas or the liquid rate.

the approach taken in this patch is to convert all numbers to NaN if
the unit is queried in SI (via item->getSIDouble()). It might be more
desireable to throw an exception in this case, but this approach would
be more elaborate and NaNs should be quickly noticeable by the users
of this code.

I tried to adapt all implemented keywords, but it's quite likely that
I missed some...
2014-02-11 12:45:44 +01:00
Kristian Flikka
08ec94e15c Added setting of the injection/production status of group 2014-02-10 15:43:37 +01:00
Kristian Flikka
9db42f6eb3 Added support for WELOPEN in the Schedule class, NOT support specific completions, only the well 2014-02-04 16:12:49 +01:00
Joakim Hove
bb444b5139 Added flag injectionControls to keep track of available injection controls. 2014-01-30 16:44:21 +01:00
Joakim Hove
49ee4ed1ed Added addProductionControl() and dropproductioncontrol() to Schedule. 2014-01-30 16:44:21 +01:00
Joakim Hove
e42234b17a Added Well::Producercontrolmode 2014-01-30 16:44:21 +01:00
Joakim Hove
5dd6865838 Added RESV target to Well. 2014-01-30 16:44:20 +01:00
Joakim Hove
7f58de5b3e Have added liquidRate setting from Schedule.cpp 2014-01-30 16:44:20 +01:00
Joakim Hove
a83d994494 Added well->liquidRate() from WCONPROD. 2014-01-30 16:44:20 +01:00
Joakim Hove
0f707b7498 Keeping track of well OPEN|SHUT|STOP status from WCONxxxx keywords. 2014-01-29 15:55:02 +01:00
Joakim Hove
49604cf631 Added injectorControlMode to Well class. 2014-01-29 13:33:28 +01:00
Kristian Flikka
37084e991d Shifting WELSPECS and COMPDAT i,j,k indices down one, to go from 0 2014-01-29 11:48:02 +01:00
Joakim Hove
3f62b3c777 Updated numerical test values for connection factor; due to SI dimension. 2014-01-29 10:39:55 +01:00
Kristian Flikka
efcfad657e Merge pull request #102 from joakim-hove/well-injection-phase
Well injection phase
2014-01-28 11:37:49 -08:00
Joakim Hove
b0545fab0a Merge pull request #100 from flikka/add-to-completion
Added skinFactor and diameter to Completion
2014-01-28 07:04:40 -08:00
Kristian Flikka
e669e4110d Added CF, diameter and skinFactor check in integration test 2014-01-28 15:30:25 +01:00
Joakim Hove
a464429388 Added namespace Phase around the PhaseEnum enum. 2014-01-28 08:18:03 +01:00
Joakim Hove
af00558ec7 Added THPLimit as well property. 2014-01-27 18:38:41 +01:00
Joakim Hove
3d2ddd70fc Setting Well->BHP limit from Schedule. 2014-01-27 18:31:22 +01:00
Joakim Hove
1ba278022a Have added ReservoirRates to well injector. 2014-01-24 13:24:22 +01:00
Joakim Hove
1cc38786dc Renamed well->InjectionRate to SurfaceInjectionRate. 2014-01-24 12:36:45 +01:00
Kristian Flikka
d09975e142 Introducing WELSPECS data in constructor to Wells. Throws if WELSPECS with different data for an existing well occurs 2014-01-20 14:52:30 +01:00
Andreas Lauser
9a09fa29af rename Parser::parse to Parser::parseFile and add Parser::parseData
Parser::parseData is quite useful for unit tests to prevent them
spilling files to everything. Also, what was formerly
Parser::parseFile has been renamed to Parser::parseStream and slightly
modified to not be specific for std::ifstream.
2014-01-10 14:51:56 +01:00
Joakim Hove
99542f6685 Added dimensions to GCONINJE / GCONPROD / WCONINJE / WCONINJH. 2013-12-16 17:23:46 +01:00
Joakim Hove
65c9882b53 Added dimensions to WCONHIST & WCONPROD. 2013-12-16 00:02:47 +01:00
Joakim Hove
07b1b5dd52 Added keyword NETBALAN to test dataset. 2013-12-02 14:59:40 +01:00
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