Bård Skaflestad
e1a836ff04
Use complete sentences when describing individual WellControlTypes.
2012-04-21 10:10:11 +02:00
Bård Skaflestad
97a21f1094
Correct misunderstanding about row-major vs. column major ordering.
2012-04-20 23:53:04 +02:00
Bård Skaflestad
755bc5ecb5
Correct array sizes in struct CompletionData.
2012-04-20 20:54:58 +02:00
Bård Skaflestad
b744285b9a
Use more precise description of the WellControlType.
2012-04-20 19:53:09 +02:00
Bård Skaflestad
2c001e06df
Remove an instance of EOL whitespace introduced in cset a09de38891c5.
2012-04-20 19:47:52 +02:00
Atgeirr Flø Rasmussen
ce74f956e7
Accounting for (constant) formation volume factor in incompressible fluids.
2012-04-20 14:00:38 +02:00
Atgeirr Flø Rasmussen
11389cdd54
Added file level docs.
2012-04-20 11:38:10 +02:00
Atgeirr Flø Rasmussen
36aa5fd90c
Renamed add_wells() -> add_well(). Documented.
2012-04-20 11:34:58 +02:00
Atgeirr Flø Rasmussen
a96ac0bc9e
Renamed some enums and functions relating to Wells, and started documenting it.
2012-04-20 09:50:36 +02:00
Atgeirr Flø Rasmussen
1365dcd6b8
Initialise current well control in the appropriate place.
2012-04-19 16:11:58 +02:00
Atgeirr Flø Rasmussen
dcad28acbd
Silence warnings about unhandled cases.
2012-04-19 16:11:28 +02:00
Atgeirr Flø Rasmussen
605933abba
Pretty-formatting only.
2012-04-19 15:33:25 +02:00
Atgeirr Flø Rasmussen
3fcdb1f412
Bugfix: in SATNUM treatment, allow for inactive cells.
2012-04-19 15:00:56 +02:00
Atgeirr Flø Rasmussen
844ccf3562
Now saturation props read from deck may have multiple tables, and support SATNUM.
2012-04-19 11:49:59 +02:00
Atgeirr Flø Rasmussen
b0c60ee05b
Make constructor take arguments by reference. Silence a warning.
2012-04-19 11:47:41 +02:00
Atgeirr Flø Rasmussen
74b3a40bbf
Make column gravity Gauss-Seidel solver report average number of iterations.
2012-04-19 11:46:41 +02:00
Xavier Raynaud
c8dfdecb7c
Removed warning from compiler.
2012-04-18 14:46:01 +02:00
Xavier Raynaud
6c3220077a
merge.
2012-04-17 17:26:23 +02:00
Kjetil Olsen Lye
069ad5a611
Passed around a WellControlResult argument to the different wellcontrol functions
2012-04-17 16:36:49 +02:00
Kjetil Olsen Lye
5d39e3c0ef
merge
2012-04-17 09:25:54 +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
95818d1f02
Added shutdown of wells when they exceed their limits (if procedure = shut).
2012-04-17 08:59:20 +02:00
Bård Skaflestad
57d6bc9b03
InjectionSpecification: Initialise fields in declaration order.
2012-04-16 19:29:22 +02:00
Bård Skaflestad
627c3be1f9
InjectionSpecification: Split long lines. No functional changes.
2012-04-16 19:27:34 +02:00
Xavier Raynaud
92dc5e2368
Added setup functions which take arguments directly (do not use ParamterGroup)
2012-04-16 17:53:10 +02:00
Kjetil Olsen Lye
24cefa60bc
Fixed group control for liquid flow
2012-04-16 17:42:11 +02:00
Kjetil Olsen Lye
dedc60d92d
Fixed reading of gconprod to handle defaulted arguments better
2012-04-16 17:10:17 +02:00
Kjetil Olsen Lye
bc72ea9a44
Made it possible to use group control without gconprod keyword
2012-04-16 15:26:33 +02:00
Kjetil Olsen Lye
29ebfac858
Added reading of reservoir fluid max rate for GCONINJE
2012-04-16 14:49:13 +02:00
Kjetil Olsen Lye
a7e471951d
Added further checks for well conditions. Fixed a small bug in reading WCONPROD
2012-04-16 13:44:53 +02:00
Kjetil Olsen Lye
67251e7f77
Added documententation of computeWDP and computeFlowRatePerWell
2012-04-16 11:39:16 +02:00
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
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
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
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
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
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
Bård Skaflestad
2cd5cfb867
solveGravity(): Don't compare signed and unsigned expressions.
2012-03-27 11:19:13 +02:00
Kjetil Olsen Lye
d2e4f5d664
Removed all traces of the property tree (I hope)
2012-03-27 11:09:04 +02:00
Kjetil Olsen Lye
867653d4b1
Fixed minor error
2012-03-27 10:58:42 +02:00
Kjetil Olsen Lye
2bdebbe7db
Fixed minor error
2012-03-27 10:57:44 +02:00
Kjetil Olsen Lye
5b485b8c8a
Added exmaple file
2012-03-27 10:56:32 +02:00
Kjetil Olsen Lye
f7d88a1836
merge
2012-03-27 09:23:32 +02:00
Kjetil Olsen Lye
040be401e0
added initial input reading for group control (GRUP-keyword)
2012-03-27 09:23:24 +02:00
Atgeirr Flø Rasmussen
7777a8ee07
Bugfix in solveMultiCell().
2012-03-26 14:20:00 +02:00
Kjetil Olsen Lye
bceee40b4f
Added opm-parallelization to column solver for gravity. Did a (minor) interface change on extractColumn
2012-03-23 12:32:25 +01:00
Bård Skaflestad
1a873633c1
Implement solution recovery from wells (BHP and perf. fluxes)
...
Contingent upon passing non-NULL well_press and well_flux pointers in
the solution structure. The forces must be the same as the ones used
in assembling the system of linear equations.
2012-03-21 11:54:34 +01:00
Bård Skaflestad
7988921f21
ifs_tpfa: Prepare for well solution recovery (BHP and perf. fluxes).
...
Expose new elements '.well_press' and '.well_flux' in the solution
structure and update callers accordingly.
2012-03-21 11:08:56 +01:00
Bård Skaflestad
18cdd5f1e3
Assemble_bhp_well(): Don't look up wdof diagonal element multiple times.
2012-03-21 10:59:21 +01:00