Atgeirr Flø Rasmussen
b197c6b86e
Added rock compressibility terms to residuals (bracketing method only).
2012-04-11 16:04:04 +02:00
Kjetil Olsen Lye
b37f1edc88
Made linear solving of first timestep
2012-04-11 15:29:58 +02:00
Atgeirr Flø Rasmussen
7dcec8976b
Moved internal functions into anonymous namespace.
2012-04-11 10:56:08 +02:00
Atgeirr Flø Rasmussen
7c00c770b0
Improved formatting.
2012-04-11 10:52:45 +02:00
Atgeirr Flø Rasmussen
b8238927da
Improve formatting.
2012-04-11 10:49:45 +02:00
Atgeirr Flø Rasmussen
263642a98e
Removed unneeded check for WELSPECS and shadowing of existing object.
2012-04-11 10:47:30 +02:00
Xavier Raynaud
ed8bdfc5a4
Added first tutorial.
2012-04-10 17:18:19 +02:00
Atgeirr Flø Rasmussen
8ca7fa7665
Merged.
2012-04-10 15:47:28 +02:00
Atgeirr Flø Rasmussen
ddf0f09b6e
Disabled OpenMP pragmas in low-level fluid evaluations.
...
This is done to reduce risk of misuse, considering two cases:
- These functions are often called with a single data point,
making the thread setup and teardown time prohibitively expensive.
- This may conflict with higher-level use of OpenMP.
2012-04-10 15:46:24 +02:00
Atgeirr Flø Rasmussen
844b2b6cc6
Removed unused code.
2012-04-10 15:42:47 +02:00
Kjetil Olsen Lye
36ffb7416a
Fixed some warnings
2012-04-10 15:01:52 +02:00
Kjetil Olsen Lye
65d3ad547e
merge
2012-04-10 14:48:35 +02:00
Kjetil Olsen Lye
7db1027935
Fixed namespacing issue
2012-04-10 14:47:29 +02:00
Kjetil Olsen Lye
a9dfab1b37
Fixed namespacing issue
2012-04-10 14:47:29 +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
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
