Commit Graph

167 Commits

Author SHA1 Message Date
Xavier Raynaud
01aab0270b Fixed bug in lapack call for band matrices. 2012-03-26 11:29:19 +02:00
Xavier Raynaud
1836247dab Added actual resistance factor. Not tested. 2012-03-23 17:40:03 +01:00
Xavier Raynaud
4c77354d56 Changed the definition of dead pore space. 2012-03-23 16:08:41 +01:00
Xavier Raynaud
62a1c1ad98 Corrected various bugs in gravitation solver. 2012-03-20 17:43:25 +01:00
Xavier Raynaud
49b9f340ac Added functions to compute mobilities and coefficient mc (with derivatives). 2012-03-20 11:58:09 +01:00
Xavier Raynaud
542ed94b84 removed bugs. can compile. Not tested. 2012-03-19 16:33:32 +01:00
Xavier Raynaud
b6b720f338 Removed useless comment. 2012-03-19 11:30:00 +01:00
Xavier Raynaud
2daf397268 removed dmcds because the coefficient mc does not depend on s. 2012-03-19 11:28:55 +01:00
Xavier Raynaud
b513b129ce changed syntax for BandMatrixCoef. 2012-03-19 09:56:20 +01:00
Xavier Raynaud
dc0771ee3e merge 2012-03-15 18:10:10 +01:00
Xavier Raynaud
efe0408b71 Gravity column solver with polymer. 2012-03-15 18:09:29 +01:00
Xavier Raynaud
54844f60c1 Computes s and c-residual and its Jacobian at a cell interface. 2012-03-15 18:08:30 +01:00
Atgeirr Flø Rasmussen
b120aa6c90 Bugfix: corrected computation of polymer contained in reservoir. 2012-03-14 21:12:54 +01:00
Atgeirr Flø Rasmussen
1554bfff11 Still working on adsorption computations. 2012-03-14 16:13:59 +01:00
Atgeirr Flø Rasmussen
efc03f1596 Remove unneeded dps argument from computePolymerAdsorbed(). 2012-03-14 15:59:56 +01:00
Atgeirr Flø Rasmussen
2f06b301bf Change function name to computePolymerAdsorbed() [with a d, not b]. 2012-03-14 15:57:28 +01:00
Atgeirr Flø Rasmussen
ad470a7796 Bugfix: dead pore space in polymer mass calc. Added computePolymerAbsorbed(). 2012-03-14 15:54:36 +01:00
Atgeirr Flø Rasmussen
bf44f9f72e Added computePolymerMass() and polymer-aware overload of computeInjectedProduced(). 2012-03-14 14:03:07 +01:00
Xavier Raynaud
039c05d9f5 Added comments. 2012-03-07 09:59:04 +01:00
Bård Skaflestad
d12d444411 Include <cmath> for std::pow(). 2012-03-06 21:59:02 +01:00
Atgeirr Flø Rasmussen
ab324ed02e Merged. 2012-03-06 16:09:27 +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
c3e89e6b5c Added "not so successfull" case in Newton method. 2012-03-06 15:25:37 +01:00
Xavier Raynaud
196c29522d Introduced ResidualEquation class to compute value of residual and derivatives. 2012-03-06 14:58:19 +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
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
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
b0fdc4db7d Added Newton step as first step in Splitting s-c residual solver. 2012-02-28 17:36:29 +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
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
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
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
95618aecac Implemented solveMultiCell() by the nonlinear Gauss-Seidel method. 2012-02-22 14:55:34 +01:00
Atgeirr Flø Rasmussen
21f7022afd Tolerance and max iters are constructor arguments. Uses satRange() properly. 2012-02-20 17:07:42 +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
d041c98f21 Added solveMultiCell() method to match change in interface. Currently throwing. 2012-02-15 22:52:32 +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
094ede0855 Set minimum s to 0.2 for s-iterations (temporary measure). 2012-02-09 09:05:49 +01:00
Atgeirr Flø Rasmussen
240d69da57 Separated nonlinear controls for c and s residuals, set bracket fields. 2012-02-08 14:02:46 +01:00
Atgeirr Flø Rasmussen
46f29380b3 Added more (inactive) debug output. 2012-02-08 13:43:22 +01:00
Atgeirr Flø Rasmussen
37ce9d0db3 Improved treatment of inflow (source) polymer concentration:
- solver now takes parameter for inflow_c
 - simulator calls polymerInflowAtTime(double time) for its value
 - currently starts polymer injection after 4 days (0.4 pv)
Also added some (inactive) debug printouts.
Still not working when injecting polymer.
2012-02-07 09:09:34 +01:00
Atgeirr Flø Rasmussen
d17cfd1372 First compiling version of full polymer residual. Not yet working. 2012-02-06 14:01:56 +01:00
Atgeirr Flø Rasmussen
0ad4fab860 Minor bugfix, now reproducing non-polymer results. 2012-02-06 10:45:54 +01:00
Atgeirr Flø Rasmussen
f46587bf3c Structure for c-solve in place, still not implemented residual_c(). 2012-02-06 08:54:38 +01:00
Atgeirr Flø Rasmussen
143861745a Initial work on supporting polymer transport. Work in progress. 2012-02-03 16:39:55 +01:00
Atgeirr Flø Rasmussen
e1df60c04d Copied and renamed files and functions from opm-core as base for polymer reorder solver. 2012-02-02 16:35:55 +01:00
Bård Skaflestad
08671a1d6d Coalesce constructors using a default value. 2012-02-01 16:40:15 +01:00
Bård Skaflestad
a785d9488e Create minimum buildable Polymer module for OPM. 2012-02-01 16:16:30 +01:00