Atgeirr Flø Rasmussen
36cf536d4d
Merge.
2012-03-06 22:55:59 +01:00
Atgeirr Flø Rasmussen
828b5232e5
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
Bård Skaflestad
d12d444411
Include <cmath> for std::pow().
2012-03-06 21:59:02 +01:00
Bård Skaflestad
5cf474cf25
Merge from upstream.
2012-03-06 21:41:33 +01:00
Bård Skaflestad
0a99364c27
Switch to a sparse/compressed boundary condition representation.
...
Specifically, replace the existing flowbc_t (that was densely
represented on each interface, including internal interface and
external no-flow interfaces) with a new structure given by
struct FlowBoundaryConditions
The semantics of this structure mirror those of "struct Wells" from
<opm/core/newwells.h>, but is currently mostly intended for simple,
incompressible flow purposes.
Update pressure solvers supporting boundary conditions to accommodate
the new boundary condition representation in the process.
2012-03-06 20:07:35 +01:00
Atgeirr Flø Rasmussen
ab324ed02e
Merged.
2012-03-06 16:09:27 +01:00
Atgeirr Flø Rasmussen
5b21e24e79
Make default initial saturation equal to connate water. Use new total mobilities.
2012-03-06 16:08:35 +01:00
Atgeirr Flø Rasmussen
f40aab431b
Added polymerUtilitites.hpp and .cpp, implementing polymer-dependent total mobilities etc.
2012-03-06 16:07:27 +01:00
Atgeirr Flø Rasmussen
1919284446
Added effectiveInvVisc() method.
2012-03-06 16:06:00 +01:00
Xavier Raynaud
22a34c70b4
Minor bug.
2012-03-06 15:58:30 +01:00
Xavier Raynaud
c3e89e6b5c
Added "not so successfull" case in Newton method.
2012-03-06 15:25:37 +01:00
Atgeirr Flø Rasmussen
939ddd8fe6
Fix minor typo.
2012-03-06 15:10:21 +01:00
Xavier Raynaud
196c29522d
Introduced ResidualEquation class to compute value of residual and derivatives.
2012-03-06 14:58:19 +01:00
Bård Skaflestad
0d5431aaba
Start encapsulating ifs_tpfa driving forces into a managing structure.
2012-03-06 14:00:34 +01:00
Atgeirr Flø Rasmussen
afe5c06ceb
Added WellsManager class (untested).
2012-03-06 13:59:51 +01:00
Xavier Raynaud
e11cea7432
Set tolerance Newton solver according to tolerance in TransportPolymer.
2012-03-06 09:31:11 +01:00
Xavier Raynaud
801f975b5b
Implemented case det(jacobian)=0 in Newton method.
2012-03-06 09:09:37 +01:00
Xavier Raynaud
02296478b1
Minor code optimization.
2012-03-06 09:00:05 +01:00
Xavier Raynaud
93503662ce
Fixed bug for Newton method. Added initial residual check for Bracketing method.
2012-03-05 15:32:22 +01:00
Xavier Raynaud
a91b2d991d
Use tolerance consistantly.
2012-03-05 12:58:09 +01:00
Xavier Raynaud
f783f9eebe
Removed unused code.
2012-03-05 12:50:13 +01:00
Xavier Raynaud
c3d6cc429a
Ensure min saturation is max(dead pore space, connate water saturation).
2012-03-05 12:44:31 +01:00
Xavier Raynaud
ceef4bbdcd
Parameter single_cell_method is now enum. Some optimization.
...
Redundant computation of fractional flow and mc removed.
2012-03-05 11:56:23 +01:00
Atgeirr Flø Rasmussen
214f6ff38a
Use IncompPropertiesFromDeck instead of AdHocProps when initializing from deck.
2012-03-02 15:32:28 +01:00
Atgeirr Flø Rasmussen
8877fa6ed0
Untabify.
2012-03-02 15:14:29 +01:00
Atgeirr Flø Rasmussen
ea1bd3ec2d
Cleaned up PolymerProperties class a little.
2012-03-02 15:14:14 +01:00
Xavier Raynaud
f78730cb94
Cleaned up code for Splitting method to find zero of s-c residuals.
2012-02-29 15:56:11 +01:00
Xavier Raynaud
a33e3d9db0
rock density is obtained from PLYROCK in PolymerProperties::getFromDeck.
2012-02-29 14:58:51 +01:00
Xavier Raynaud
125933468e
polymer_reorder reads polymer data from PolymerProperties.
2012-02-29 13:28:43 +01:00
Xavier Raynaud
07f136befb
Transport solver reads polymer data from PolymerProperties.
2012-02-29 13:27:20 +01:00
Xavier Raynaud
5ef45c59e3
Cleaned up PolymerProperties.
2012-02-29 13:25:51 +01:00
Xavier Raynaud
123762caa9
Added class PolymerProperties with a constructor which takes argument from an eclipse parser.
2012-02-29 11:27:59 +01:00
Xavier Raynaud
25308b750e
merge.
2012-02-28 17:37:23 +01:00
Xavier Raynaud
b0fdc4db7d
Added Newton step as first step in Splitting s-c residual solver.
2012-02-28 17:36:29 +01:00
Atgeirr Flø Rasmussen
18c9e681c2
Fix type of dx, dy, dz. Small refactoring in pressure solver init.
2012-02-28 09:47:02 +01:00
Kjetil Olsen Lye
d1e8525c4d
merge
2012-02-27 17:47:55 +01:00
Kjetil Olsen Lye
c06401ef5b
Fixed some warnings
2012-02-27 17:46:06 +01:00
Bård Skaflestad
a0598eae4a
Expose internal half-transmissibility through read-only reference.
...
Useful to initialise the Opm::ImplicitTransport<> solver with gravity
effects.
2012-02-27 17:29:09 +01:00
Xavier Raynaud
ee52e354b1
Bugfixed in computation of the gradient of the residual (from formulae).
2012-02-27 15:49:04 +01:00
Xavier Raynaud
6b267dd871
Bugfix in computation of the derivatives of the relative permeability.
2012-02-27 15:43:26 +01:00
Xavier Raynaud
c2128d6cff
Bugfix after removal of hello polymer program.
2012-02-27 12:20:55 +01:00
Xavier Raynaud
5c78dc8960
Cleaned up code for Splitting method for residual zero finding.
2012-02-27 10:39:21 +01:00
Xavier Raynaud
a26656c6e5
Cleaned up code for Splitting method in zero finding residual.
2012-02-27 10:10:32 +01:00
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