OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
919 Commits 31 Branches 117 Tags
bfa52cc5f23c5c055b87af4594520adb91f35fc3
Commit Graph
919 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad dd67e0c717 Insert another <CODE></CODE> pair that was missing. 2012-06-22 15:44:39 +02:00
Bård Skaflestad 77cd800b0c Merge from upstream. 2012-06-22 15:41:37 +02:00
Bård Skaflestad 1256fb4389 Refine description of csrmatrix_new_elms_pushback() 
While here, tighten the distinction between <CODE> and non-<CODE>
mark-up.
 2012-06-22 15:37:50 +02:00
Bård Skaflestad ff96f386dc Use canonical include path to reference header. 2012-06-22 10:17:34 +02:00
Bård Skaflestad 469ddb0468 Re-wrap Doxygen comments introduced in cset 6d9f8b35dd4e. 2012-06-22 02:07:02 +02:00
Bård Skaflestad 3659ca2d68 Document sparse matrix interface. 2012-06-22 02:03:41 +02:00
Halvor M. Nilsen c7d252f94a Mearge from upstream 2012-06-20 13:11:46 +02:00
Halvor M. Nilsen ccbc1d83d5 Changed default for relperm to not set. 2012-06-20 13:11:13 +02:00
Bård Skaflestad c1c76a48b6 Restore a blank line that was lost in an earlier cset. 2012-06-20 00:38:47 +02:00
Bård Skaflestad ecda277cb0 Slight normalisation and clean-up of coding style. 
Notably:
  * Replace all remaining <tab>s with (8) spaces.
  * Use post-increment for all counters.
  * Insert a number of blank lines to highlight important groups.
 2012-06-19 18:37:26 +02:00
Halvor M. Nilsen ace7ebeed9 Merge from upstream 2012-06-19 13:38:51 +02:00
Halvor M. Nilsen d1f1af8854 Added inizialization of ok, which correct error for solves without wells. The only thing which is check is if the well object have incompressible form. 2012-06-19 13:37:22 +02:00
Bård Skaflestad fe9cc7f29a Prune an unused header. 2012-06-19 09:34:34 +02:00
Bård Skaflestad c4342bd16b *Control::mode(): Defer control-mode look-up to std::map. 2012-06-19 00:30:32 +02:00
Bård Skaflestad 7fc7972e93 Sort includes. 2012-06-19 00:01:30 +02:00
Bård Skaflestad 5ad262ec84 *Control::mode(): Defer keyword look-up to std::find() algorithm. 
This is simpler than implementing our own version of the same.
 2012-06-18 15:21:27 +02:00
Bård Skaflestad 1795e6b1a7 Document add_well()s "name" parameter. 
Forgotten in cset 728302a69229.
 2012-06-18 10:18:14 +02:00
Bård Skaflestad 6fbf50827f Add support for storing well names in "Wells" structure. 
The well name must be passed as a parameter to add_well(), so update
callers accordingly.
 2012-06-18 10:15:53 +02:00
Kjetil Olsen Lye dec0e60bd4 Removed errors on trying to open a shut well (or shut an open well). 2012-06-15 15:16:32 +02:00
Kjetil Olsen Lye 068cbf0605 Handle WellOpen has both open and shut. 2012-06-15 14:29:43 +02:00
Kjetil Olsen Lye 1a37c410fc Made the grouptree respect the new convention of tilde. 2012-06-15 14:08:28 +02:00
Kjetil Olsen Lye 6f22704406 Correct a const error. 2012-06-15 13:57:35 +02:00
Kjetil Olsen Lye c0717c0f7c Added welshut for production wells. Also added wellopen-handling. 2012-06-15 13:49:58 +02:00
Kjetil Olsen Lye 2a631282fc Added initial shutting of injection wells. 2012-06-15 13:38:07 +02:00
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