Atgeirr Flø Rasmussen
|
3660ec8e8c
|
Follow headers that were moved in opm-core.
|
2012-06-05 15:45:41 +02:00 |
|
Atgeirr Flø Rasmussen
|
c3dac20d65
|
Use new interface for regula falsi, switch to non-throwing error policy.
|
2012-05-24 10:27:27 +02:00 |
|
Xavier Raynaud
|
91fe1c5d63
|
Removed useless commented regions.
|
2012-05-23 16:24:08 +02:00 |
|
Xavier Raynaud
|
4b805c191e
|
Added bound checks to Newton column solver.
|
2012-05-23 16:22:48 +02:00 |
|
Xavier Raynaud
|
263a41b84b
|
treat case when searching direction is small in Newton reorder solver.
|
2012-05-22 17:43:18 +02:00 |
|
Xavier Raynaud
|
afca287757
|
In Newton reordering solver, set smin to zero.
|
2012-05-22 17:22:31 +02:00 |
|
Xavier Raynaud
|
6a12fe0208
|
Added default concentration if guess_old_solution is false.
|
2012-05-22 17:21:12 +02:00 |
|
Xavier Raynaud
|
a9a93d795e
|
Include concentration in error estimation for gauss seidel.
|
2012-05-22 10:45:43 +02:00 |
|
Xavier Raynaud
|
8e0936fadd
|
Fixed bug in gauss seidel gravity solver.
|
2012-05-22 09:51:32 +02:00 |
|
Xavier Raynaud
|
48adf98b5a
|
Corrected some mistakes in Gauss Seidel gravitation transport solver.
|
2012-05-21 16:41:29 +02:00 |
|
Xavier Raynaud
|
12bb246c06
|
corrected bug in SinglePointUpwindTwoPhasePolymer.
|
2012-05-21 16:35:39 +02:00 |
|
Atgeirr Flø Rasmussen
|
c115ba2c28
|
Adapt to renaming and other small modifications of state and initialization.
|
2012-05-16 15:59:37 +02:00 |
|
Xavier Raynaud
|
360ec5f86d
|
merge.
|
2012-05-16 15:09:36 +02:00 |
|
Xavier Raynaud
|
76e82a718e
|
fixed mistake in computation of one of the residuals.
|
2012-05-16 15:09:07 +02:00 |
|
Xavier Raynaud
|
60599b9dbf
|
Implemented Gauss-Seidel solver for polymer. Not tested!
|
2012-05-16 15:06:14 +02:00 |
|
Xavier Raynaud
|
c0368fa61d
|
Fixed problem induced by s=0 in gravitation transport solver.
|
2012-05-15 16:09:07 +02:00 |
|
Atgeirr Flø Rasmussen
|
088c61ce00
|
Added check for single-cell columns.
|
2012-05-14 11:04:00 +02:00 |
|
Atgeirr Flø Rasmussen
|
67a6674495
|
Update for simplified column data structure.
|
2012-05-11 09:41:01 +02:00 |
|
Xavier Raynaud
|
1eb75314e6
|
Make polymer_reorder.cpp compliant with well management. Not tested!
|
2012-05-10 14:42:08 +02:00 |
|
Xavier Raynaud
|
0a0ca3bbd3
|
Added compressibility to polymer reorder transport solver.
|
2012-05-10 09:42:35 +02:00 |
|
Xavier Raynaud
|
9010f2da42
|
Fixed bug in Newton solver for polymer.
|
2012-04-26 14:16:40 +02:00 |
|
Xavier Raynaud
|
6748a6e5e9
|
some code optimization (instead of mu_w_eff, use its inverse).
|
2012-04-26 09:25:46 +02:00 |
|
Xavier Raynaud
|
af79b9555c
|
Fixed bug in computation of effectiveTotalMobility.
|
2012-04-25 09:23:59 +02:00 |
|
Xavier Raynaud
|
3ecb7bf88c
|
Removed compiler warnings.
|
2012-04-25 08:51:32 +02:00 |
|
Xavier Raynaud
|
ab961dda94
|
more efficient polymer code (replaced std::vector by double*).
|
2012-04-25 08:39:39 +02:00 |
|
Xavier Raynaud
|
6eb68c9652
|
Fixed bug in SinglePointUpwindTwoPhasePolymer.
|
2012-04-24 11:20:06 +02:00 |
|
Xavier Raynaud
|
e867c53722
|
polymerUtilities uses now PolymerProperties to compute effective mobilities.
|
2012-04-23 11:49:05 +02:00 |
|
Xavier Raynaud
|
4794348740
|
added computeMc function in PolymerProperties.
|
2012-04-23 10:27:27 +02:00 |
|
Xavier Raynaud
|
88941610ed
|
Corrected a bug in computation of effective mobilities.
|
2012-04-23 10:07:51 +02:00 |
|
Xavier Raynaud
|
a0794117c9
|
Cleaned code for computation of residual, many changes, not tested!
|
2012-04-19 17:21:08 +02:00 |
|
Atgeirr Flø Rasmussen
|
eb502faae7
|
Moved AdHocProps to new Inc.Props.DefaultPolymer class.
Also moved some functions in polymer_reorder.cpp to be more similar to spu_2p.cpp.
|
2012-04-12 14:10:47 +02:00 |
|
Atgeirr Flø Rasmussen
|
c99e396ed1
|
Silence warnings related to ad-hoc polymer fluid wrapper class.
|
2012-04-12 09:07:15 +02:00 |
|
Atgeirr Flø Rasmussen
|
6e26837dc7
|
Silence warnings resulting from unneeded redeclaration of dps etc.
|
2012-04-12 09:01:09 +02:00 |
|
Atgeirr Flø Rasmussen
|
b197c6b86e
|
Added rock compressibility terms to residuals (bracketing method only).
|
2012-04-11 16:04:04 +02:00 |
|
Atgeirr Flø Rasmussen
|
d71742871b
|
Expand concentration interval in which we look for solution.
This is an ad-hoc fix. We should investigate if (or how much)
the concentration may be above from the injected value.
|
2012-04-10 14:08:32 +02:00 |
|
Atgeirr Flø Rasmussen
|
dce3068343
|
Modified some assertions.
- In a gravity segregation setting, total upwind mobility may be zero.
- Make assertion more readable by removing negation.
|
2012-04-10 14:05:39 +02:00 |
|
Atgeirr Flø Rasmussen
|
8b8d10d58f
|
Comment unused variables to silence warnings.
|
2012-04-10 10:25:29 +02:00 |
|
Atgeirr Flø Rasmussen
|
adf40b19c1
|
Fixed initialization bug in PolymerProperties.
|
2012-04-10 10:25:07 +02:00 |
|
Atgeirr Flø Rasmussen
|
9fadfc316e
|
Added clarification.
|
2012-04-02 15:45:34 +02:00 |
|
Atgeirr Flø Rasmussen
|
0e178199ce
|
Added simulator state class for polymer case.
|
2012-04-02 15:44:32 +02:00 |
|
Xavier Raynaud
|
515bcb485e
|
In transport-reorder Newton, limit interval check for s, c (reset if needed).
|
2012-03-28 13:10:53 +02:00 |
|
Xavier Raynaud
|
18e45caf4f
|
Added enum to choose gradient computation method. By default, analytic.
|
2012-03-28 10:14:24 +02:00 |
|
Atgeirr Flø Rasmussen
|
724645b3f8
|
Introduced enum for adsorption behaviour to make code more self-documenting.
|
2012-03-27 15:33:48 +02:00 |
|
Xavier Raynaud
|
252fada2b4
|
Adapted to change in gravitation solver interface.
|
2012-03-27 13:05:53 +02:00 |
|
Xavier Raynaud
|
b846b15f1f
|
Corrected typo: adsorbtion -> adsorption.
|
2012-03-27 11:26:55 +02:00 |
|
Xavier Raynaud
|
acedd4b596
|
Added adsorbtion in residual computation.
|
2012-03-27 11:20:20 +02:00 |
|
Xavier Raynaud
|
6d9f0ea3ec
|
Added support for adsorbtion index (desorbtion allowed or not).
|
2012-03-26 16:37:39 +02:00 |
|
Atgeirr Flø Rasmussen
|
294c8b03be
|
Bugfix in calculation of adsorbed polymer for balance reports.
|
2012-03-26 15:33:38 +02:00 |
|
Xavier Raynaud
|
023cbb228e
|
Fixed bug for computeMc.
|
2012-03-26 13:45:14 +02:00 |
|
Xavier Raynaud
|
4e3f486d13
|
Simplified computation of coefficient mc.
|
2012-03-26 11:31:12 +02:00 |
|
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 |
|