Commit Graph

493 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
4689dd2af7 Fix output from SimulatorReport. 2012-06-15 10:51:34 +02:00
Atgeirr Flø Rasmussen
f452c4c33c WellsManager now handles multiple WELSPECS, WCONINJE, WCONPROD-lines referring to the same well.
This is mostly relevant for schedule handling. The last occurence of a well
is the one used.
2012-06-15 10:12:36 +02:00
Atgeirr Flø Rasmussen
98de826397 Moved SimulatorReport class into its own file, for reusability. 2012-06-14 14:13:03 +02:00
Halvor M. Nilsen
5a055ee933 Fixed one use of wells, when wells=NULL 2012-06-14 09:06:58 +02:00
Atgeirr Flø Rasmussen
ba4ba17736 Merged. 2012-06-13 19:45:32 +02:00
Atgeirr Flø Rasmussen
29a400d622 Enable inheritance from IncompTpfa for limited purposes. 2012-06-13 19:45:23 +02:00
Bård Skaflestad
cc054d474d computeFractionalFlow(): Reuse the output array in all intermediate calculations.
This eliminates a number of free-store operations and data movements.
2012-06-13 17:07:56 +02:00
Atgeirr Flø Rasmussen
e041407c81 Bugfixes: correct sign for pressure increment, initialise rock_comp. 2012-06-13 10:34:15 +02:00
Atgeirr Flø Rasmussen
4e4e652279 Added constructor for incompressible cases.
Also added computeStaticData() helper called by both constructors.
It is still possible to use the other constructor for an incompressible case,
by passing a null pointer for the rock_comp argument.
2012-06-12 15:24:31 +02:00
Atgeirr Flø Rasmussen
c7a9e84be6 Reindent. 2012-06-12 15:22:23 +02:00
Atgeirr Flø Rasmussen
cc1038bcdc Merged. 2012-06-12 11:17:02 +02:00
Atgeirr Flø Rasmussen
88c7b84f4e Removed unused code. 2012-06-12 11:16:43 +02:00
Atgeirr Flø Rasmussen
14f560a295 Major simplification of IncompTpfa interface.
Most significant changes:
     - Single solve() call used for all cases (with or without gravity,
       with or without rock compressibility). This is intentionally
       similar to CompressibleTpfa::solve().
     - Constructor take a property object and computation of necessary total
       mobilities etc. moved inside class.
     - Optional constructor args for rock compressibility, gravity, wells,
       boundary conditions (null pointer accepted) and source terms (empty
       vector accepted).
     - Nonlinear iterations for the compressible rock case now handled inside
       IncompTpfa. This part intentionally made similar to CompressibleTpfa.
