Commit Graph

2688 Commits

Author SHA1 Message Date
Bård Skaflestad
b990022c93 Fix build.
Pointy hat to self.
2010-12-07 19:35:31 +01:00
Bård Skaflestad
c52a248ea4 Merge from upstream. 2010-12-07 18:29:01 +01:00
Bård Skaflestad
68f80cecd7 Update calls to account for addition of well support in CFS_TPFA. 2010-12-07 17:55:54 +01:00
Bård Skaflestad
506546f2d2 Add retrieval of well BHP and perforation fluxes.
Callers may pass NULLs if any given model does not contain wells.
2010-12-07 17:30:13 +01:00
Bård Skaflestad
7830e54fd1 Add tentative Peaceman well support.
Callers may pass NULLs in absence of wells in any given model.  This
implementation assembles an equation for each well, irrespective of
well control type (BHP or RATE), and assumes that productivity indices
and perforation pressure drops account for multiphase effects.
2010-12-07 17:12:09 +01:00
Atgeirr Flø Rasmussen
faa2700616 Using uniform monotone approach on dead oil/gas. Changes results (improvement). 2010-12-07 16:45:49 +01:00
Bård Skaflestad
80ee3d96dc Document remaining members of struct 'compr_quantities'. 2010-12-07 15:01:47 +01:00
Atgeirr Flø Rasmussen
fac350b657 Volume disrcrepancy is now computed with other fluid data. 2010-12-07 11:37:07 +01:00
Atgeirr Flø Rasmussen
b8d5e6c845 Now computes faceA in the same way as is done in Matlab, I think. 2010-12-06 16:58:04 +01:00
Atgeirr Flø Rasmussen
c7b180de7b Variable renaming. 2010-12-06 15:11:47 +01:00
Atgeirr Flø Rasmussen
5a06869499 Merge. 2010-12-06 14:28:52 +01:00
Atgeirr Flø Rasmussen
05e3d5d311 Typo fix. Also, last log message was wrong. Correct: ensure enum consistency. 2010-12-06 14:28:17 +01:00
Atgeirr Flø Rasmussen
34b3e758e8 Several changes:
- Got rid of FlowSolution object (reintroduce if abstraction needed).
 - Changed estimateCellVelocitySimpleInterface() to match.
 - Face pressures now are part of the interface for the pressure solver
   (you are supposed to initialize them properly, too).
 - Changed test program to match changes.
 - Face pressures as output by pressure solver are now propagated to
   the outside.

