Commit Graph

1652 Commits

Author SHA1 Message Date
Xavier Raynaud
5da5b2e325 Removed warnings from compiler. 2012-04-18 14:33:44 +02:00
Xavier Raynaud
9bb4b2c51d Corrected typos. 2012-04-18 14:32:20 +02:00
Bård Skaflestad
5a57f31474 Volume: Use official definition of a standard barrel; 42 U.S. gallon. 2012-04-17 19:45:39 +02:00
Bård Skaflestad
0e275bea4e Assert copyright for years 2011 and 2012. 2012-04-17 19:31:20 +02:00
Bård Skaflestad
8dfcadc36c Units.hpp: Split a few more long lines to fit in 80 columns. 2012-04-17 19:27:29 +02:00
Bård Skaflestad
41235ed3ad Darcy definition: Remove a leading blank inside parentheses. 2012-04-17 19:10:09 +02:00
Bård Skaflestad
80787e57f1 Darcy definition: Split long lines to fit in 80 columns. 2012-04-17 19:09:16 +02:00
Bård Skaflestad
2c541fee29 Darcy definition: Fix misprint introduced in Doxygenisation. 2012-04-17 19:08:45 +02:00
Xavier Raynaud
7b7c39de7e merge. 2012-04-17 17:26:23 +02:00
Xavier Raynaud
156e88a7e2 Updated tutorials. 2012-04-17 17:24:19 +02:00
Kjetil Olsen Lye
f4e40578f5 Passed around a WellControlResult argument to the different wellcontrol functions 2012-04-17 16:36:49 +02:00
Kjetil Olsen Lye
b32bce2ae4 merge 2012-04-17 09:25:54 +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
cfbfd841be Added shutdown of wells when they exceed their limits (if procedure = shut). 2012-04-17 08:59:20 +02:00
Bård Skaflestad
301e5e5c79 InjectionSpecification: Initialise fields in declaration order. 2012-04-16 19:29:22 +02:00
Bård Skaflestad
6bc00eba7c InjectionSpecification: Split long lines. No functional changes. 2012-04-16 19:27:34 +02:00
Bård Skaflestad
cd38c0dba2 GconinjeLine: Fix warnings. Initialise fields in declaration order. 2012-04-16 19:25:37 +02:00
Xavier Raynaud
e1df8085c3 Let Doxyfile generate documentation of whole opm-core. 2012-04-16 17:57:29 +02:00
Xavier Raynaud
f9675df450 Added Doxygen comments in tutorials. 2012-04-16 17:54:42 +02:00
Xavier Raynaud
e8ad818ce2 Added setup functions which take arguments directly (do not use ParamterGroup) 2012-04-16 17:53:10 +02:00
Xavier Raynaud
6b37e011ae Added Multiphase tutorial. 2012-04-16 17:50:29 +02:00
Xavier Raynaud
9d8cb130c8 Update python script to generate documentation figures. 2012-04-16 17:49:33 +02:00
Xavier Raynaud
63a57ff03b Added Doxygen documentation to Units.hpp. 2012-04-16 17:49:02 +02:00
Kjetil Olsen Lye
a3dd9db1ec Fixed group control for liquid flow 2012-04-16 17:42:11 +02:00
Kjetil Olsen Lye
52485ee5f7 Fixed reading of gconprod to handle defaulted arguments better 2012-04-16 17:10:17 +02:00
Kjetil Olsen Lye
945b56920b Made it possible to use group control without gconprod keyword 2012-04-16 15:26:33 +02:00
Kjetil Olsen Lye
3b99ec7ae3 Added reading of reservoir fluid max rate for GCONINJE 2012-04-16 14:49:13 +02:00
Kjetil Olsen Lye
2771bec005 Added further checks for well conditions. Fixed a small bug in reading WCONPROD 2012-04-16 13:44:53 +02:00
Kjetil Olsen Lye
11f0a14e61 Made use of the new LinearSolverFactory in wells_example 2012-04-16 12:18:37 +02:00
Kjetil Olsen Lye
6877cc8cd1 Added documententation of computeWDP and computeFlowRatePerWell 2012-04-16 11:39:16 +02:00
Kjetil Olsen Lye
caa905e3fa Inserted previously uncommented line 2012-04-16 11:27:46 +02:00
Kjetil Olsen Lye
99ff586dcc merge 2012-04-16 09:00:38 +02:00
Atgeirr Flø Rasmussen
b64db1027b Using LinearSolverFactory in spu_2p.cpp to gain linear solver flexibility. 2012-04-14 10:19:35 +02:00
Kjetil Olsen Lye
da013a5c98 merge. 2012-04-13 20:41:19 +02:00
Kjetil Olsen Lye
b1c5fa5aca modified the group control interface slightly 2012-04-13 20:41:09 +02:00
Atgeirr Flø Rasmussen
96dfbf8d5d Fix bug: mistakenly swapped macros. 2012-04-13 16:36:51 +02:00
Atgeirr Flø Rasmussen
abab8dd711 Added LinearSolverFactory class. 2012-04-13 16:33:51 +02:00
Bård Skaflestad
3d8e2b529e Merge from upstream. 2012-04-13 15:57:11 +02:00
Atgeirr Flø Rasmussen
32ecba7717 Use C comments in C code. 2012-04-13 15:46:15 +02:00
Atgeirr Flø Rasmussen
df5043b264 Use AC_REQUIRE for call to AX_DUNE_COMMON. 2012-04-13 15:45:48 +02:00
Atgeirr Flø Rasmussen
477cc66a84 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
Atgeirr Flø Rasmussen
bc371d4df1 Initial version of automatic checking for dune-istl in build system. 2012-04-13 15:35:19 +02:00
Kjetil Olsen Lye
c9a866fce0 Added computations for total flow for each well 2012-04-13 14:22:44 +02:00
Bård Skaflestad
bb559dde38 WGRUPCON::convertToSI(): Suppress warning about unused parameter. 2012-04-13 14:12:26 +02:00
Bård Skaflestad
c9820826bc well_controls_append(): Use C comment delimiters in C. 2012-04-13 14:09:20 +02:00
Bård Skaflestad
ab9ead475f WGRUPCON::read(): Don't shadow the name() method. 2012-04-13 14:08:45 +02:00
Kjetil Olsen Lye
f8b3a8c3f9 Fixed a warning, adjusted the tutorial to reflect the new solver interfacd 2012-04-13 13:41:23 +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
895567d124 extra tests for injector wells in group control 2012-04-13 13:17:25 +02:00