Commit Graph

50 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
f5359936e0 Bugfix: order of function arguments.
Order of arguments for computePhaseFlowRatesPerWell() was wrong.
This fix was done previously for SimulatorCompressibleTwophase,
but the incompressible sim was ignored.

Also added an ASSERT that may help catch some misuse.
2012-10-10 14:09:09 +02:00
Atgeirr Flø Rasmussen
8fdebccef6 Improve diagnostic output if crossflow is detected. 2012-09-20 14:33:57 +02:00
Atgeirr Flø Rasmussen
3fa259496b Fix stride bug in WellReport::push(). Use convert::to(). 2012-09-04 13:12:06 +02:00
Atgeirr Flø Rasmussen
055f2d5f19 Whitespace cleanup and adding a check for #phases <= 3. 2012-09-03 14:04:52 +02:00
Atgeirr Flø Rasmussen
142f186b81 Merge remote-tracking branch 'hnil/master' 2012-09-03 13:40:33 +02:00
Xavier Raynaud
4d800cad3d Added functionality to compute porosity for compressible fluid. 2012-08-29 10:54:21 +02:00
Halvor Møll Nilsen
a6dcc52cba Started work on supporting 3 phases for wellreport. 2012-08-27 12:22:32 +02:00
Bård Skaflestad
2988b48bd3 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
89b4f8ceb0 Added WellReport::push() overload taking BlackoilPropertiesInterface. 2012-05-15 12:50:02 +02:00
Atgeirr Flø Rasmussen
67e3d38bec 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
517121470e merge. 2012-05-08 12:25:29 +02:00
Kjetil Olsen Lye
339a652e5d Changed some minor bugs in the refactored code in wells_example 2012-05-08 12:23:58 +02:00
Bård Skaflestad
d55fd7b6b5 Delete trailing whitespace. 2012-05-08 12:04:59 +02:00
Bård Skaflestad
fcdca081b0 Fix a likely indexing error leading to non-unit strides. 2012-05-08 12:03:50 +02:00
Kjetil Olsen Lye
be956f2a70 Refactored some computations into seperate methods in wells_example.cpp 2012-05-08 11:04:15 +02:00
Atgeirr Flø Rasmussen
2cf04140a1 Rewrote wellsToSrc() to be a little more accepting and correct. 2012-05-03 13:45:19 +02:00
Atgeirr Flø Rasmussen
5264cd317f Updated computeTransportSource() and wellsToSrc() to match changes in Wells data structure. 2012-05-02 09:24:34 +02:00
Atgeirr Flø Rasmussen
51639bf3bc Follow change to well rate target sign convention. 2012-04-25 15:36:01 +02:00
Atgeirr Flø Rasmussen
20d1dec648 Fixed bug in computeWDP(), add gravity argument. Make WellReport output in friendly units. 2012-04-25 12:37:30 +02:00
Atgeirr Flø Rasmussen
b1bdd3cb3b Added class WellReport. 2012-04-25 11:00:33 +02:00
Atgeirr Flø Rasmussen
4f403bbc42 Changed order of functions to match order in header file. 2012-04-25 08:59:31 +02:00
Atgeirr Flø Rasmussen
f0aed255b0 Now computeTransportSource() ignores crossflow. 2012-04-24 15:18:19 +02:00
Atgeirr Flø Rasmussen
ce98195001 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
eefcc69b3c Minor change to computeWDP() interface. 2012-04-24 13:48:00 +02:00
Kjetil Olsen Lye
81733f5a43 Fixed computeWDP again. 2012-04-24 13:36:32 +02:00
Kjetil Olsen Lye
2528d35b19 Fixed computeWDP. Small prettification of code. 2012-04-24 13:33:12 +02:00
Kjetil Olsen Lye
c2942a7d51 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
c9a866fce0 Added computations for total flow for each well 2012-04-13 14:22:44 +02:00
Kjetil Olsen Lye
47dc72812b prettification 2012-04-13 13:21:33 +02:00
Kjetil Olsen Lye
5b21e74999 merge 2012-04-13 13:20:36 +02:00
Kjetil Olsen Lye
a3395d9903 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
e66a2572c6 Opm::computeWDP(): Don't shadow (well) loop counter in phase loop. 2012-04-12 22:43:33 +02:00
Bård Skaflestad
8ab03f2288 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
8bc9e862d4 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
bc275a4755 Made a computeWDP-function 2012-04-12 17:50:51 +02:00
Atgeirr Flø Rasmussen
11f03a60f0 Make comments relating to omega (frac.flow-weighted density) precise. 2012-03-20 14:21:22 +01:00
Atgeirr Flø Rasmussen
3b678ac5eb Added computePorevolume() overload taking rock compressibility into account. 2012-03-20 10:31:32 +01:00
Atgeirr Flø Rasmussen
2d8cebd6c6 Documented computePhaseMobilities(). 2012-03-20 10:13:27 +01:00
Atgeirr Flø Rasmussen
06d72587cc Moved Watercut class to miscUtilities.hpp. 2012-03-14 12:47:01 +01:00
Atgeirr Flø Rasmussen
a50bb8ffe9 Added wellsToSrc() function. Use forward declarations in header. 2012-03-14 09:51:08 +01:00
Bård Skaflestad
e502cc54d0 Merge from upstream. 2012-03-14 00:00:15 +01:00
Atgeirr Flø Rasmussen
bae286e000 Added computeSaturatedVol() and computeInjectedProduced() functions. 2012-03-13 15:56:52 +01:00
Bård Skaflestad
16a32142ff Re-implement computeTotalMobilityOmega() in terms of computePhaseMobilities(). 2012-03-12 16:18:02 +01:00
Bård Skaflestad
3a275748c0 Re-implement computeTotalMobility() in terms of computePhaseMobilities(). 2012-03-12 16:09:26 +01:00
Bård Skaflestad
385ff36455 Add utility for calculating all phase mobilities. 2012-03-12 16:03:29 +01:00
Atgeirr Flø Rasmussen
dd85dc522c Added computeTransportSource() function. Handling bdy fluxes in spu_2p. 2012-03-12 13:00:48 +01:00
Atgeirr Flø Rasmussen
abc03de73c Added computeAverageSat() function. 2012-03-09 11:44:21 +01:00
Atgeirr Flø Rasmussen
941bd814f0 Fix minor typo. 2012-03-06 15:10:21 +01:00
Bård Skaflestad
53f05d3eab Don't assume that num_phases==2 when calculating total mobility. 2012-02-27 10:07:00 +01:00
Atgeirr Flø Rasmussen
8a0d5728a8 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