Kjetil Olsen Lye
106b688a55
Inserted previously uncommented line
2012-04-16 11:27:46 +02:00
Kjetil Olsen Lye
d4b849f215
merge.
2012-04-13 20:41:19 +02:00
Kjetil Olsen Lye
24dc20ba4d
modified the group control interface slightly
2012-04-13 20:41:09 +02:00
Atgeirr Flø Rasmussen
2313339844
Fix bug: mistakenly swapped macros.
2012-04-13 16:36:51 +02:00
Atgeirr Flø Rasmussen
8c58165862
Added LinearSolverFactory class.
2012-04-13 16:33:51 +02:00
Bård Skaflestad
9a935b0efb
Merge from upstream.
2012-04-13 15:57:11 +02:00
Atgeirr Flø Rasmussen
588060d1e6
Use C comments in C code.
2012-04-13 15:46:15 +02:00
Atgeirr Flø Rasmussen
709b8c0b82
Work around mismatch between our HAVE_BOOST and what dune-istl expects.
...
In our config.h, HAVE_BOOST is defined (empty).
In dune-istl it is expected to be defined to 0 or 1.
2012-04-13 15:37:11 +02:00
Kjetil Olsen Lye
af849bf9e9
Added computations for total flow for each well
2012-04-13 14:22:44 +02:00
Bård Skaflestad
a950a5c732
well_controls_append(): Use C comment delimiters in C.
2012-04-13 14:09:20 +02:00
Kjetil Olsen Lye
c992deb147
prettification
2012-04-13 13:21:33 +02:00
Kjetil Olsen Lye
3058e26447
merge
2012-04-13 13:20:36 +02:00
Kjetil Olsen Lye
9d1c9dee68
extra tests for injector wells in group control
2012-04-13 13:17:25 +02:00
Kjetil Olsen Lye
62e4b791d2
Added checks for BHP and fluid_volume_rate for group control. Also added error tolerance for group control
2012-04-13 12:57:47 +02:00
Kjetil Olsen Lye
246af80ee8
Fixed a small bug in reading of WCONPROD
2012-04-13 11:37:50 +02:00
Kjetil Olsen Lye
f1cc0d56e8
Added reading of WGRUPCON, also added guide_rates to the well groups. Fixed a small bug in calculateWDP
2012-04-13 10:32:36 +02:00
Bård Skaflestad
9059af9b41
Opm::computeWDP(): Don't shadow (well) loop counter in phase loop.
2012-04-12 22:43:33 +02:00
Bård Skaflestad
a38efedc8d
Opm::computeWDP(): Match definition and prototype.
...
Specifically, accept the densities as a reference to const, not just a
const object.
2012-04-12 22:41:03 +02:00
Bård Skaflestad
6a5534ae2e
Pass correctly sized well-rate solution vectors to ifs_tpfa_press_flux().
...
The function computes a total flux at each perforation (connection), not
just one total flux per well. Update documentation accordingly.
2012-04-12 20:27:29 +02:00
Kjetil Olsen Lye
74fc0a5c25
Made a (possibly wrong) adjustment to well_controls_append. Each control now has its current index set to 0, as there's only supposed to be one control per well.
2012-04-12 18:47:06 +02:00
Xavier Raynaud
4b193f34ec
Added Latex format in documentation.
2012-04-12 18:13:57 +02:00
Kjetil Olsen Lye
7c21765100
Made a computeWDP-function
2012-04-12 17:50:51 +02:00
Kjetil Olsen Lye
fb6bde6e04
Changed input arguments for group checking
2012-04-12 16:56:58 +02:00
Atgeirr Flø Rasmussen
608766421b
Initialize data members in declared order.
2012-04-12 16:52:57 +02:00
Kjetil Olsen Lye
6756d6b6c3
Made us of wells output arguments in IncompTpfa
2012-04-12 16:39:12 +02:00
Kjetil Olsen Lye
ee736d8071
Made IncompTpfa receive wells-output-arguments
2012-04-12 16:36:08 +02:00
Kjetil Olsen Lye
4150e4a184
Made queries upwards from wells to group to group
2012-04-12 15:48:24 +02:00
Kjetil Olsen Lye
c931e2a1fb
Made the WellNode be aware of their own index
2012-04-12 14:25:39 +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
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
a9dfab1b37
Fixed namespacing issue
2012-04-10 14:47:29 +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
