Atgeirr Flø Rasmussen
b9afae7ef6
Bugfixes: correct sign for pressure increment, initialise rock_comp.
2012-06-13 10:34:15 +02:00
Atgeirr Flø Rasmussen
92f1ce9b83
Examples and tutorials follow change to IncompTpfa interface.
2012-06-12 15:28:53 +02:00
Atgeirr Flø Rasmussen
e1d5e55f1b
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
cc0f374137
Reindent.
2012-06-12 15:22:23 +02:00
Atgeirr Flø Rasmussen
57e2d62513
Merged.
2012-06-12 11:17:02 +02:00
Atgeirr Flø Rasmussen
6cbd78b4ba
Removed unused code.
2012-06-12 11:16:43 +02:00
Atgeirr Flø Rasmussen
d8580716de
Removed some unused variables.
2012-06-12 11:16:26 +02:00
Atgeirr Flø Rasmussen
a558878917
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
7a5a32819b
Fix comment.
2012-06-12 10:14:26 +02:00
Bård Skaflestad
54a993e99d
Refine description of allocate_grid() return value.
...
Specifically, the "global_cell" field remains unallocated (i.e.,
NULL) while other fields have undetermined contents.
2012-06-11 18:52:44 +02:00
Bård Skaflestad
bf0e469cf5
Split a few long lines in allocate_grid() documentation.
2012-06-11 17:54:56 +02:00
Bård Skaflestad
6f8dc0e0dc
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
9c78588b90
More minor code cleanup.
2012-06-11 14:52:18 +02:00
Kjetil Olsen Lye
ed87f6dde9
Merge
2012-06-11 13:19:51 +02:00
Kjetil Olsen Lye
4e78f96db1
Removed a debug print statement in the WellsGroup-code.
2012-06-11 13:16:39 +02:00
Kjetil Olsen Lye
f554d478c6
Updated tutorial4 to use the reorder solver.
2012-06-11 13:13:19 +02:00
Bård Skaflestad
239dffd5fb
Remove an instance of EOL whitespace introduced in cset 7e6d7352d8ea.
2012-06-11 12:55:33 +02:00
Bård Skaflestad
4d1a26ff30
Re-implement allocate_cart_grid() in term of allocate_grid().
2012-06-11 11:02:56 +02:00
Atgeirr Flø Rasmussen
4c05108383
Whitespace (and other minor) cleanup.
2012-06-11 10:59:23 +02:00
Halvor M. Nilsen
7e4350e7aa
Corrected include and errors in vag.hpp
2012-06-11 10:42:34 +02:00
Halvor M. Nilsen
7f1f2ad837
Mearge from upstream
2012-06-11 10:35:42 +02:00
Halvor M. Nilsen
6287f53b2f
Added then allocate_grid in grid and updated documentation in vag.hpp and grid.h
2012-06-11 10:34:40 +02:00
Kjetil Olsen Lye
52323fc96b
Added generation of tutorial4 pngs.
2012-06-11 10:10:53 +02:00
Atgeirr Flø Rasmussen
1c69716c12
Improved documentation.
2012-06-09 18:11:02 +02:00
Atgeirr Flø Rasmussen
8befffcbbb
Changed interface of solve() and solveGravity() to accept full saturation (both phases) input.
2012-06-09 14:56:29 +02:00
Atgeirr Flø Rasmussen
bebde670d6
Remove unused variable.
2012-06-08 23:01:22 +02:00
Halvor M. Nilsen
efc3cc3324
Added convert function from vag grid to opm::unstructed. In the process it was added a convenience function to allocate unstructured grid in grid.h. Compute geometry is used to calculate the new geometry.
2012-06-08 20:50:41 +02:00
Halvor M. Nilsen
839920fab2
Added copyright on newly added files
2012-06-08 15:47:18 +02:00
Halvor M. Nilsen
bde8b53a7d
Add support for reading vag/(unstructured format)
2012-06-08 15:34:00 +02:00
Atgeirr Flø Rasmussen
2683d2f331
First simulator handling schedules.
2012-06-07 15:09:35 +02:00
Atgeirr Flø Rasmussen
174ab7cd6e
Initial version of schedule handling more or less complete.
2012-06-07 15:09:13 +02:00
Atgeirr Flø Rasmussen
78e9a8f6fa
Added setCurrentStepNum() method.
2012-06-07 15:08:37 +02:00
Atgeirr Flø Rasmussen
7dadf8e5a2
Added Factory<...>::cloneObject().
2012-06-07 15:08:01 +02:00
Atgeirr Flø Rasmussen
fc7c9ea420
Undo an erroneous type change.
2012-06-07 14:17:26 +02:00
Atgeirr Flø Rasmussen
5bbf5bc832
For keywords classified as SpecialField, append data to existing objects, if any.
2012-06-07 14:05:32 +02:00
Atgeirr Flø Rasmussen
0551401bc6
Removed default null argument for wells in IncompTpfa constructor.
2012-06-07 13:34:05 +02:00
Atgeirr Flø Rasmussen
e798cc179e
Bugfix: forgotten Wells argument.
2012-06-07 13:32:04 +02:00
Bård Skaflestad
8edbd2c296
Restore additional link-time flags to restore build on Ubuntu 11.10.
...
This does probably paper over some underlying issue, but I don't have
the time right now to investigate the problem further.
2012-06-07 12:41:31 +02:00
Bård Skaflestad
024f95be5d
Don't mix declarations and definitions.
2012-06-07 10:28:02 +02:00
Xavier Raynaud
95f81401ab
set up correctly a flag in ifs_tpfa.c
2012-06-07 09:29:56 +02:00
Bård Skaflestad
899fd960be
Trim an unused header.
2012-06-06 20:08:03 +02:00
Bård Skaflestad
daf3fe2984
Apply splint to restore build.
...
Specifically: Change-set f08b1fb48d19 modified the IncompTpfa solver
to accept a linear-solver as "reference-to-non-const" in order to
facilitate changing its tolerance levels. Permeate that change back
through the SimulatorTwophase class.
There might be a better way of accomplishing the same task.
2012-06-06 16:49:58 +02:00
Bård Skaflestad
ac38491883
Implement *Tolerance() methods from LinearSolverInterface
...
See cset f08b1fb48d19 for additional details.
2012-06-06 16:35:36 +02:00
Xavier Raynaud
187957397c
merge.
2012-06-06 15:19:02 +02:00
Xavier Raynaud
eb3d9d6e63
Added renormalization of pressure in the incompressible case.
2012-06-06 15:18:40 +02:00
Xavier Raynaud
3881406d41
Corrected typo.
2012-06-06 15:16:07 +02:00
Xavier Raynaud
38562a5d7a
Added possibility to set tolerance for linear solvers.
2012-06-06 15:14:46 +02:00
Bård Skaflestad
15494cd88a
Remove extended "LDADD" variable. Links inferred from libopmcore.la .
2012-06-06 14:42:36 +02:00
Bård Skaflestad
a097fde7c5
Visually split description into sections. Add comments in the process.
...
No functional changes.
2012-06-06 14:20:12 +02:00
Bård Skaflestad
1817d55698
Sort list of examples and PSVs.
2012-06-06 14:08:44 +02:00