Commit Graph

613 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
742303534a Added preliminary sketch of compressible tpfa solver.
This solver is:
 - using the residual based assembler,
 - aiming to include the nonlinear Newton iterations
   (therefore also the (re-)evaluation of fluid data).
2012-05-14 10:53:50 +02:00
Bård Skaflestad
9ad85e1039 matrix(): Reduce likelihood of reintroducing error fixed in cset 91ad967a15a0.
Specifically, rename loop variables i1->row and i2->col to better
reflect purpose.
2012-05-11 16:31:05 +02:00
Bård Skaflestad
713225dcdd Fix silly mistake: Multiplying from the right scales columns, not rows. 2012-05-11 16:26:41 +02:00
Bård Skaflestad
4683d6068e Merge from upstream. 2012-05-11 16:08:06 +02:00
Bård Skaflestad
3d1b9678e3 Comment on the various stages in producing dA/dp result. 2012-05-11 16:07:01 +02:00
Atgeirr Flø Rasmussen
541c1d3dbe Minor doc update. 2012-05-11 15:10:02 +02:00
Bård Skaflestad
ca12733ba1 Hide output that's presumably diagnostic behind (undefined) macro. 2012-05-11 15:07:10 +02:00
Bård Skaflestad
226a3eac94 matrix(): Honour chain rule of differentiation.
The original implementation of change-set 90d8dd8c8040 contained a
crucial misprint leading to incorrect results for all compressible
fluids.
2012-05-11 14:26:48 +02:00
Atgeirr Flø Rasmussen
d041ad8f4f Update doc. 2012-05-11 13:02:48 +02:00
Atgeirr Flø Rasmussen
d123406a33 Add test for size one columns. 2012-05-11 12:41:18 +02:00
Atgeirr Flø Rasmussen
5b2e99ec4c Split disjoint columns in extractColumns(). Add test case. 2012-05-11 11:20:18 +02:00
Atgeirr Flø Rasmussen
891696e333 Simplified data structure for extracted columns. 2012-05-11 09:37:12 +02:00
Bård Skaflestad
c521c0a0f6 comprock_increment(): Don't proceed to mult_csr() unless OK. 2012-05-10 22:29:41 +02:00
Atgeirr Flø Rasmussen
7eb2ed764e Fix indexing bug in well handling code for incremental (Newton) pressure assembly. 2012-05-10 15:31:51 +02:00
Atgeirr Flø Rasmussen
f93cbf3c4a Silence a warning. 2012-05-10 15:30:33 +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
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
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
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