Atgeirr Flø Rasmussen
74c8cc68e8
Make column gravity Gauss-Seidel solver report average number of iterations.
2012-04-19 11:46:41 +02:00
Atgeirr Flø Rasmussen
89bf3c934b
Changed single-cell solver call.
...
- Using [0,1] interval instead of [smin, smax] interval to handle compressible case.
- Using new version of Regula Falsi function which exploits initial guess.
2012-04-02 13:24:57 +02:00
Atgeirr Flø Rasmussen
5e57cb6041
Minor modification of residual formula (equivalent to the old).
2012-03-30 16:11:07 +02:00
Bård Skaflestad
8fb200aeea
solveGravity(): Don't compare signed and unsigned expressions.
2012-03-27 11:19:13 +02:00
Kjetil Olsen Lye
bbfad835c9
merge
2012-03-27 09:23:32 +02:00
Atgeirr Flø Rasmussen
f406487f72
Bugfix in solveMultiCell().
2012-03-26 14:20:00 +02:00
Atgeirr Flø Rasmussen
97c3a9d9e3
Gravity column solver output: make it clear where the output comes from.
2012-03-26 14:19:30 +02:00
Kjetil Olsen Lye
dd2d474643
Added opm-parallelization to column solver for gravity. Did a (minor) interface change on extractColumn
2012-03-23 12:32:25 +01:00
Atgeirr Flø Rasmussen
1d63d6246a
Now running with rock compressibility (testing in progress). Multiple changes.
...
- TransportModelTwophase no longer takes pore volume in constructor, but in
the solve() and solveGravity() calls.
- Residual function uses compressibility term (not yet for gravity residual).
- spu_2p now takes a new parameter "init_p_bar", and ReservoirState class
accepts initial pressure as a constructor argument.
- Moved parts of initialization around, since pore volume now depends on
state (pressure).
2012-03-20 12:11:08 +01:00
Atgeirr Flø Rasmussen
a103933e2b
Fixed bugs and changed interface for Gauss-Seidel segregation solver.
2012-03-16 13:41:10 +01:00
Atgeirr Flø Rasmussen
dd0cd85bf6
Added experimental Gauss-Seidel segregation solver. Not yet functioning.
2012-03-16 08:33:00 +01:00
Atgeirr Flø Rasmussen
4fb4580948
Changed forward declaration of 'class UnstructuredGrid' to 'struct UnstructuredGrid'.
2012-03-08 12:28:22 +01:00
Atgeirr Flø Rasmussen
c9d3cb86ea
Added (commented out) experimental code.
...
Experiment consists of trying to solve first in cells where all upstream
cells have been updated. Did not seem to change much.
2012-03-06 22:55:47 +01:00
Atgeirr Flø Rasmussen
763ba0d438
Bug fixed, column solver now seems to work. Made max # iters and tolerance user-controllable.
2012-03-06 22:31:56 +01:00
Atgeirr Flø Rasmussen
dc80e2a38f
Added Newton iterations to column solver.
2012-03-02 13:45:33 +01:00
Atgeirr Flø Rasmussen
560cb08313
Added initial version of column-based gravity segregation solver.
2012-03-02 13:20:46 +01:00
Atgeirr Flø Rasmussen
14a8990d15
Added missing #include.
2012-03-01 21:24:09 +01:00
Kjetil Olsen Lye
90c5929d00
Removed to newly created, unused files
2012-03-01 16:21:58 +01:00
Kjetil Olsen Lye
e8543adddc
Added column extraction for a vertically aligned grid
2012-03-01 09:46:18 +01:00
Kjetil Olsen Lye
cea5324e4e
merge
2012-02-29 09:42:40 +01:00
Bård Skaflestad
b425045224
Remove unused parameter "grav" from computeStaticGravity().
...
Update callers accordingly, and remove a previously disabled call.
2012-02-28 11:08:57 +01:00
Bård Skaflestad
1e5569df7d
Use more traditional half-face loop to calculate transmissibilities.
2012-02-28 11:07:08 +01:00
Kjetil Olsen Lye
b002871fe1
Fixed some warnings
2012-02-27 17:46:06 +01:00
Atgeirr Flø Rasmussen
85f321fc44
Added experimental code guarded by EXPERIMENT_GAUSS_SEIDEL #define.
2012-02-26 00:30:36 +01:00
Atgeirr Flø Rasmussen
0abaa508aa
Adding data for experiments, left alone if unused.
2012-02-26 00:29:39 +01:00
Atgeirr Flø Rasmussen
e939202760
Added more inactive experimental code.
2012-02-25 22:39:01 +01:00
Atgeirr Flø Rasmussen
93d4bd80f7
Added tol and maxit arguments. Using Incomp*::satRange() for initial s-bracket.
2012-02-17 14:17:16 +01:00
Atgeirr Flø Rasmussen
ccdacb791c
Added lots of (inactive) experimental code.
...
The code attempts to improve #iterations in the Gauss-Seidel-like
multicell solver by improving ordering. In general, experiment failed
to improve #iterations, except for one: totally random order was the
best (for the 100x100 case tried)!
2012-02-17 09:39:45 +01:00
Atgeirr Flø Rasmussen
8a2a3c3ff8
Added compute_sequence_graph(), which also returns the upwind graph.
2012-02-17 09:29:56 +01:00
Atgeirr Flø Rasmussen
541813ace5
Made reordersequence a C++ source file, in order to use std::sort().
...
This is for the experimental change of the graph topology, putting the
connections in the graph sorted by flux magnitude. Currently the
changes are in the file, but commented out until further experiments
have been done.
2012-02-15 22:42:07 +01:00
Atgeirr Flø Rasmussen
c8e0d59611
Added solveMultiCell() interface and implementation.
...
- Added solveMultiCell() virtual method.
- TransportModelInterface::reorderAndTransport() now calls solveMultiCell()
instead of aborting if encountering multi-cell components.
- Implemented solveMultiCell() in TransportModelTwophase by solving
each cell individually with solveSingleCell() and repeating until
saturation change is small (hardcoded 1e-9 for now).
2012-02-15 22:38:45 +01:00
Bård Skaflestad
8a2d216a83
Refactor inflow tests and flux assignments.
2012-02-10 11:40:21 +01:00
Bård Skaflestad
deb868c233
Fix spelling (interiour -> interior).
2012-02-10 11:26:48 +01:00
Bård Skaflestad
24ceea4ad0
Remove #include<> statement that refers to file removed in cset b4feb4a932de.
2012-02-10 11:14:35 +01:00
Atgeirr Flø Rasmussen
a48b261a3c
TransportModel* classes are now expected to have a custom solve() method. More:
...
- Using new solve() method in spu_2p.
- solve() implemented in terms of protected superclass method reorderAndTransport().
- Removed unused code being replaced by solve().
2012-02-10 10:48:18 +01:00
Atgeirr Flø Rasmussen
da1159061a
Removed unused files.
2012-02-09 23:39:18 +01:00
Atgeirr Flø Rasmussen
05ac35ed14
Cleaned up and removed unused code.
2012-02-09 23:35:43 +01:00
Atgeirr Flø Rasmussen
c076a8a6b9
Made grid argument of compute_sequence() const.
2012-02-09 23:28:47 +01:00
Atgeirr Flø Rasmussen
7767e1cc81
Refactored internals, now using modifiedRegulaFalsi() template for performance.
2012-02-09 23:17:08 +01:00
Atgeirr Flø Rasmussen
c51d9f1a6c
Added new top-level reorder free function, reorderTransportTwoPhase().
2012-02-09 16:08:53 +01:00
Atgeirr Flø Rasmussen
54c89db47b
Added classes TransportModelInterface and TransportModelTwophase.
2012-02-09 16:07:53 +01:00
Atgeirr Flø Rasmussen
30ec82a02c
Fix order of arguments for error messages.
2012-02-08 13:52:19 +01:00
Atgeirr Flø Rasmussen
be308f8bd5
Improved bracketing error message from nonlinear solvers.
2012-02-08 13:50:08 +01:00
Atgeirr Flø Rasmussen
c0ded27f8d
Put brackets for nonlinear solvers into NonlinearSolverCtrl struct.
2012-02-08 13:37:52 +01:00
Atgeirr Flø Rasmussen
da16edf8bc
Removed unnecessary (potentially misleading) assignment.
2012-02-06 10:45:21 +01:00
Jostein R. Natvig
fb99d7bdaf
1) Move extra fields found in struct CornerpointGrid into struct UnstructuredGrid.
...
2) Remove typedef grid_t
3) Remove struct CornerpointGrid.
4) handle fallout.
2012-02-01 14:56:38 +01:00
Bård Skaflestad
4ab4dc7543
Convert Tabs to spaces where appropriate.
2012-01-26 10:41:58 +01:00
Jostein R. Natvig
a92b7a1b0c
Copy modifications to reorder-related codes from MRST repository
...
branches/mrst-reorg/mex/reorder-C, revision 8955.
The changes are: (1) addition of documentation of input arguments in
tarjan.c and (2) an MIT licence header (codes originated in a PhD
project).
2012-01-25 10:49:49 +01:00
Atgeirr Flø Rasmussen
12f8b6b4a1
Reorder solver now uses new fluid props.
2012-01-24 21:51:24 +01:00
Atgeirr Flø Rasmussen
63942cbd1d
Now reorder code requires new property object, not using it yet (work in progress).
2012-01-24 16:17:05 +01:00