Commit Graph

1239 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
dd85dc522c Added computeTransportSource() function. Handling bdy fluxes in spu_2p. 2012-03-12 13:00:48 +01:00
Atgeirr Flø Rasmussen
9c226c1b24 Simple well handling done (only simple rates -> src terms). 2012-03-09 15:51:17 +01:00
Atgeirr Flø Rasmussen
30acd08b61 Fixed indexing bug in findSideFaces(). 2012-03-09 15:50:48 +01:00
Atgeirr Flø Rasmussen
bac0b16c77 Initialising wells (unused for the moment). 2012-03-09 14:39:31 +01:00
Atgeirr Flø Rasmussen
59998f8aef Added default constructor. 2012-03-09 14:25:52 +01:00
Atgeirr Flø Rasmussen
33fbc02490 Fixed s_min/s_max bug in ad hoc fluid, improved saturation init, print average sat. 2012-03-09 11:47:32 +01:00
Atgeirr Flø Rasmussen
ce03532c15 Implemented capillary pressure derivatives. 2012-03-09 11:45:18 +01:00
Atgeirr Flø Rasmussen
abc03de73c Added computeAverageSat() function. 2012-03-09 11:44:21 +01:00
Bård Skaflestad
d3955b0a34 Support variable number of physical grid dimensions (typically 2 or 3). 2012-03-09 08:56:28 +01:00
Bård Skaflestad
ab438b94af Use more traditional implementation of cartCoord(). 2012-03-09 00:50:44 +01:00
Bård Skaflestad
61c1e69c58 findSideFaces(): Support grids that don't define an explicit global_cell.
Assume that global_cell==0 denotes the identity mapping (typically a
Cartesian grid).
2012-03-08 20:53:32 +01:00
Bård Skaflestad
94317cc02f findSideFaces(): Generate initial 'ijk' that was (probably) intended.
The trick of eliding explicit initialisers can only be use to zero an
array (or structure), not to copy an arbitrary initialiser to all
elements of the array.
2012-03-08 20:51:17 +01:00
Bård Skaflestad
ac18454902 Merge from upstream. 2012-03-08 18:47:37 +01:00
Bård Skaflestad
47ae9a454d Add comments to summarise the two main blocks of fill_cell_topology(). 2012-03-08 18:18:28 +01:00
Atgeirr Flø Rasmussen
f919da439b Improved saturation initialization, new parameter 'init_sat'. 2012-03-08 15:54:24 +01:00
Atgeirr Flø Rasmussen
471d95c662 Max water sat set to always be 1.0. 2012-03-08 15:46:27 +01:00
Atgeirr Flø Rasmussen
0fe809c7e7 Issue warning instead of throwing if input requests compressible effects. 2012-03-08 15:25:36 +01:00
Atgeirr Flø Rasmussen
9ed8979ad8 Handle flow_conditions_construct(0) correctly. 2012-03-08 15:24:50 +01:00
Atgeirr Flø Rasmussen
ce1b6e9a77 Fixed GridManager bug: illegal array access if no ACTNUM. 2012-03-08 15:08:02 +01:00
Atgeirr Flø Rasmussen
2a9296bdc2 Merge. 2012-03-08 15:05:48 +01:00
Atgeirr Flø Rasmussen
00ed7b1650 Preprocessing accepts a null pointer for actnum. 2012-03-08 15:04:51 +01:00
Bård Skaflestad
262ae9146d Whitespace adjustment. No functional changes. 2012-03-08 14:14:20 +01:00
Bård Skaflestad
41f00e955c Remove obsolete comment. 2012-03-08 14:13:42 +01:00
Atgeirr Flø Rasmussen
bb9ffb8804 Added methods pressureSide() and fluxSide(). 2012-03-08 13:48:26 +01:00
Atgeirr Flø Rasmussen
4fb4580948 Changed forward declaration of 'class UnstructuredGrid' to 'struct UnstructuredGrid'. 2012-03-08 12:28:22 +01:00
Bård Skaflestad
cadb370011 Remove disabled code. 2012-03-07 19:42:41 +01:00
Bård Skaflestad
ea2bf25d8f Don't #include flow_bc.h twice. 2012-03-07 19:40:35 +01:00
Bård Skaflestad
6bff141c93 Merge from upstream. 2012-03-07 19:18:57 +01:00
Bård Skaflestad
64f1112997 Enable further compression of boundary conditions.
Specifically, refine the representation to allow a boundary condition
to apply to a set of interfaces rather than just a single face.  This
support is realised by the introduction of new interface
flow_conditions_append_multi().

