57 Commits

Author	SHA1	Message	Date
Atgeirr Flø Rasmussen	203ebe6273	Remove unneeded debug output.	2012-05-16 09:24:34 +02:00
Bård Skaflestad	562c133dff	toInjectorType(): Pass parameter as "reference-to-const" rather than copied object.	2012-05-15 17:22:05 +02:00
Bård Skaflestad	156bf0a560	toInjectorType(): Distinguish types based on first characters only. ... The manual states that injection types in the "WCONINJE" keyword need only be specified using a single character.	2012-05-15 17:19:35 +02:00
Bård Skaflestad	9e41d1860d	Hide output that's presumably diagnostic behind (undefined) macro.	2012-05-11 15:07:10 +02:00
Atgeirr Flø Rasmussen	1aa5d6b293	Silence a warning.	2012-05-10 15:30:33 +02:00
Kjetil Olsen Lye	5d0148a080	Added correct handling of VREP and REIN keyword. No longer generates a warning, just a friendly hint.	2012-05-09 16:03:21 +02:00
Kjetil Olsen Lye	ff9fb38596	Used voidage_replacment correctly in applyExplicitReinjectionControls	2012-05-09 15:55:59 +02:00
Kjetil Olsen Lye	bf3273b115	Included voidage_replacment in injection specification.	2012-05-09 15:54:25 +02:00
Kjetil Olsen Lye	f8d92c0535	Added initial support for VREP.	2012-05-09 15:43:43 +02:00
Kjetil Olsen Lye	d46d191a81	Introduced a hack to make it possible to test reinjection without supporting surface rate controls.	2012-05-09 13:58:25 +02:00
Kjetil Olsen Lye	12e4125081	Multiplied with reinjection_fraction_target, as is proper.	2012-05-09 13:15:53 +02:00
Kjetil Olsen Lye	622d8ac767	Added helpful comment.	2012-05-09 12:58:29 +02:00
Kjetil Olsen Lye	621c87d8c7	Added simple reinjection to group control (explicit)	2012-05-09 12:57:36 +02:00
Kjetil Olsen Lye	3eeee29edb	Added summation method to find total produced rates in a given group.	2012-05-09 12:35:26 +02:00
Kjetil Olsen Lye	c2ce4d9bce	Corrected some basic logic tests.	2012-05-09 11:29:13 +02:00
Kjetil Olsen Lye	a28311cb7c	Inserted reservoir max rate into the group structure	2012-05-07 14:28:33 +02:00
Kjetil Olsen Lye	8702852524	Made reservoir rates have a small error tolerated	2012-05-03 16:04:48 +02:00
Kjetil Olsen Lye	6ee088550f	Properly negate target for group control in WellNode	2012-05-03 15:44:51 +02:00
Kjetil Olsen Lye	da92997b7b	Made a maximum number of iterations in wells_test	2012-05-03 15:35:44 +02:00
Kjetil Olsen Lye	18ace3c137	Made REIN a warning rather than a throw, just to get something up and running	2012-05-02 16:59:42 +02:00
Kjetil Olsen Lye	72afe774b0	Fixed applyGroupControls to handle zero guide rates	2012-05-02 16:54:49 +02:00
Kjetil Olsen Lye	da85405dfa	Removed calculateGuideRates and made all guide rate dependent code calculate the guide rate dynamically	2012-05-02 15:41:05 +02:00
Kjetil Olsen Lye	fe51b96a7e	Final fixes for new well structure (to make it compile)	2012-05-02 13:02:59 +02:00
Atgeirr Flø Rasmussen	9416042f5a	Major restructuring to improve support for groups, multiple controls etc. Work in progress.	2012-05-02 09:39:05 +02:00
Kjetil Olsen Lye	63c16c9d15	Slightly changed bounds checking to account for negative limits.	2012-04-26 08:52:56 +02:00
Kjetil Olsen Lye	743085bd16	Added some more documentation	2012-04-25 16:45:32 +02:00
Kjetil Olsen Lye	38c02c5a63	Change from std::string to const std::string& in findGroup-methods	2012-04-25 16:42:55 +02:00
Kjetil Olsen Lye	7d25e9c6a0	Completly revamped the way group control is checked	2012-04-25 16:14:40 +02:00
Atgeirr Flø Rasmussen	81cf6e3b32	Removed unused saturation argument from conditionsMet() methods.	2012-04-25 14:03:57 +02:00
Kjetil Olsen Lye	672f0f9b2b	Added default oil handling	2012-04-23 13:49:53 +02:00
Kjetil Olsen Lye	c9d6fd5529	Added a (small) hack to wellmanager (defaulting injected_phase to water)	2012-04-23 13:24:47 +02:00
Atgeirr Flø Rasmussen	a96ac0bc9e	Renamed some enums and functions relating to Wells, and started documenting it.	2012-04-20 09:50:36 +02:00
Kjetil Olsen Lye	069ad5a611	Passed around a WellControlResult argument to the different wellcontrol functions	2012-04-17 16:36:49 +02:00
Kjetil Olsen Lye	b0b13c71f9	Fixed a compilation bug, also adjusted computeWDP slightly to allow for either a saturation vector by grid cells or by well cells	2012-04-17 09:19:06 +02:00
Kjetil Olsen Lye	95818d1f02	Added shutdown of wells when they exceed their limits (if procedure = shut).	2012-04-17 08:59:20 +02:00
Kjetil Olsen Lye	24cefa60bc	Fixed group control for liquid flow	2012-04-16 17:42:11 +02:00
Kjetil Olsen Lye	dedc60d92d	Fixed reading of gconprod to handle defaulted arguments better	2012-04-16 17:10:17 +02:00
Kjetil Olsen Lye	bc72ea9a44	Made it possible to use group control without gconprod keyword	2012-04-16 15:26:33 +02:00
Kjetil Olsen Lye	29ebfac858	Added reading of reservoir fluid max rate for GCONINJE	2012-04-16 14:49:13 +02:00
Kjetil Olsen Lye	a7e471951d	Added further checks for well conditions. Fixed a small bug in reading WCONPROD	2012-04-16 13:44:53 +02:00
Kjetil Olsen Lye	24dc20ba4d	modified the group control interface slightly	2012-04-13 20:41:09 +02:00
Kjetil Olsen Lye	9d1c9dee68	extra tests for injector wells in group control	2012-04-13 13:17:25 +02:00
Kjetil Olsen Lye	62e4b791d2	Added checks for BHP and fluid_volume_rate for group control. Also added error tolerance for group control	2012-04-13 12:57:47 +02:00
Kjetil Olsen Lye	246af80ee8	Fixed a small bug in reading of WCONPROD	2012-04-13 11:37:50 +02:00
Kjetil Olsen Lye	f1cc0d56e8	Added reading of WGRUPCON, also added guide_rates to the well groups. Fixed a small bug in calculateWDP	2012-04-13 10:32:36 +02:00
Kjetil Olsen Lye	fb6bde6e04	Changed input arguments for group checking	2012-04-12 16:56:58 +02:00
Atgeirr Flø Rasmussen	608766421b	Initialize data members in declared order.	2012-04-12 16:52:57 +02:00
Kjetil Olsen Lye	ee736d8071	Made IncompTpfa receive wells-output-arguments	2012-04-12 16:36:08 +02:00
Kjetil Olsen Lye	4150e4a184	Made queries upwards from wells to group to group	2012-04-12 15:48:24 +02:00
Kjetil Olsen Lye	c931e2a1fb	Made the WellNode be aware of their own index	2012-04-12 14:25:39 +02:00