Commit Graph

94 Commits

Author SHA1 Message Date
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