Commit Graph

463 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
1365dcd6b8 Initialise current well control in the appropriate place. 2012-04-19 16:11:58 +02:00
Atgeirr Flø Rasmussen
dcad28acbd Silence warnings about unhandled cases. 2012-04-19 16:11:28 +02:00
Atgeirr Flø Rasmussen
605933abba Pretty-formatting only. 2012-04-19 15:33:25 +02:00
Atgeirr Flø Rasmussen
3fcdb1f412 Bugfix: in SATNUM treatment, allow for inactive cells. 2012-04-19 15:00:56 +02:00
Atgeirr Flø Rasmussen
844ccf3562 Now saturation props read from deck may have multiple tables, and support SATNUM. 2012-04-19 11:49:59 +02:00
Atgeirr Flø Rasmussen
b0c60ee05b Make constructor take arguments by reference. Silence a warning. 2012-04-19 11:47:41 +02:00
Atgeirr Flø Rasmussen
74b3a40bbf Make column gravity Gauss-Seidel solver report average number of iterations. 2012-04-19 11:46:41 +02:00
Xavier Raynaud
c8dfdecb7c Removed warning from compiler. 2012-04-18 14:46:01 +02:00
Xavier Raynaud
6c3220077a merge. 2012-04-17 17:26:23 +02:00
Kjetil Olsen Lye
5d39e3c0ef merge 2012-04-17 09:25:54 +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
Bård Skaflestad
57d6bc9b03 InjectionSpecification: Initialise fields in declaration order. 2012-04-16 19:29:22 +02:00
Bård Skaflestad
627c3be1f9 InjectionSpecification: Split long lines. No functional changes. 2012-04-16 19:27:34 +02:00
Xavier Raynaud
92dc5e2368 Added setup functions which take arguments directly (do not use ParamterGroup) 2012-04-16 17:53:10 +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
67251e7f77 Added documententation of computeWDP and computeFlowRatePerWell 2012-04-16 11:39:16 +02:00
Kjetil Olsen Lye
106b688a55 Inserted previously uncommented line 2012-04-16 11:27:46 +02:00
Kjetil Olsen Lye
d4b849f215 merge. 2012-04-13 20:41:19 +02:00
Kjetil Olsen Lye
24dc20ba4d modified the group control interface slightly 2012-04-13 20:41:09 +02:00
Atgeirr Flø Rasmussen
2313339844 Fix bug: mistakenly swapped macros. 2012-04-13 16:36:51 +02:00
Atgeirr Flø Rasmussen
8c58165862 Added LinearSolverFactory class. 2012-04-13 16:33:51 +02:00
Bård Skaflestad
9a935b0efb Merge from upstream. 2012-04-13 15:57:11 +02:00
Atgeirr Flø Rasmussen
588060d1e6 Use C comments in C code. 2012-04-13 15:46:15 +02:00
Atgeirr Flø Rasmussen
709b8c0b82 Work around mismatch between our HAVE_BOOST and what dune-istl expects.
In our config.h, HAVE_BOOST is defined (empty).
In dune-istl it is expected to be defined to 0 or 1.
2012-04-13 15:37:11 +02:00
Kjetil Olsen Lye
af849bf9e9 Added computations for total flow for each well 2012-04-13 14:22:44 +02:00
Bård Skaflestad
a950a5c732 well_controls_append(): Use C comment delimiters in C. 2012-04-13 14:09:20 +02:00
Kjetil Olsen Lye
c992deb147 prettification 2012-04-13 13:21:33 +02:00
Kjetil Olsen Lye
3058e26447 merge 2012-04-13 13:20:36 +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
Bård Skaflestad
9059af9b41 Opm::computeWDP(): Don't shadow (well) loop counter in phase loop. 2012-04-12 22:43:33 +02:00
Bård Skaflestad
a38efedc8d Opm::computeWDP(): Match definition and prototype.
Specifically, accept the densities as a reference to const, not just a
const object.
2012-04-12 22:41:03 +02:00
Bård Skaflestad
6a5534ae2e Pass correctly sized well-rate solution vectors to ifs_tpfa_press_flux().
The function computes a total flux at each perforation (connection), not
just one total flux per well.  Update documentation accordingly.
2012-04-12 20:27:29 +02:00
Kjetil Olsen Lye
74fc0a5c25 Made a (possibly wrong) adjustment to well_controls_append. Each control now has its current index set to 0, as there's only supposed to be one control per well. 2012-04-12 18:47:06 +02:00
Xavier Raynaud
4b193f34ec Added Latex format in documentation. 2012-04-12 18:13:57 +02:00
Kjetil Olsen Lye
7c21765100 Made a computeWDP-function 2012-04-12 17:50:51 +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
6756d6b6c3 Made us of wells output arguments in IncompTpfa 2012-04-12 16:39:12 +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
Atgeirr Flø Rasmussen
7dcec8976b Moved internal functions into anonymous namespace. 2012-04-11 10:56:08 +02:00