Commit Graph

4470 Commits

Author SHA1 Message Date
Ove Saevareid
5c358c2de4 MiscibilityLiveOil: Additional undersaturated table entries and a few fixes. 2011-01-25 11:52:50 +01:00
Atgeirr Flø Rasmussen
6c5520a9ad Merge. 2011-01-24 14:37:32 +01:00
Atgeirr Flø Rasmussen
fba93287c9 Fixed sign of gravity input to pressure solver. 2011-01-24 14:34:38 +01:00
Bård Skaflestad
5c3b6432b2 Explicitly state that ratio->psum is a scalar per total connection. 2011-01-24 11:21:25 +01:00
Bård Skaflestad
079d2704a6 Merge from upstream. 2011-01-20 16:07:36 +01:00
Atgeirr Flø Rasmussen
3ecfac750a Updated to match changed C interface. 2011-01-20 16:01:58 +01:00
Bård Skaflestad
e23b9e5aff Satisfy all post-conditions of compute_densrat_update()
The total (accumulated) phase contributions must be available in
ratio->psum for each completion when leaving the function.
2011-01-20 10:49:11 +01:00
Bård Skaflestad
8efa1b88e2 Add compressible well completion flows.
Specifically, allocate storage for 'masstrans' and 'gravtrans' terms
per well completion (perforation), as well as compressible
transmissibilities (scalar per completion).  Calculate compressible
quantities by treating each completion as an interface.

Introduce a new structure, 'completion_data', to collect static and
dynamic discretisation data pertaining to each completion (e.g.,
productivity indices, gravity potentials and density ratio
operators).  Pass this structure, rather than individual fields, into
affected CFS_TPFA entry points.

Compile tested only.
2011-01-19 20:20:15 +01:00
Bård Skaflestad
570ca120b9 Restructure calculation of compressible terms.
Specifically, rename the obtuse structure 'disc_data' to the more targeted
'densrat_util' and hoist the compressible terms 'ctrans' and 'P' into
the 'cfs_tpfa_impl' structure.  Moreover, rename the remaining fields
into something that makes sense in (almost) isolation.  Update
compute_densrat_update() and cfs_tpfa_construct() accordingly.

This is in preparation of adding compressible well terms.
2011-01-19 12:08:12 +01:00
Ove Saevareid
419faa324f BugReport: MiscibilityLiveOil::miscible_oil, several issues here ... 2011-01-18 14:33:55 +01:00
Bård Skaflestad
f5eaab04fe Reorder internal functions for call-sequence consistency. 2011-01-18 13:49:35 +01:00
Bård Skaflestad
0a42f65a52 Add gravity contributions to flux.
Only really verified for incompressible data.  There are likely to be
programming errors.
2011-01-16 21:21:06 +01:00
Bård Skaflestad
2e3a5fff64 Improve gravity handling in linear system.
Specifically, only assemble gravity contributions on internal faces or
external Dirichlet faces.  Moreover, pay attention to direction of
gravity flux (in/out of cell) during assembly.
2011-01-14 20:30:07 +01:00
Ove Saevareid
f7dc641f4f Bugfix 2011-01-14 17:15:04 +01:00
Atgeirr Flø Rasmussen
827bd17d5d Added transmissibilities to transport solver. Fixed some initialization issues. 2011-01-13 16:04:19 +01:00
Bård Skaflestad
e7214faf0f Re-install zero-level enforcement, but only for incompressible problems. 2011-01-13 14:19:07 +01:00
Bård Skaflestad
4d6a286ab4 Remove enforcement of pressure zero level for pure Neumann problems.
This direct manipulation of the linear system is inappropriate when
solving compressible flows where the absolute pressure level matters
greatly.
2011-01-13 13:06:45 +01:00
Atgeirr Flø Rasmussen
fefaa301e7 Removed zero-gravity check, since we now (supposedly) handle gravity. 2011-01-13 09:23:01 +01:00
Atgeirr Flø Rasmussen
c9e9b07c5f Made phasemobc public since it is needed by the transport solver. 2011-01-13 09:21:17 +01:00
Atgeirr Flø Rasmussen
15438e67fc Added gravity support. Not yet tested. 2011-01-12 09:02:02 +01:00
Atgeirr Flø Rasmussen
4752cecffa Added surfaceDensities(). 2011-01-11 16:11:50 +01:00
Atgeirr Flø Rasmussen
4ce8b87c0f Ensure proper behaviour if well object is empty. 2011-01-07 14:43:53 +01:00
Atgeirr Flø Rasmussen
da647c6658 Work in progress adding wells to transport part. 2011-01-06 11:23:58 +01:00
Bård Skaflestad
30a7644e9f Update for sub-repo state change. 2011-01-06 10:12:02 +01:00
Atgeirr Flø Rasmussen
d478df23cf Added missing well argument in function call. 2011-01-06 09:28:51 +01:00
Atgeirr Flø Rasmussen
2e40522940 Properly initialize with wells. New init() overload with wells. 2011-01-05 13:36:54 +01:00
Atgeirr Flø Rasmussen
16b2d16452 Fixed usage of wctrl object. 2011-01-05 11:15:51 +01:00
Atgeirr Flø Rasmussen
378ab369ed Implemented initWells(). Added whitespace. 2011-01-05 09:48:06 +01:00
Atgeirr Flø Rasmussen
74f4f1d26a (Last commmit message was wrong.) Working on C++ interface for wells. 2011-01-03 15:04:27 +01:00
Atgeirr Flø Rasmussen
ab31293578 Modified to account for changing interface in opmpressure. 2011-01-03 14:45:36 +01:00
Bård Skaflestad
96bcb03b91 Correct blunders concerning presence of prescribed pressure values.
Specifically, split detection of prescribed reservoir pressure values
from prescribed well (i.e., BHP) pressure values.  Previously, we
would not even assemble any well contributions if there were any
prescribed reservoir pressure values.  Moreover, the return value from
assemble_cell_contrib() was exactly opposite of its intended value...
2010-12-08 14:50:19 +01:00
Atgeirr Flø Rasmussen
1f6f70c39d Larger number of samples, power-of-two intervals. 2010-12-08 11:15:11 +01:00
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