Update all consumers of struct FlowBoundaryConditions to accommodate
the one-to-many boundary condition interface mapping in the process.
2012-03-07 19:08:14 +01:00
Bård Skaflestad
0d7b7f173f Ensure a valid face->boundary condition mapping before assembly. 2012-03-07 17:54:12 +01:00
Atgeirr Flø Rasmussen
be892f5059 Follow change to IncompTpfa (adding BCs). 2012-03-07 09:33:28 +01:00
Atgeirr Flø Rasmussen
3137a477e5 IncompTpfa::solve() now accepts boundary conditions. 2012-03-07 09:32:56 +01:00
Atgeirr Flø Rasmussen
d0afc1f8e4 Made bc argument const. 2012-03-07 09:32:02 +01:00
Atgeirr Flø Rasmussen
23a890d841 Added FlowBCManager class. 2012-03-07 09:18:44 +01:00
Atgeirr Flø Rasmussen
158f2c2513 Minor typo fix. 2012-03-07 09:15:34 +01:00
Atgeirr Flø Rasmussen
23decbddd0 Update for new treatment of driving forces in tpfa/ifs* functions. 2012-03-07 08:18:04 +01:00
Bård Skaflestad
3721e57ecb Merge from upstream. 2012-03-07 01:18:55 +01:00
Bård Skaflestad
4c27f8dcd7 Add tentative support for pressure boundary conditions in IncompTPFA.
Not enabled in C++ glue layer (presently assumes no boundary conditions).
2012-03-07 01:18:03 +01:00
Atgeirr Flø Rasmussen
046e9b1f2f Merge. 2012-03-06 22:55:59 +01:00
Atgeirr Flø Rasmussen
c9d3cb86ea Added (commented out) experimental code.
Experiment consists of trying to solve first in cells where all upstream
cells have been updated. Did not seem to change much.
2012-03-06 22:55:47 +01:00
Atgeirr Flø Rasmussen
e33c204832 Pass tol and maxit to column solver, clean up a scenario message and reindent. 2012-03-06 22:33:19 +01:00
Atgeirr Flø Rasmussen
763ba0d438 Bug fixed, column solver now seems to work. Made max # iters and tolerance user-controllable. 2012-03-06 22:31:56 +01:00
Bård Skaflestad
f54a6c0979 Merge from upstream. 2012-03-06 21:41:33 +01:00
Bård Skaflestad
7323243015 Catch up to recent changes in boundary condition representation.
Specifically, accommodate the sparse BC representation introduced in
change-set 30f12a392a03.
2012-03-06 21:40:16 +01:00
Bård Skaflestad
e669a162cd Catch up to recent changes in underlying C-implementation.
Specifically: Update boundary condition handling to incorporate the
sparse representation introduced in change-set 30f12a392a03.
Furthermore, catch up to ifs_tpfa_assemble() now accepting a general
"force" parameter (currently containing sources only) as introduced in
change-set 6c2b5de8faaa.
2012-03-06 21:30:02 +01:00
Bård Skaflestad
f52aad24e2 Adjust to new semantics of "struct FlowBoundaryCondtions".
We may now pass "NULL" if there are no active (flow) boundary conditions.
2012-03-06 20:08:34 +01:00
Bård Skaflestad
69bc8e16d6 Switch to a sparse/compressed boundary condition representation.
Specifically, replace the existing flowbc_t (that was densely
represented on each interface, including internal interface and
external no-flow interfaces) with a new structure given by

    struct FlowBoundaryConditions

The semantics of this structure mirror those of "struct Wells" from
<opm/core/newwells.h>, but is currently mostly intended for simple,
incompressible flow purposes.

Update pressure solvers supporting boundary conditions to accommodate
the new boundary condition representation in the process.
2012-03-06 20:07:35 +01:00
Kjetil Olsen Lye
f6e26672fc Added 3rd scenario to spu_2p: Top heavy, bottom light 2012-03-06 16:37:49 +01:00
Xavier Raynaud
ab93403b18 Minor bug. 2012-03-06 15:58:30 +01:00
Atgeirr Flø Rasmussen
941bd814f0 Fix minor typo. 2012-03-06 15:10:21 +01:00