Bård Skaflestad
cc054d474d
computeFractionalFlow(): Reuse the output array in all intermediate calculations.
...
This eliminates a number of free-store operations and data movements.
2012-06-13 17:07:56 +02:00
Atgeirr Flø Rasmussen
7df0023038
Added WellReport::push() overload taking BlackoilPropertiesInterface.
2012-05-15 12:50:02 +02:00
Atgeirr Flø Rasmussen
c0d43a69bd
Now computePorevolume() takes a porosity array instead of a property object.
...
This is to make it compatible with blackoil properties.
An alternative would be to give [Incomp|Blackoil]PropertiesInterface a
common base class (RockInterface?) with the common rock-related methods.
2012-05-14 21:47:10 +02:00
Kjetil Olsen Lye
88b8ddebd2
merge.
2012-05-08 12:25:29 +02:00
Kjetil Olsen Lye
8c6ea2895b
Changed some minor bugs in the refactored code in wells_example
2012-05-08 12:23:58 +02:00
Bård Skaflestad
9e5b5be59b
Delete trailing whitespace.
2012-05-08 12:04:59 +02:00
Bård Skaflestad
6b96d48677
Fix a likely indexing error leading to non-unit strides.
2012-05-08 12:03:50 +02:00
Kjetil Olsen Lye
c9d96d81b8
Refactored some computations into seperate methods in wells_example.cpp
2012-05-08 11:04:15 +02:00
Atgeirr Flø Rasmussen
0aae87cf16
Rewrote wellsToSrc() to be a little more accepting and correct.
2012-05-03 13:45:19 +02:00
Atgeirr Flø Rasmussen
6e9091bc4d
Updated computeTransportSource() and wellsToSrc() to match changes in Wells data structure.
2012-05-02 09:24:34 +02:00
Atgeirr Flø Rasmussen
3fe04afa8d
Follow change to well rate target sign convention.
2012-04-25 15:36:01 +02:00
Atgeirr Flø Rasmussen
43b1db22a3
Fixed bug in computeWDP(), add gravity argument. Make WellReport output in friendly units.
2012-04-25 12:37:30 +02:00
Atgeirr Flø Rasmussen
8a9cf2cc79
Added class WellReport.
2012-04-25 11:00:33 +02:00
Atgeirr Flø Rasmussen
1c5f879530
Changed order of functions to match order in header file.
2012-04-25 08:59:31 +02:00
Atgeirr Flø Rasmussen
6985ec94fe
Now computeTransportSource() ignores crossflow.
2012-04-24 15:18:19 +02:00
Atgeirr Flø Rasmussen
e017c53380
Include well flow in computeTransportSource().
...
Also minor fixes in spu_2p to handle no-wells case properly.
2012-04-24 15:15:36 +02:00
Atgeirr Flø Rasmussen
8c1f9be1c3
Minor change to computeWDP() interface.
2012-04-24 13:48:00 +02:00
Kjetil Olsen Lye
b41dd9088c
Fixed computeWDP again.
2012-04-24 13:36:32 +02:00
Kjetil Olsen Lye
981fd5e1f3
Fixed computeWDP. Small prettification of code.
2012-04-24 13:33:12 +02:00
Kjetil Olsen Lye
b0b13c71f9
Fixed a compilation bug, also adjusted computeWDP slightly to allow for either a saturation vector by grid cells or by well cells
2012-04-17 09:19:06 +02:00
Kjetil Olsen Lye
af849bf9e9
Added computations for total flow for each well
2012-04-13 14:22:44 +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
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
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
Kjetil Olsen Lye
7c21765100
Made a computeWDP-function
2012-04-12 17:50:51 +02:00
Atgeirr Flø Rasmussen
6688ea1031
Make comments relating to omega (frac.flow-weighted density) precise.
2012-03-20 14:21:22 +01:00
Atgeirr Flø Rasmussen
227d3e7d3c
Added computePorevolume() overload taking rock compressibility into account.
2012-03-20 10:31:32 +01:00
Atgeirr Flø Rasmussen
f40d0ad8de
Documented computePhaseMobilities().
2012-03-20 10:13:27 +01:00
Atgeirr Flø Rasmussen
d98b83bd3d
Moved Watercut class to miscUtilities.hpp.
2012-03-14 12:47:01 +01:00
Atgeirr Flø Rasmussen
08e12d7be1
Added wellsToSrc() function. Use forward declarations in header.
2012-03-14 09:51:08 +01:00
Bård Skaflestad
e93ae04452
Merge from upstream.
2012-03-14 00:00:15 +01:00
Atgeirr Flø Rasmussen
f72fdf1914
Added computeSaturatedVol() and computeInjectedProduced() functions.
2012-03-13 15:56:52 +01:00
Bård Skaflestad
29ba859a80
Re-implement computeTotalMobilityOmega() in terms of computePhaseMobilities().
2012-03-12 16:18:02 +01:00
Bård Skaflestad
c4f803fedd
Re-implement computeTotalMobility() in terms of computePhaseMobilities().
2012-03-12 16:09:26 +01:00
Bård Skaflestad
2ac5157148
Add utility for calculating all phase mobilities.
2012-03-12 16:03:29 +01:00
Atgeirr Flø Rasmussen
03200bbf37
Added computeTransportSource() function. Handling bdy fluxes in spu_2p.
2012-03-12 13:00:48 +01:00
Atgeirr Flø Rasmussen
100108b5ad
Added computeAverageSat() function.
2012-03-09 11:44:21 +01:00
Atgeirr Flø Rasmussen
939ddd8fe6
Fix minor typo.
2012-03-06 15:10:21 +01:00
Bård Skaflestad
f4df7aa1bd
Don't assume that num_phases==2 when calculating total mobility.
2012-02-27 10:07:00 +01:00
Atgeirr Flø Rasmussen
b058678235
Moved simulator utility functions to opm/core/utility/miscUtilities.hpp.
...
We want to avoid having hundreds of files with a single function, therefore
these functions have been lumped together. With time, a more sophisticated
organization of such free functions may be in order.
2012-02-26 21:05:19 +01:00
