Commit Graph

766 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
7a79bd1872 Enable choice of spline-smoothed saturation props (or not). 2012-08-27 17:56:01 +02:00
Atgeirr Flø Rasmussen
d9cff689b4 Added class SinglePvtDead, add parameter 'props_use_spline' to simulators.
Recall that the class that used to be called SinglePvtDead has
been renamed to SinglePvtDeadSpline. If 'props_use_spline' is true,
that class is used (this is the default), which makes a monotone
spline that is uniformly, densely sampled. The new class simply
uses linear interpolation in the input tables.
2012-08-27 16:48:21 +02:00
Atgeirr Flø Rasmussen
5182fef48d Switch loop ordering for better cache performance. 2012-08-27 13:17:27 +02:00
Atgeirr Flø Rasmussen
9bb76d74cc Fixed bug in matrix multiplication (matrix has Fortran element order). 2012-08-27 11:19:22 +02:00
Atgeirr Flø Rasmussen
0a8ac1ddb5 Minor revision, mostly whitespace cleanup and comments. 2012-08-27 09:48:06 +02:00
Atgeirr Flø Rasmussen
dd83eaedc8 Merge remote-tracking branch 'hnil/master'
Conflicts:
	opm/core/transport/reorder/TransportModelTwophase.cpp
	opm/core/transport/reorder/TransportModelTwophase.hpp
2012-08-24 15:28:06 +02:00
Halvor Møll Nilsen
0da049f4c8 Corrected mistake from moving function calls. 2012-08-24 13:39:42 +02:00
Atgeirr Flø Rasmussen
46fb488410 Minor code cleanup in TransportModelTwophase. 2012-08-24 13:31:23 +02:00
Atgeirr Flø Rasmussen
3dfb2eb29b Merge remote-tracking branch 'upstream/master'
Conflicts:
	opm/core/simulator/SimulatorIncompTwophase.cpp
2012-08-24 13:31:05 +02:00
Halvor Møll Nilsen
a26c6779c6 Corrected typing pointed out by atgeirr in respose to pullrequest 2012-08-24 12:52:41 +02:00
Atgeirr Flø Rasmussen
c7bbf1146c Removed unneeded function numGlobalCells(). 2012-08-24 08:18:59 +02:00
Atgeirr Flø Rasmussen
caff665c10 Fixed solveGravity(): now properly modifies surfacevolume.
Also:
  - solveGravity() interface changed to take surface volume as a parameter,
  - gravity vector is now given in initGravity() instead of
    solveGravity(), for consistency with the incompressible solver.
2012-08-23 14:45:23 +02:00
Atgeirr Flø Rasmussen
73949f892e New singularPressure() method propagates singularity information. 2012-08-23 14:03:20 +02:00
Atgeirr Flø Rasmussen
983a29691c Function cfs_tpfa_residual_assemble() and friends now return singularity flag.
The singularity flag is true if there are no pressure conditions and no
compressibility (so the absolute values of the pressure solution will be
arbitrary).
2012-08-23 14:00:04 +02:00
Atgeirr Flø Rasmussen
e96421dbd7 Whitespace cleanup. 2012-08-23 08:59:09 +02:00
Atgeirr Flø Rasmussen
96327164cc Added computeSurfacevol() method.
The method is called by the reordering transport solver after computing
new saturations in order to update the surface volumes.
2012-08-23 08:57:48 +02:00
Atgeirr Flø Rasmussen
010715ad03 Document and check (primitive) for non-miscibility requirement. 2012-08-22 12:31:59 +02:00
Atgeirr Flø Rasmussen
2f03664408 Merge branch 'rock_comp_tpfa' 2012-08-22 11:13:16 +02:00
Xavier Raynaud
9ed0923279 Update surface volume in transport solver. 2012-08-22 10:11:32 +02:00
Xavier Raynaud
660f14df3b Corrected bug (residual should not be divided by dt). 2012-08-21 17:12:07 +02:00
Xavier Raynaud
52ab67201d Changed way to get total number of cells. 2012-08-21 17:10:49 +02:00
Xavier Raynaud
712ccb0309 Corrected typo in comment. 2012-08-21 17:09:19 +02:00
Halvor Møll Nilsen
5743225be2 added writing of reorder iterations for each cell 2012-08-21 15:23:46 +02:00
Xavier Raynaud
7e1e1e7951 Fixed sign error and replaced porevol->porevol0. 2012-08-21 10:20:59 +02:00
Halvor Møll Nilsen
50ff22141d Added writing of timings in param format 2012-08-21 09:57:36 +02:00
Xavier Raynaud
b470ab8d50 Fix initialization bug. 2012-08-20 15:18:24 +02:00
Atgeirr Flø Rasmussen
aa47b1511c Merge branch 'master' into rock_comp_tpfa 2012-08-17 12:55:41 +02:00
Atgeirr Flø Rasmussen
ded1424cc9 Whitespace cleanup. 2012-08-17 12:40:15 +02:00
Atgeirr Flø Rasmussen
61fdf4a8b6 Bugfix: call *comprock* method only if active rock compressibility. 2012-08-17 10:56:27 +02:00
Atgeirr Flø Rasmussen
d67f49bac8 Class CompressibleTpfa now handles rock compressibility. 2012-08-17 10:38:41 +02:00
Atgeirr Flø Rasmussen
547efbe7d1 Added function cfs_tpfa_res_comprock_assemble().
This is intended to handle cases with both fluid and rock compressibility.
2012-08-17 10:36:57 +02:00
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