The last item is a behavioural change, so all results are slightly
different.
2010-12-06 14:23:54 +01:00
Bård Skaflestad
192e4b9d7e Allocate memory resources for well DOFs. 2010-12-06 13:26:47 +01:00
Bård Skaflestad
f927d9cc97 Be more specific in comment. 2010-12-06 13:17:04 +01:00
Bård Skaflestad
692ba48317 Add well<->cell topology to system matrix. 2010-12-06 12:43:03 +01:00
Bård Skaflestad
9b9322a4da Only maintain number of rows in CSR matrix.
We will generate square matrices only in the foreseeable future and
there is no need to maintain the number of columns (the 'n' member)
separately.  Update all users accordingly.
2010-12-06 12:41:12 +01:00
Atgeirr Flø Rasmussen
d1a390a136 Added more data (for transport) and comments. 2010-12-06 11:09:52 +01:00
Atgeirr Flø Rasmussen
3df3114453 Added comment. 2010-12-06 11:09:30 +01:00
Atgeirr Flø Rasmussen
bb0fc43b25 Refactoring in progress: moving fluid computations out of solvers. 2010-12-06 10:41:22 +01:00
Bård Skaflestad
0dc0be4cad Use more traditional spelling of static function declaration. 2010-12-05 13:52:03 +01:00
Atgeirr Flø Rasmussen
e5525ce1c0 Explicit copy matrix content after assignment semantics changed. 2010-12-02 13:28:36 +01:00
Bård Skaflestad
5cc1f63763 Merge from upstream 2010-12-01 15:09:28 +01:00
Atgeirr Flø Rasmussen
d6aaf43b7e Added explicitTransport() method, for IMPES type simulation. 2010-12-01 14:12:41 +01:00
Bård Skaflestad
ac3639ad4d Explicitly enforce zero flux in absence of other boundary information. 2010-11-25 14:33:04 +01:00
Atgeirr Flø Rasmussen
640dea22cd Fixed sign bug in dBdp function. 2010-11-24 10:30:59 +01:00
Bård Skaflestad
93eb36d802 M-x delete-trailing-whitespace . 2010-11-23 16:51:06 +01:00
Bård Skaflestad
e274288d24 Implement (IMPES) mass transport across internal interfaces.
Based on component formulas derived from the ->pimpl->masstrans_f and
->pimpl->gravtrans_f quantities.
2010-11-23 16:46:49 +01:00
Atgeirr Flø Rasmussen
cf57ec6d1f Implemented compressibilities and volume discrepancies. Untested. 2010-11-23 16:18:20 +01:00
Atgeirr Flø Rasmussen
e3bfe58574 Fixed a bug in the fluid code (getting B instead of A), handle zero liquid volume. 2010-11-23 09:39:37 +01:00
Atgeirr Flø Rasmussen
9ee3b6e3de Tpfa tess compiles with BlackoilFluid. 2010-11-23 09:02:09 +01:00
Bård Skaflestad
16e2bfb679 Spell phase-mobility (per face) member correctly. 2010-11-22 19:04:52 +01:00
Bård Skaflestad
53edb1e074 Really catch up to cset e9ec0757e7a7. 2010-11-22 15:44:22 +01:00
Bård Skaflestad
da375a5ef3 Catch up to cset e9ec0757e7a7. 2010-11-22 15:42:38 +01:00
Bård Skaflestad
73b0cd9a8c Merge from upstream. 2010-11-22 15:12:18 +01:00
Atgeirr Flø Rasmussen
bfa0d24396 Merge. 2010-11-22 15:04:13 +01:00
Atgeirr Flø Rasmussen
ebb352dc04 A large number of additions to start testing compressible tpfa-solver. 2010-11-22 15:00:26 +01:00
Atgeirr Flø Rasmussen
4c0cf9edc3 A large number of additions to start testing compressible tpfa-solver. 2010-11-22 15:00:26 +01:00
Atgeirr Flø Rasmussen
6dae634141 A large number of additions to start testing compressible tpfa-solver. 2010-11-22 15:00:26 +01:00
Ove Saevareid
65a6604112 Oil relperm: krocw_ evaluated at connate water, krow at sw. 2010-11-22 13:07:24 +01:00
Bård Skaflestad
b0fe50b74a Add utility functions for retrieving phase transmissibilities. 2010-11-22 12:17:14 +01:00
Bård Skaflestad
2f4b85d362 Only compute face pressure values if explicitly requested.
Following cset ba5d27f90d7a there is no need to compute the interface
pressure values after every linear solve.  Re-factor
cfs_tpfa_press_flux() to only compute cell pressures and interface
fluxes, and move interface pressure value computation to cfs_tpfa_fpress().
2010-11-22 11:36:47 +01:00
Bård Skaflestad
65348c9307 Merge from upstream. 2010-11-19 16:13:43 +01:00
Atgeirr Flø Rasmussen
9f92e793b6 Removed erroneous check. 2010-11-19 15:32:18 +01:00
Bård Skaflestad
064f0844a5 Merge from upstream. 2010-11-19 15:20:22 +01:00
Atgeirr Flø Rasmussen
6673f924dc Only check boundary conditions on outer boundary in compute_flux(). 2010-11-19 15:11:57 +01:00
Bård Skaflestad
f10c91bbfb Join two short lines. Type conversion previously removed. 2010-11-19 14:49:32 +01:00
Bård Skaflestad
0a2abcae81 Merge from upstream. 2010-11-19 14:36:12 +01:00
Bård Skaflestad
6f3b1b3f16 Complete transition to all-int topology in CSRMatrix structure.
Having a 'MAT_SIZE_T' that is sometimes an int and sometimes an
mwSignedIndex is asking for trouble.  The practical impact for OPM is
low, though, as this issue affects only the MEX interface.
2010-11-19 14:35:39 +01:00
Atgeirr Flø Rasmussen
c6198d463e Removed unnecessary variable. 2010-11-19 14:05:03 +01:00