Commit Graph

116 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
82079418db Changed tot_porevol -> tot_porevol_init. Initialise rock_comp object. 2012-03-20 10:33:37 +01:00
Atgeirr Flø Rasmussen
a103933e2b Fixed bugs and changed interface for Gauss-Seidel segregation solver. 2012-03-16 13:41:10 +01:00
Atgeirr Flø Rasmussen
dd0cd85bf6 Added experimental Gauss-Seidel segregation solver. Not yet functioning. 2012-03-16 08:33:00 +01:00
Atgeirr Flø Rasmussen
fc3357e98a Production must be computed with the correct saturation.
The bug was the following: the reordering transport solvers accounts for
sources and sinks, and modifies saturation accordingly. This saturation is
the one we must use for computing sink outflow (= fracflow(s)*outflux).
If we wait until after segregation, saturation is changed, and we
compute fracflow(s')*outflux instead.
2012-03-15 14:15:57 +01:00
Atgeirr Flø Rasmussen
eccf52af0c Minor comment changed. 2012-03-14 12:51:51 +01:00
Atgeirr Flø Rasmussen
06d72587cc Moved Watercut class to miscUtilities.hpp. 2012-03-14 12:47:01 +01:00
Atgeirr Flø Rasmussen
86284d06c1 Reformatting only. 2012-03-14 11:16:48 +01:00
Atgeirr Flø Rasmussen
de1c0e8874 Untabify. 2012-03-14 10:40:41 +01:00
Atgeirr Flø Rasmussen
b56c397fa2 Use wellsToSrc() from utility, minor reordering of #includes. 2012-03-14 09:52:05 +01:00
Atgeirr Flø Rasmussen
df3592473a Minor additions to output, comments. 2012-03-14 09:38:43 +01:00
Bård Skaflestad
ba3cf61c2e Adjust white-space for previous commit.
No functional change.
2012-03-14 00:03:17 +01:00
Bård Skaflestad
1130baf6d7 Staticise several functions to suppress warnings about missing prior declarations. 2012-03-14 00:01:45 +01:00
Atgeirr Flø Rasmussen
f72bac2432 Printing volume balance report, although somewhat messy. Writing watercut curve to file. 2012-03-13 15:58:09 +01:00
Atgeirr Flø Rasmussen
c8f542fc3f Added water-oil contact init (scenario 4), controllable from param or deck. 2012-03-13 11:41:11 +01:00
Atgeirr Flø Rasmussen
bf142b7eda Added warning for segregation scenario. 2012-03-12 17:29:42 +01:00
Atgeirr Flø Rasmussen
e2f00b66a4 Now using SimulatorTimer class (therefore supporting TSTEP). 2012-03-12 16:20:13 +01:00
Atgeirr Flø Rasmussen
f5ad161409 Changed some function signatures to take const UnstructuredGrid& instead of ptr. 2012-03-12 13:44:05 +01:00
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
bac0b16c77 Initialising wells (unused for the moment). 2012-03-09 14:39:31 +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
f919da439b Improved saturation initialization, new parameter 'init_sat'. 2012-03-08 15:54:24 +01:00
Atgeirr Flø Rasmussen
be892f5059 Follow change to IncompTpfa (adding BCs). 2012-03-07 09:33:28 +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
Kjetil Olsen Lye
f6e26672fc Added 3rd scenario to spu_2p: Top heavy, bottom light 2012-03-06 16:37:49 +01:00
Atgeirr Flø Rasmussen
e5802e0532 Added optional column segregation solver (parameter "use_column_solver"). 2012-03-02 13:55:54 +01:00
Atgeirr Flø Rasmussen
c2a18bc7ca Added parameter "use_segregation_split", implemented using ImplicitTransport. 2012-03-01 10:32:58 +01:00
Bård Skaflestad
8a2aff536f Start solver messages on new line following "Scenario" output. 2012-02-28 09:42:21 +01:00
Bård Skaflestad
9c00ad8fe9 Support non-integral Cartesian cell sizes. 2012-02-27 23:43:58 +01:00
Bård Skaflestad
3ea1a823c8 Inspect global Cartesian cell when determining scenario 2 "left" reservoir half.
Assume that c_grid()->global_cell==0 signifies identity mapping (i.e.,
global_cell[cell]==cell).
2012-02-27 20:04:16 +01:00
Bård Skaflestad
84aad52d81 Fix logic error in defining "left" reservoir half in scenario 2.
Specifically, we must map into 0..cd[0]-1 and not some other
interval.  Moreover, as the "i" index cycles the most rapidly in
lexicographical ordering, a simple first dimension modulus operator is
sufficient.

On the other hand, this code does assume lexicographical ordering of
the cells which may or may not be guaranteed by the grid constructor.
The Cartesian constructors observe this behaviour, but other
constructors may not...
2012-02-27 19:59:01 +01:00
Bård Skaflestad
363c6564d9 Fully initialise the transport model gravity contributions when using gravity.
This initialisation used to be a part of the model construction, but
was refactored out in change-set 86c734a0ba48 and must thus be called
separately.
2012-02-27 17:34:57 +01:00
Atgeirr Flø Rasmussen
8a0d5728a8 Moved simulator utility functions to opm/core/utility/miscUtilities.hpp.
We want to avoid having hundreds of files with a single function, therefore
these functions have been lumped together. With time, a more sophisticated
organization of such free functions may be in order.
2012-02-26 21:05:19 +01:00
Atgeirr Flø Rasmussen
0e1107f195 Output estimated cell velocities. 2012-02-25 22:29:35 +01:00
Atgeirr Flø Rasmussen
65bd117d6b Bugfix, make vector of sufficient size to hold expected data. 2012-02-21 22:45:01 +01:00
Atgeirr Flø Rasmussen
1a62734e98 Added EXPERIMENT_ISTL-guarded code for testing Istl linear solver. 2012-02-21 22:14:01 +01:00
Atgeirr Flø Rasmussen
8d74253c64 IncompTpfa now takes a linear solver as a constructor argument. 2012-02-21 21:45:04 +01:00
Atgeirr Flø Rasmussen
a61bd0cf6d Added #if HAVE_CONFIG_H guards around #include "config.h". 2012-02-21 14:46:28 +01:00
Atgeirr Flø Rasmussen
03c995e4c0 Added parameters "dx", "dy", "dz" controlling cell size in the cartesian case. 2012-02-20 17:06:13 +01:00
Atgeirr Flø Rasmussen
452be898dc Made s_min() and s_max() behave properly, using underlying props' satRange(). 2012-02-20 13:50:45 +01:00
Atgeirr Flø Rasmussen
5633f9398b Using IncompTpfa instead of ad hoc class. 2012-02-20 13:42:42 +01:00
Atgeirr Flø Rasmussen
18d2b226de Using GridManager class instead of ad-hoc grid class. 2012-02-20 11:34:51 +01:00
Atgeirr Flø Rasmussen
d0d4ba7fce Now using writeVtkData() from the writeVtkData.hpp header. 2012-02-19 21:32:35 +01:00
Atgeirr Flø Rasmussen
b5270c2c5a Added "nl_tolerance" and "nl_maxiter" parameters. 2012-02-17 14:18:03 +01:00
Atgeirr Flø Rasmussen
f7b4762472 Added gravity (no segregation). Added "scenario" parameter. 2012-02-15 22:43:56 +01:00
Atgeirr Flø Rasmussen
a48b261a3c TransportModel* classes are now expected to have a custom solve() method. More:
- Using new solve() method in spu_2p.
 - solve() implemented in terms of protected superclass method reorderAndTransport().
 - Removed unused code being replaced by solve().
2012-02-10 10:48:18 +01:00
Atgeirr Flø Rasmussen
2061e7fcd8 Added timers. 2012-02-09 23:15:14 +01:00
Atgeirr Flø Rasmussen
660a45440d Using new reorderTransportTwophase() function. 2012-02-09 16:09:24 +01:00
Atgeirr Flø Rasmussen
bdd7bcb50f Fixed saturation initialization and updating of total mobilities. 2012-02-02 14:24:49 +01:00
Atgeirr Flø Rasmussen
a3eb09032b Catch up with unified grid construction/destruction, simplifying grid management. 2012-02-01 15:58:32 +01:00