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
fcca65748e
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
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
40ac7414ac
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
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
Bård Skaflestad
ad0f414c5a
Catch up to interface change of IncompTPFA::solve().
...
Revision 13e1ab7e1093 introduced well solution vectors (accessed only when
wells are present). Update the method call accordingly to restore build.
2012-04-12 18:39:19 +02:00
Xavier Raynaud
4b193f34ec
Added Latex format in documentation.
2012-04-12 18:13:57 +02:00
Xavier Raynaud
ca1342d7dc
Added second tutorial.
2012-04-12 18:09:06 +02:00
Xavier Raynaud
869f233f7b
Minor changes.
2012-04-12 18:08:46 +02:00
Kjetil Olsen Lye
23019eb23d
Made a computeWDP-function
2012-04-12 17:50:51 +02:00
Kjetil Olsen Lye
7c21765100
Made a computeWDP-function
2012-04-12 17:50:51 +02:00
Kjetil Olsen Lye
bbb5f56d2b
Changed input arguments for group checking
2012-04-12 16:56:58 +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
fbf157bb41
Made queries upwards from wells to group to group
2012-04-12 15:48:24 +02:00
Kjetil Olsen Lye
4150e4a184
Made queries upwards from wells to group to group
2012-04-12 15:48:24 +02:00
Atgeirr Flø Rasmussen
346647ca37
Removed unused code.
2012-04-12 15:11:30 +02:00
Atgeirr Flø Rasmussen
ad298a39d4
Added rock compressibility effects to polymer_reorder.
2012-04-12 14:49:24 +02:00
Kjetil Olsen Lye
aaf887cf61
Made the WellNode be aware of their own index
2012-04-12 14:25:39 +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
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
4d41caeea4
Added parameter num_transport_substeps and implemented substepping.
2012-04-12 13:49:29 +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
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