Commit Graph

152 Commits

Author SHA1 Message Date
Xavier Raynaud
22372710b8 Merge remote-tracking branch 'atgeirr/master' 2012-08-27 13:32:55 +02:00
Xavier Raynaud
af8a6fa7da Changed private->protected and added virtual to make class derivation. 2012-08-27 13:19:04 +02:00
Atgeirr Flø Rasmussen
0a8ac1ddb5 Minor revision, mostly whitespace cleanup and comments. 2012-08-27 09:48:06 +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
Xavier Raynaud
660f14df3b Corrected bug (residual should not be divided by dt). 2012-08-21 17:12:07 +02:00
Xavier Raynaud
712ccb0309 Corrected typo in comment. 2012-08-21 17:09:19 +02:00
Xavier Raynaud
7e1e1e7951 Fixed sign error and replaced porevol->porevol0. 2012-08-21 10:20:59 +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
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
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
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
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
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
Halvor M. Nilsen
5a055ee933 Fixed one use of wells, when wells=NULL 2012-06-14 09:06:58 +02:00
Atgeirr Flø Rasmussen
29a400d622 Enable inheritance from IncompTpfa for limited purposes. 2012-06-13 19:45:23 +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
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
Atgeirr Flø Rasmussen
024bbacce9 More minor code cleanup. 2012-06-11 14:52:18 +02:00
Atgeirr Flø Rasmussen
5ca2dc99e8 Whitespace (and other minor) cleanup. 2012-06-11 10:59:23 +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
611cd53380 Reorganized, added opm/core/wells/ and opm/core/simulator/. 2012-06-05 15:42:49 +02:00
Atgeirr Flø Rasmussen
c9c2794176 Add some missing docs for parameters. 2012-05-30 15:09:57 +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
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
bc8d3160d0 Update comments in implementation file. 2012-05-21 14:48:09 +02:00
Atgeirr Flø Rasmussen
182c4718b0 Improve solver output in Newton iterations. 2012-05-21 14:08:38 +02:00
Atgeirr Flø Rasmussen
7e9690ece3 Bugfix: set nphases properly. 2012-05-21 14:03:33 +02:00
Atgeirr Flø Rasmussen
f9436a1bef Initialize size of wellperf_gpot_ properly. 2012-05-21 13:13:13 +02:00
Atgeirr Flø Rasmussen
857d6b774d Finished untested version of CompressibleTpfa. 2012-05-21 12:58:42 +02:00
Atgeirr Flø Rasmussen
39eab74dc8 Added loop control and reporting to CompressibleTpfa. 2012-05-21 12:48:54 +02:00
Atgeirr Flø Rasmussen
5ed467f441 Added tolerance and maxiter arguments to CompressibleTpfa. 2012-05-21 11:24:12 +02:00
Atgeirr Flø Rasmussen
5abf755e2d Sending *dynamic* pressures to assembly function... 2012-05-21 10:47:21 +02:00
Atgeirr Flø Rasmussen
9aa0c89603 Sending initial pressures to assembly function. 2012-05-21 10:36:10 +02:00
Atgeirr Flø Rasmussen
2ad94fc573 Evaluation of dynamic properties for CompressibleTpfa. 2012-05-21 10:10:35 +02:00
Atgeirr Flø Rasmussen
fa0d166f14 Work in progress on CompressibleTpfa.
- Changed contstruction, now takes property object.
 - Well potentials done.
2012-05-18 11:10:31 +02:00
Atgeirr Flø Rasmussen
1d1755bafe Work in progress on compressible pressure solver. 2012-05-16 15:49:02 +02:00
Atgeirr Flø Rasmussen
fd25a20b9d Started adding necessary parameters to pressure solver. Work in progress. 2012-05-16 14:38:55 +02:00