OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-18 21:43:27 -06:00
Code Issues Packages Projects Releases Wiki Activity
735 Commits 24 Branches 102 Tags 82 MiB
6fb1078cba
Commit Graph

735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
6fb1078cba Merge remote-tracking branch 'upstream/master' 2012-08-14 15:27:30 +02:00
Atgeirr Flø Rasmussen
ec13b11f9d Merge remote-tracking branch 'upstream/master' 2012-08-14 11:31:54 +02:00
Atgeirr Flø Rasmussen
f90f313af6 Gravity segregation column solver for compressible case implemented. 2012-08-14 11:25:59 +02:00
Bård Skaflestad
7cad95c6c7 Restore coding conventions. 
Inadvertently lost in commit 064184b.
 2012-08-14 11:05:09 +02:00
Halvor Møll Nilsen
1f7ec7fa39 Changed to extrapolation outside tables for pormult. Added facetags to the grid structure. Changed default fluid to Linear. 2012-08-14 09:36:19 +02:00
Atgeirr Flø Rasmussen
497c45b78b Constructors of *FromDeck classes now take an UnstructuredGrid. 
This is a change from taking a vector containing the mapping to
deck-consistent logical cartesian indices. The mapping is contained
in the UnstructuredGrid::global_cell member, and may be null. The
change therefore saves the overhead of constructing a vector as a
copy of the data in the grid or (if null) as an identity mapping.
 2012-08-10 10:12:45 +02:00
Atgeirr Flø Rasmussen
6ab7487218 Whitespace cleanup. 2012-07-19 15:34:42 +02:00
Atgeirr Flø Rasmussen
937b85e88f Bugfix in CompressibleTpfa for gravity case. 
Gravity acceleration should be a factor in the face gravity potential.
 2012-07-19 14:45:15 +02:00
Atgeirr Flø Rasmussen
eb7d46accf Transport solver partially complete (segregation solver remains). 2012-07-19 14:02:26 +02:00
Bård Skaflestad
52a5aabf57 Use have_boost_redef.hpp rather than direct override. 2012-07-12 14:36:36 +02:00
Bård Skaflestad
81f4ab5dd9 Add partial Doxygen markup to public interfaces. 
More work needed.
 2012-07-03 01:30:18 +02:00
Bård Skaflestad
527f2aef52 Initialise all members in default constructor. 2012-07-02 17:44:16 +02:00
Bård Skaflestad
0d3b2abc6a Anchor Doxygen comments to current line. 
Existing mark-up (/** ... */) would erroneously apply the documentation
of one field to the one below.  Using /**< ... */ avoids this problem.

Found by reading the Doxygen manual more carefully...
 2012-06-26 11:44:30 +02:00
Bård Skaflestad
e5e23de0c0 Document the obsolescent well representation. 
It is still in use by the hybridised pressure solvers.
 2012-06-25 00:55:50 +02:00
Bård Skaflestad
ffb538fce0 Add Doxygen-style documentation to all interfaces. 2012-06-24 03:59:18 +02:00
Bård Skaflestad
b9c9f9fbe8 Reference module headers from canonical location. 2012-06-22 19:39:52 +02:00
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