2012-06-12 10:27:48 +02:00
Atgeirr Flø Rasmussen
59db0f7ca9 Fix comment. 2012-06-12 10:14:26 +02:00
Bård Skaflestad
3864afe8e2 Constructor: Move common failure mode to end of if-else chain.
While here, add a failure mode pertaining to solvers that are
supported by the system but disabled at configure time.
2012-06-11 17:54:23 +02:00
Atgeirr Flø Rasmussen
024bbacce9 More minor code cleanup. 2012-06-11 14:52:18 +02:00
Kjetil Olsen Lye
c42b24612b Removed a debug print statement in the WellsGroup-code. 2012-06-11 13:16:39 +02:00
Atgeirr Flø Rasmussen
5ca2dc99e8 Whitespace (and other minor) cleanup. 2012-06-11 10:59:23 +02:00
Atgeirr Flø Rasmussen
cc7250628e Improved documentation. 2012-06-09 18:11:02 +02:00
Atgeirr Flø Rasmussen
61995b97be Changed interface of solve() and solveGravity() to accept full saturation (both phases) input. 2012-06-09 14:56:29 +02:00
Atgeirr Flø Rasmussen
e503fd054e Removed default null argument for wells in IncompTpfa constructor. 2012-06-07 13:34:05 +02:00
Bård Skaflestad
77d92e18be Don't mix declarations and definitions. 2012-06-07 10:28:02 +02:00
Xavier Raynaud
b2c5772728 set up correctly a flag in ifs_tpfa.c 2012-06-07 09:29:56 +02:00
Xavier Raynaud
2504399cb8 merge. 2012-06-06 15:19:02 +02:00
Xavier Raynaud
c81a840382 Added possibility to set tolerance for linear solvers. 2012-06-06 15:14:46 +02:00
Atgeirr Flø Rasmussen
63bc18a4cc Added some documentation. 2012-06-06 13:42:25 +02:00
Atgeirr Flø Rasmussen
611cd53380 Reorganized, added opm/core/wells/ and opm/core/simulator/. 2012-06-05 15:42:49 +02:00
Atgeirr Flø Rasmussen
bc3fb37837 Allow specifying well rates to be zero. 2012-06-05 13:02:47 +02:00
Atgeirr Flø Rasmussen
d1a4fa6dcd Made many methods private, and added some documentation. 2012-05-30 15:10:59 +02:00
Atgeirr Flø Rasmussen
30324f84e6 Made the virtual methods private. 2012-05-30 15:10:38 +02:00
Atgeirr Flø Rasmussen
c9c2794176 Add some missing docs for parameters. 2012-05-30 15:09:57 +02:00
Atgeirr Flø Rasmussen
299ea28afe Reordering 2p transport solver now takes full saturation (all phases) as input. 2012-05-30 14:39:09 +02:00
Atgeirr Flø Rasmussen
ad2dff642b Initial version of compressible transport. Work in progress. 2012-05-28 09:12:09 +02:00
Atgeirr Flø Rasmussen
379cebb550 Improve error message. 2012-05-25 10:13:08 +02:00
Bård Skaflestad
264d8dda0c solve(): Don't generate pointers into ::empty() vector<>s. 2012-05-24 16:08:21 +02:00
Bård Skaflestad
4b6b8c0def Realign function prototypes. No functional changes. 2012-05-24 14:36:53 +02:00
Bård Skaflestad
7970d426ef csc_deallocate(): Remove useless non-NULL checks. Free(NULL) is a no-op. 2012-05-24 13:23:38 +02:00
Atgeirr Flø Rasmussen
5c15895e74 Implemented more error policies for regula falsi solver. Use in reorder code.
We have switched to WarnAndContinueOnError instead of ThrowOnError,
to reduce the annoyance factor when suffering from a minor error in
a long simulation run.
2012-05-24 10:21:38 +02:00
Atgeirr Flø Rasmussen
733129a1a9 Policy-based design enables custom error handling in scalar regula falsi. 2012-05-24 10:02:14 +02:00
Bård Skaflestad
664e0eadef initBlackoilSurfvol(): Use loop order consistent with column-major ordering. 2012-05-21 21:03:43 +02:00
Bård Skaflestad
36d21ec747 Fix spelling: Furhtermore -> Furthermore. 2012-05-21 20:04:04 +02:00
Bård Skaflestad
e53ec76d78 Re-adjust comment white-space. 2012-05-21 20:01:55 +02:00
Bård Skaflestad
fa2d0904b5 Enforce singular agreement. 2012-05-21 20:00:08 +02:00
Bård Skaflestad
71a3ac9e17 Fix misprint concerning the valid components.
These are 0..*ncompoents-1, not 0..*ncomponents inclusive.
2012-05-21 19:58:02 +02:00
Bård Skaflestad
5b9ff02633 Mention that the flux parameter is assumed to include the boundary. 2012-05-21 19:56:46 +02:00
Bård Skaflestad
8b979e3c44 Merge from upstream. 2012-05-21 19:27:58 +02:00
Bård Skaflestad
c99a9a798a Add doxygen documentation of compute_sequence*(). 2012-05-21 19:20:32 +02:00
Bård Skaflestad
7c7c4f1b31 Assert that the number of strongly connected components is in [1 .. nc]. 2012-05-21 18:53:08 +02:00
Atgeirr Flø Rasmussen
c6c92c0466 Some initial testing of CompressibleTpfa done.
Fixed bug in pressure update from increments.
Change injection wellperf_phasemob_ to be same as cell mobilities.
Improve iteration reporting.
2012-05-21 16:42:03 +02:00
Atgeirr Flø Rasmussen
780a47f651 Initialize WellState::bhp() to cell pressures of first perforation. 2012-05-21 16:39:05 +02:00