Commit Graph

9501 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
18618b2d62 Changed initialization and other parts to be more similar to spu_2p.cpp. 2012-04-02 15:46:17 +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
Atgeirr Flø Rasmussen
ee4123c3d8 Made state before init() valid (0.0 water sat, 1.0 oil sat). 2012-04-02 15:41:13 +02:00
Atgeirr Flø Rasmussen
d397fd847b Changed single-cell solver call.
- Using [0,1] interval instead of [smin, smax] interval to handle compressible case.
 - Using new version of Regula Falsi function which exploits initial guess.
2012-04-02 13:24:57 +02:00
Atgeirr Flø Rasmussen
495a30ef17 Merge. 2012-03-30 16:11:27 +02:00
Atgeirr Flø Rasmussen
baf099cd5a Minor modification of residual formula (equivalent to the old). 2012-03-30 16:11:07 +02:00
Kjetil Olsen Lye
b959de1ba0 Some comments 2012-03-30 10:51:31 +02:00
Atgeirr Flø Rasmussen
ed5a7802b3 Bugfix: ensure all cells have a valid saturation initially. 2012-03-29 21:10:14 +02:00
Kjetil Olsen Lye
abdae7073e merge 2012-03-29 18:35:00 +02:00
Kjetil Olsen Lye
5cff14343d Added WellCollection as a forest of Well group trees. Did parsing of group control input data into this forest format 2012-03-29 18:34:51 +02:00
Atgeirr Flø Rasmussen
5e78fc1c9f Multiple changes dealing with initialization. Work in progress.
- Moved simulator state class into its own file.
 - Using new initState...() methods in spu_2p.cpp
 - No longer controlled by 'scenario' parameter.
2012-03-29 13:05:59 +02:00
Atgeirr Flø Rasmussen
41979968ff Minor bugfix. 2012-03-29 12:50:18 +02:00
Atgeirr Flø Rasmussen
bcb9a8772f Added correct documentation to initStateTwophaseBasic(). 2012-03-29 11:09:13 +02:00
Atgeirr Flø Rasmussen
3870df7fcd Added functions initStateTwophaseBasic() and initStateTwophaseFromDeck(). 2012-03-29 11:06:05 +02:00
Atgeirr Flø Rasmussen
0e861d1845 Suppressed multiple warnings. 2012-03-28 16:39:04 +02:00
Kjetil Olsen Lye
9ec1b4243b merge 2012-03-28 15:49:48 +02:00
Kjetil Olsen Lye
844698baa2 Prettification of code 2012-03-28 15:49:39 +02:00
Atgeirr Flø Rasmussen
c577e8d952 Merged. 2012-03-28 14:41:56 +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
Kjetil Olsen Lye
bc1fcb831b Fixed some warnings and added GCONPROD reading for the eclipse parser 2012-03-28 12:38:48 +02:00
Atgeirr Flø Rasmussen
244faaf975 Merge. 2012-03-28 11:57:25 +02:00
Atgeirr Flø Rasmussen
c961f8e7d2 Suppressed multiple warnings. 2012-03-28 11:56:20 +02:00
Xavier Raynaud
18e45caf4f Added enum to choose gradient computation method. By default, analytic. 2012-03-28 10:14:24 +02:00
Kjetil Olsen Lye
e075d3d92b merge 2012-03-27 16:57:12 +02:00
Kjetil Olsen Lye
eedb506ad0 Started reading the gruptree 2012-03-27 16:57:01 +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
873b25c9e4 merge. 2012-03-27 12:51:24 +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
Bård Skaflestad
2cd5cfb867 solveGravity(): Don't compare signed and unsigned expressions. 2012-03-27 11:19:13 +02:00
Kjetil Olsen Lye
d2e4f5d664 Removed all traces of the property tree (I hope) 2012-03-27 11:09:04 +02:00
Kjetil Olsen Lye
867653d4b1 Fixed minor error 2012-03-27 10:58:42 +02:00
Kjetil Olsen Lye
2bdebbe7db Fixed minor error 2012-03-27 10:57:44 +02:00
Kjetil Olsen Lye
88d6a626e3 Added exmaple file 2012-03-27 10:56:32 +02:00
Kjetil Olsen Lye
5b485b8c8a Added exmaple file 2012-03-27 10:56:32 +02:00
Atgeirr Flø Rasmussen
cffd06ab91 Fixed segregation scenario init. Reinstated old AdHocProps behaviour.
AdHocProps: the relperm curves are now the same as in the standard small
testcase also used in the MRST prototype.
2012-03-27 09:36:37 +02:00
Kjetil Olsen Lye
f7d88a1836 merge 2012-03-27 09:23:32 +02:00
Kjetil Olsen Lye
040be401e0 added initial input reading for group control (GRUP-keyword) 2012-03-27 09:23:24 +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
Atgeirr Flø Rasmussen
7777a8ee07 Bugfix in solveMultiCell(). 2012-03-26 14:20:00 +02:00
Xavier Raynaud
c070f0ad4d Added influx for scenario 3. 2012-03-26 13:45:35 +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
d25a242a23 updated Makefile.am 2012-03-26 10:04:10 +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