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
Kjetil Olsen Lye
affbb08795
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
fdfd360481
Fixed a small bug in reading of WCONPROD
2012-04-13 11:37:50 +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
Bård Skaflestad
ca633d3323
Use correct syntax for Automake conditionals.
2012-04-12 21:13:57 +02:00
Bård Skaflestad
78dea6aa20
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
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
Bård Skaflestad
2065259764
Build the 'tutorial2' programme only if UMFPACK is present.
2012-04-12 18:39:51 +02:00
Bård Skaflestad
8002de23e4
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
f2b56c22bf
Added Latex format in documentation.
2012-04-12 18:13:57 +02:00
Xavier Raynaud
cb026af3a4
Added tutorial2 in python script.
2012-04-12 18:12:29 +02:00
Xavier Raynaud
5f43e97cc0
Added tutorial2 in Makefile.
2012-04-12 18:12:03 +02:00
Xavier Raynaud
c5c0487227
Corrected typo in comments.
2012-04-12 18:11:24 +02:00
Xavier Raynaud
42a9888829
Added css file, change font and size of formulas.
2012-04-12 18:10:18 +02:00
Xavier Raynaud
bd2757670c
Added second tutorial.
2012-04-12 18:09:06 +02:00
Xavier Raynaud
1143943b7f
Minor changes.
2012-04-12 18:08:46 +02:00
Kjetil Olsen Lye
bc275a4755
Made a computeWDP-function
2012-04-12 17:50:51 +02:00
Kjetil Olsen Lye
1a524b0a14
Changed input arguments for group checking
2012-04-12 16:56:58 +02:00
Atgeirr Flø Rasmussen
b6afa84a65
Initialize data members in declared order.
2012-04-12 16:52:57 +02:00
Kjetil Olsen Lye
5664fcd7d7
Made us of wells output arguments in IncompTpfa
2012-04-12 16:39:12 +02:00
Kjetil Olsen Lye
4aa0567fd4
Made IncompTpfa receive wells-output-arguments
2012-04-12 16:36:08 +02:00
Kjetil Olsen Lye
34460f1711
merge.
2012-04-12 15:48:59 +02:00
Kjetil Olsen Lye
49b18b2d96
Made queries upwards from wells to group to group
2012-04-12 15:48:24 +02:00
Atgeirr Flø Rasmussen
68a2d7fe26
Added and implemented parameter num_transport_substeps.
2012-04-12 14:43:05 +02:00
Atgeirr Flø Rasmussen
9121a81165
Removed unnecessary guard against using rock compressibility with segregation.
2012-04-12 14:25:53 +02:00
Kjetil Olsen Lye
77dc0991cf
Made the WellNode be aware of their own index
2012-04-12 14:25:39 +02:00
Atgeirr Flø Rasmussen
8f7939ca10
Added #include <numeric> for std::accumulate().
2012-04-12 14:14:24 +02:00
Atgeirr Flø Rasmussen
d0eb42c5d8
Changed satRange() behaviour to use highest sw in SWOF as max (instead of 1.0).
2012-04-12 13:52:41 +02:00
Kjetil Olsen Lye
9511d8dce2
Cleaned up examples/Makefile.am somewhat [made linking more clear]
2012-04-12 12:17:27 +02:00
Bård Skaflestad
74653b42d2
Replace malloc() call with default grid constructor.
...
This enables removing the explicit initialisation of pointer members
in the UnstructuredGrid because the return value from
create_grid_empty() is already in a fully defined state and may be
passed directly on to destroy_grid().
2012-04-11 19:12:06 +02:00
