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
Atgeirr Flø Rasmussen
9c78588b90
More minor code cleanup.
2012-06-11 14:52:18 +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
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
Bård Skaflestad
49641f935d
Refactor full "LDADD" statement out to single make variable.
...
Use where appropriate.
2012-06-06 14:07:03 +02:00
Atgeirr Flø Rasmussen
7207ea27c9
Merged.
2012-06-06 13:55:10 +02:00
Atgeirr Flø Rasmussen
3d05430627
First version of SimulatorTwophase class done. Added test sim using it.
2012-06-06 13:54:53 +02:00
Atgeirr Flø Rasmussen
5702695879
Added some documentation.
2012-06-06 13:42:25 +02:00
Bård Skaflestad
47897c644c
Assert copyright.
2012-06-06 12:39:29 +02:00
Bård Skaflestad
a6ce019736
Support matrices of two or more rows.
2012-06-06 12:38:27 +02:00
Bård Skaflestad
17ebf48f34
Add simple demonstration/regression test of AGMG solver.
2012-06-06 11:49:07 +02:00
Bård Skaflestad
5588d1e3e9
Merge from upstream.
2012-06-06 09:46:47 +02:00
Bård Skaflestad
0a8eafc307
Implement dtor to avoid linker errors.
2012-06-06 09:46:17 +02:00
Atgeirr Flø Rasmussen
13387fe825
Merged.
2012-06-06 09:25:14 +02:00
Atgeirr Flø Rasmussen
66cbaf01b3
Work in progress on simulator class for two-phase simulation.
2012-06-06 09:12:15 +02:00
Bård Skaflestad
79c437ab40
Fix another misprint from early implementation.
2012-06-06 00:30:12 +02:00
Bård Skaflestad
61a5f3d1e5
Fix misprint left over from early development.
2012-06-06 00:27:10 +02:00
Bård Skaflestad
ca7b4a5da3
Add simple gateway to Notay's AGMG solver package.
...
Hook up to build, but don't expose through the LinearSolverFactory.
Only build tested.
Won't be built unless the user explicitly enables AGMG support.
2012-06-06 00:26:10 +02:00
Bård Skaflestad
496be60220
Don't use AC_REQUIRE within a conditional.
...
Older versions of Autoconf are not able to place the tests at appropriate
locations.
2012-06-05 19:56:17 +02:00