Bård Skaflestad
f4df7aa1bd
Don't assume that num_phases==2 when calculating total mobility.
2012-02-27 10:07:00 +01:00
Atgeirr Flø Rasmussen
e9b17dee02
Using miscUtilities.hpp from opm-core instead of keeping own versions.
2012-02-26 21:18:47 +01:00
Atgeirr Flø Rasmussen
b058678235
Moved simulator utility functions to opm/core/utility/miscUtilities.hpp.
...
We want to avoid having hundreds of files with a single function, therefore
these functions have been lumped together. With time, a more sophisticated
organization of such free functions may be in order.
2012-02-26 21:05:19 +01:00
Atgeirr Flø Rasmussen
753ebedc0d
Removed "hello polymer" test program.
2012-02-26 20:20:37 +01:00
Atgeirr Flø Rasmussen
40e2ccd1f0
Removed legacy reorder solver code.
2012-02-26 20:17:22 +01:00
Atgeirr Flø Rasmussen
85daef9b5b
Added experimental code guarded by EXPERIMENT_GAUSS_SEIDEL #define.
2012-02-26 00:30:36 +01:00
Atgeirr Flø Rasmussen
3312aad6f5
Adding data for experiments, left alone if unused.
2012-02-26 00:29:39 +01:00
Atgeirr Flø Rasmussen
9667d09fe0
Added more inactive experimental code.
2012-02-25 22:39:01 +01:00
Xavier Raynaud
c63d817332
Added varying bounded box for allowable values of c and c in the splitting residual solver.
2012-02-24 17:35:47 +01:00
Xavier Raynaud
f0fc7bf3c0
Merge.
2012-02-23 17:00:43 +01:00
Xavier Raynaud
266b451715
Fix splitting method residual solver. Add piecewise linear curve to handle the boundaries of the acceptable domain for s and c.
2012-02-23 16:59:17 +01:00
Atgeirr Flø Rasmussen
75ea10eea4
Added support for gravity in pressure solver.
2012-02-22 15:06:19 +01:00
Atgeirr Flø Rasmussen
95618aecac
Implemented solveMultiCell() by the nonlinear Gauss-Seidel method.
2012-02-22 14:55:34 +01:00
Atgeirr Flø Rasmussen
4e5215e1ab
Added compute_totmob_omega() function.
2012-02-22 14:54:15 +01:00
Atgeirr Flø Rasmussen
5b01436db9
Catch up to IncompTpfa needing a linear solver.
2012-02-22 09:28:57 +01:00
Atgeirr Flø Rasmussen
8c16722b84
Removed copied text accidentally left in.
2012-02-21 22:02:16 +01:00
Atgeirr Flø Rasmussen
9ed9f8b288
Fixed class comments, LinearSolverUmfpack::solve() properly returns a report.
2012-02-21 21:54:46 +01:00
Atgeirr Flø Rasmussen
87723a08a0
IncompTpfa now takes a linear solver as a constructor argument.
2012-02-21 21:45:04 +01:00
Atgeirr Flø Rasmussen
e52cae02ac
Made the solve() methods const.
2012-02-21 21:36:09 +01:00
Atgeirr Flø Rasmussen
8f8baa62c8
Using LinearSolverUmfpack for the linear solver.
2012-02-21 21:32:11 +01:00
Atgeirr Flø Rasmussen
3cb3d69d90
Added LinearSolverInterface and two subclasses, using Umfpack and Istl.
2012-02-21 21:27:15 +01:00
Atgeirr Flø Rasmussen
5516ee7e04
Multiple changes, including new parameters for polymer injection and solvers.
...
- "poly_start_days", "poly_end_days", "poly_amount" controls injection
time interval and concentration of injected polymer.
- Made a small class (PolymerInflow) for this control.
- Now warns if polymer injection rate changes during timestep.
- Parameters "nl_tolerance" and "nl_maxiter" control nonlinear scalar solvers.
- Catch up to change in TransportModelPolymer (constructor args).
2012-02-20 17:14:09 +01:00
Atgeirr Flø Rasmussen
21f7022afd
Tolerance and max iters are constructor arguments. Uses satRange() properly.
2012-02-20 17:07:42 +01:00
Atgeirr Flø Rasmussen
22bf83dda7
Bugfix: must always initialize gpress_omegaweighted_, even if no gravity.
2012-02-20 17:05:28 +01:00
Atgeirr Flø Rasmussen
5afc6bf0e8
Merged.
2012-02-20 13:59:56 +01:00
Atgeirr Flø Rasmussen
97134499c5
Using IncompTpfa.
2012-02-20 13:59:34 +01:00
Bård Skaflestad
aebf500789
Staticise polymerInflowAtTime() to avoid warning about missing declaration.
2012-02-20 13:58:56 +01:00
Atgeirr Flø Rasmussen
2aac2255b5
Ensuring gravity feature is used consistently.
2012-02-20 13:39:40 +01:00
Atgeirr Flø Rasmussen
e5a7157bc3
Added class IncompTpfa.
2012-02-20 13:23:01 +01:00
Atgeirr Flø Rasmussen
b84c957e2b
Using GridManager and writeVtkData() from opm-core.
2012-02-20 12:46:54 +01:00
Xavier Raynaud
1763e8afd7
Merged.
2012-02-20 09:37:54 +01:00
Xavier Raynaud
dd324478de
Added s-c splitting solver for single cell problem.
2012-02-20 09:27:22 +01:00
Atgeirr Flø Rasmussen
f9fd79dbcb
Moved writeVtkData() functions to utility/, added a test program.
2012-02-19 21:24:59 +01:00
Atgeirr Flø Rasmussen
16378af014
Added tol and maxit arguments. Using Incomp*::satRange() for initial s-bracket.
2012-02-17 14:17:16 +01:00
Atgeirr Flø Rasmussen
9901d20721
Added satRange() method to Incomp* classes and Saturation* classes.
...
So far not yet added to BlackoilPropertiesInterface.
2012-02-17 14:15:25 +01:00
Atgeirr Flø Rasmussen
75731efa9a
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
b5eb8543aa
Added compute_sequence_graph(), which also returns the upwind graph.
2012-02-17 09:29:56 +01:00
Atgeirr Flø Rasmussen
d041c98f21
Added solveMultiCell() method to match change in interface. Currently throwing.
2012-02-15 22:52:32 +01:00
Atgeirr Flø Rasmussen
42413c6a35
Merge.
2012-02-15 22:44:15 +01:00
Atgeirr Flø Rasmussen
5a2d26360b
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
5b9e67518d
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
232c84ff70
Reference per-cell fluid matrix when calculating phase densities.
...
This change repeats change-set f3bd5169811e of sibling class
BlackoilPropertiesBasic .
2012-02-15 15:37:02 +01:00
Bård Skaflestad
a8b7dc1fbb
Reference per-cell fluid matrix when calculating phase densities.
2012-02-14 20:23:13 +01:00
Atgeirr Flø Rasmussen
6b60550f6e
Add parameter "new_code" to switch between old and new structuring of transport solver.
2012-02-12 23:46:42 +01:00
Atgeirr Flø Rasmussen
a3dfdad3a6
Use PolymerData struct as moved to namespace Opm and defined in TransportModelPolymer.hpp.
2012-02-12 23:45:43 +01:00
Atgeirr Flø Rasmussen
8cb2af77e7
Added TransportModelPolymer class.
2012-02-12 23:30:57 +01:00
Atgeirr Flø Rasmussen
b30e64630f
Moved saturation copying out of transport time measurement.
2012-02-12 23:30:28 +01:00
Atgeirr Flø Rasmussen
ddc53646d5
Catch up to header file removal in opm-core.
2012-02-12 23:29:56 +01:00
Bård Skaflestad
095dedfe41
Refactor inflow tests and flux assignments.
2012-02-10 11:40:21 +01:00
Bård Skaflestad
670e95b147
Fix spelling (interiour -> interior).
2012-02-10 11:26:48 +01:00
