Commit Graph

402 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
71207f04c9 Merged. 2012-05-15 13:21:02 +02:00
Atgeirr Flø Rasmussen
7df0023038 Added WellReport::push() overload taking BlackoilPropertiesInterface. 2012-05-15 12:50:02 +02:00
Atgeirr Flø Rasmussen
7700716d32 Added utility functions for compressible fluid case. 2012-05-15 12:49:15 +02:00
Atgeirr Flø Rasmussen
0d88b83546 Added satRange() method to BlackoilPropertiesInterface. 2012-05-15 12:48:16 +02:00
Bård Skaflestad
8ed2e18e15 assignPermeability(): Don't build an Inspector to count global cells.
Thus, assingPermeability() is applicable to simulation decks that
aren't based on corner-point descriptions (e.g., the (DXV,DYV,DZV)
grid type).
2012-05-15 12:07:04 +02:00
Bård Skaflestad
43bb6eac78 WellsManager(): Support grids that do not define "global_cell"
Assume that the "global_cell" in that case corresponds to the identity
mapping.
2012-05-15 11:54:59 +02:00
Atgeirr Flø Rasmussen
ead94905db Merged. 2012-05-14 21:49:24 +02:00
Atgeirr Flø Rasmussen
c0d43a69bd Now computePorevolume() takes a porosity array instead of a property object.
This is to make it compatible with blackoil properties.
An alternative would be to give [Incomp|Blackoil]PropertiesInterface a
common base class (RockInterface?) with the common rock-related methods.
2012-05-14 21:47:10 +02:00
Atgeirr Flø Rasmussen
a6034be47d Merged. 2012-05-14 11:29:06 +02:00
Atgeirr Flø Rasmussen
d4e530eb3c Added surfaceDensity() method to BlackoilPropertiesInterface. 2012-05-14 11:28:05 +02:00
Atgeirr Flø Rasmussen
6f0f9ff188 Added surfaceDensity() method to IncompPropertiesInterface. 2012-05-14 11:21:13 +02:00
Atgeirr Flø Rasmussen
27eecd954e 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
cd4026f6c4 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
86ab541f66 Fix silly mistake: Multiplying from the right scales columns, not rows. 2012-05-11 16:26:41 +02:00
Bård Skaflestad
02d3601072 Merge from upstream. 2012-05-11 16:08:06 +02:00
Bård Skaflestad
64b47cd304 Comment on the various stages in producing dA/dp result. 2012-05-11 16:07:01 +02:00
Atgeirr Flø Rasmussen
8b27b4a05d Minor doc update. 2012-05-11 15:10:02 +02:00
Bård Skaflestad
9e41d1860d Hide output that's presumably diagnostic behind (undefined) macro. 2012-05-11 15:07:10 +02:00
Bård Skaflestad
29cb30ed58 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
0a2c9ff000 Update doc. 2012-05-11 13:02:48 +02:00
Atgeirr Flø Rasmussen
0677f58026 Simplified data structure for extracted columns. 2012-05-11 09:37:12 +02:00
Bård Skaflestad
a865f01478 comprock_increment(): Don't proceed to mult_csr() unless OK. 2012-05-10 22:29:41 +02:00
Atgeirr Flø Rasmussen
a4b32311b2 Fix indexing bug in well handling code for incremental (Newton) pressure assembly. 2012-05-10 15:31:51 +02:00
Atgeirr Flø Rasmussen
1aa5d6b293 Silence a warning. 2012-05-10 15:30:33 +02:00
Kjetil Olsen Lye
10b738c7e3 Merge. 2012-05-10 12:50:22 +02:00
Xavier Raynaud
8842943794 Make compressible pressure solver compatible with well management. 2012-05-10 12:38:29 +02:00
Kjetil Olsen Lye
f24d286f18 Added error handling to pressure solver. 2012-05-10 09:55:34 +02:00
Bård Skaflestad
0cd6a0a0c6 Realign pointer offsets to provide additional visual cues. 2012-05-09 22:39:28 +02:00
Bård Skaflestad
a920b472e2 Fix copy-paste misprint in comment. 2012-05-09 20:17:10 +02:00
Bård Skaflestad
3ab9390921 Delete trailing whitespace introduced in change-set b39f2340f248 . 2012-05-09 20:15:10 +02:00
Bård Skaflestad
1672ae8c29 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
9809afb3a8 Whitespace adjustment. No functional changes. 2012-05-09 19:21:52 +02:00
Bård Skaflestad
56802231ce Re-align variable declarations various assemble*() methods. 2012-05-09 19:21:00 +02:00
Bård Skaflestad
97ed64f438 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
00b1ce27f0 Follow file conventions in mult_csr_matrix(). 2012-05-09 19:07:59 +02:00
Bård Skaflestad
323914eaba Don't expose a (presently) internal function. 2012-05-09 18:58:17 +02:00
Bård Skaflestad
d23c93e661 Merge from upstream. 2012-05-09 18:56:09 +02:00
Bård Skaflestad
8909664bd7 Report first well whose connections are outside grid. 2012-05-09 18:44:08 +02:00
Bård Skaflestad
6a7c6cfeb0 Convert Residual-based solver to conventions of <newwells.h>.
Almost a mechanical translation.
2012-05-09 16:26:41 +02:00
Bård Skaflestad
eda46d4fbe 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
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
84eb849ed2 merge. 2012-05-09 15:56:30 +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
Xavier Raynaud
1892f80af2 merge 2012-05-09 15:15:13 +02:00
Xavier Raynaud
f7e2d88fd9 Added Newton compressible fluid solver. 2012-05-09 15:06:13 +02:00
Kjetil Olsen Lye
8ad72d5d1c Added explicit number of ControlMode. 2012-05-09 14:26:30 +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