Commit Graph

1665 Commits

Author SHA1 Message Date
Xavier Raynaud
fd9a3318b0 normalized tabification in spu_2p. 2012-05-10 13:50:22 +02:00
Kjetil Olsen Lye
51c1da1df8 Merge. 2012-05-10 12:50:22 +02:00
Xavier Raynaud
1e7101a91b Make compressible pressure solver compatible with well management. 2012-05-10 12:38:29 +02:00
Kjetil Olsen Lye
68a9f889e7 Added error handling to pressure solver. 2012-05-10 09:55:34 +02:00
Bård Skaflestad
2df84c74a8 Realign pointer offsets to provide additional visual cues. 2012-05-09 22:39:28 +02:00
Bård Skaflestad
762fcc76b4 Fix copy-paste misprint in comment. 2012-05-09 20:17:10 +02:00
Bård Skaflestad
eacad0c06a Delete trailing whitespace introduced in change-set b39f2340f248 . 2012-05-09 20:15:10 +02:00
Bård Skaflestad
2bfb829a53 COMPDAT: Extract location from WELSPECS if defaulted.
This behaviour is dictated by the ECLIPSE specification.
2012-05-09 20:14:29 +02:00
Bård Skaflestad
f4fb9920ef Whitespace adjustment. No functional changes. 2012-05-09 19:21:52 +02:00
Bård Skaflestad
3d6a11a0a3 Re-align variable declarations various assemble*() methods. 2012-05-09 19:21:00 +02:00
Bård Skaflestad
a635b4c09c Call malloc() once, at pimpl construction time, rather than in each *_increment().
It's slightly wasteful, however.  Maybe we can just reuse h->x for the
mult_csr_matrix() output?
2012-05-09 19:15:41 +02:00
Bård Skaflestad
3c567c409c Follow file conventions in mult_csr_matrix(). 2012-05-09 19:07:59 +02:00
Bård Skaflestad
fbb8ae77b1 Don't expose a (presently) internal function. 2012-05-09 18:58:17 +02:00
Bård Skaflestad
8afc0571f9 Merge from upstream. 2012-05-09 18:56:09 +02:00
Bård Skaflestad
7138e09a1f Report first well whose connections are outside grid. 2012-05-09 18:44:08 +02:00
Bård Skaflestad
7d93097297 Convert Residual-based solver to conventions of <newwells.h>.
Almost a mechanical translation.
2012-05-09 16:26:41 +02:00
Bård Skaflestad
f90a451370 Add a query method to answer whether or not the deck defines any wells. 2012-05-09 16:09:13 +02:00
Kjetil Olsen Lye
9f651f255c 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
53dd538e99 merge. 2012-05-09 15:56:30 +02:00
Kjetil Olsen Lye
26abaaf484 Used voidage_replacment correctly in applyExplicitReinjectionControls 2012-05-09 15:55:59 +02:00
Kjetil Olsen Lye
a0ad1f0acf Included voidage_replacment in injection specification. 2012-05-09 15:54:25 +02:00
Kjetil Olsen Lye
3bb9fcb58d Corrected some default values in GCONINJE. 2012-05-09 15:48:27 +02:00
Kjetil Olsen Lye
fba33e03d8 Reading the voidage replacement fraction from GCONINJE. 2012-05-09 15:47:01 +02:00
Kjetil Olsen Lye
322831d0b1 Added initial support for VREP. 2012-05-09 15:43:43 +02:00
Xavier Raynaud
9dabbd349f Added Newton compressible pressure solver in spu_2p. 2012-05-09 15:19:37 +02:00
Xavier Raynaud
8b0db641f4 merge 2012-05-09 15:15:13 +02:00
Xavier Raynaud
dbb34c73a6 Added Newton compressible fluid solver. 2012-05-09 15:06:13 +02:00
Xavier Raynaud
933d4adf44 Modified spu_2p to agree with newton compressible pressure solver. 2012-05-09 14:49:23 +02:00
Kjetil Olsen Lye
322801dfb5 Added explicit number of ControlMode. 2012-05-09 14:26:30 +02:00
Kjetil Olsen Lye
b7f16fa732 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
82f0128a81 Multiplied with reinjection_fraction_target, as is proper. 2012-05-09 13:15:53 +02:00
Kjetil Olsen Lye
f2b847bb2c Added explicit reinjection to spu_2p. 2012-05-09 13:15:02 +02:00
Kjetil Olsen Lye
9c7097381d Made relevant methods in WellCollection and WellsManager to call the reinjection control functions 2012-05-09 13:03:37 +02:00
Kjetil Olsen Lye
50cb06a592 Added helpful comment. 2012-05-09 12:58:29 +02:00
Kjetil Olsen Lye
2394a474fc Added simple reinjection to group control (explicit) 2012-05-09 12:57:36 +02:00
Kjetil Olsen Lye
965b6d54d8 Added summation method to find total produced rates in a given group. 2012-05-09 12:35:26 +02:00
Kjetil Olsen Lye
c72c4eed7c Corrected some basic logic tests. 2012-05-09 11:29:13 +02:00
Kjetil Olsen Lye
5cf205f225 Added failure checking for solve method. 2012-05-09 11:28:56 +02:00
Bård Skaflestad
a3b5e11ecc Remove a variable rendered unused by change-set 5a9bf9f4a8b9. 2012-05-09 11:27:23 +02:00
Bård Skaflestad
7ca9f6525d Flatten loops and prefer memcpy() to manual copying. 2012-05-09 11:21:47 +02:00
Bård Skaflestad
7cd1a9ed05 Correct inaccuracy in WellControls::distr description.
The distribution is specified per control, not per well.
2012-05-09 11:11:47 +02:00
Kjetil Olsen Lye
832a2adb7f merge. 2012-05-09 10:22:18 +02:00
Kjetil Olsen Lye
8e49914bbd Added friendly printout 2012-05-09 10:17:58 +02:00
Kjetil Olsen Lye
338f5907a6 Added well controls in spu2p 2012-05-09 10:14:38 +02:00
Kjetil Olsen Lye
738ec64ac8 Added necessary input parameters for well checking in spu_2p 2012-05-09 09:48:49 +02:00
Bård Skaflestad
a2e5c4b44e Add basic parameter sanity checks.
The "cells" parameter must be non-null in the relperm(), capPress(),
and satrange() methods.
2012-05-08 17:59:40 +02:00
Atgeirr Flø Rasmussen
27d7b433e3 Merged. 2012-05-08 16:00:54 +02:00
Atgeirr Flø Rasmussen
1e61783cd3 Use proper transport source term to compute injected and produced fluid. 2012-05-08 15:52:07 +02:00
Kjetil Olsen Lye
517121470e merge. 2012-05-08 12:25:29 +02:00
Kjetil Olsen Lye
339a652e5d Changed some minor bugs in the refactored code in wells_example 2012-05-08 12:23:58 +02:00