Bård Skaflestad
f91ec88df6
BandMatrixCoeff: Initialise members in declaration order.
2012-03-20 10:53:36 +01:00
Atgeirr Flø Rasmussen
d75e55a968
Merged.
2012-03-20 10:33:44 +01:00
Atgeirr Flø Rasmussen
82079418db
Changed tot_porevol -> tot_porevol_init. Initialise rock_comp object.
2012-03-20 10:33:37 +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
832107aec8
Fixed const correctness issue in RockCompressibility class.
2012-03-20 10:29:43 +01:00
Xavier Raynaud
eeebd21d62
merge.
2012-03-20 10:15:50 +01:00
Atgeirr Flø Rasmussen
866f539519
Added RockCompressibility::isActive() method.
2012-03-20 10:15:33 +01:00
Xavier Raynaud
d4e5008743
merge
2012-03-20 10:15:15 +01:00
Atgeirr Flø Rasmussen
2d8cebd6c6
Documented computePhaseMobilities().
2012-03-20 10:13:27 +01:00
Xavier Raynaud
94b0c76050
merge.
2012-03-19 15:05:36 +01:00
Atgeirr Flø Rasmussen
c1015131fc
Merge.
2012-03-19 14:35:37 +01:00
Atgeirr Flø Rasmussen
465f54e0e6
Fixed and documented constructor taking ParameterGroup.
2012-03-19 14:35:13 +01:00
Atgeirr Flø Rasmussen
fe8f2e566f
Added constructor taking parameters to RockCompressibility.
2012-03-19 14:30:44 +01:00
Atgeirr Flø Rasmussen
e29dd18d77
Added RockCompressibility class.
2012-03-19 13:55:26 +01:00
Bård Skaflestad
3d3aaa98d1
solve(rock_comp): Replace manual index search with csrmatrix_elm_index().
2012-03-19 13:55:21 +01:00
Atgeirr Flø Rasmussen
bc04c0fa3e
Implemented solve() with rock compressibility (untested). Struct init warning suppression.
2012-03-19 11:52:03 +01:00
Xavier Raynaud
1311e42208
updated test with band matrix assignement for lapack solver.
2012-03-19 09:47:44 +01:00
Bård Skaflestad
9f540e9cf7
Merge from upstream.
2012-03-16 20:35:52 +01:00
Bård Skaflestad
b8f3cd90c3
ifs_tpfa_assemble(): Coalesce external forces into single branch.
2012-03-16 14:30:13 +01:00
Atgeirr Flø Rasmussen
a103933e2b
Fixed bugs and changed interface for Gauss-Seidel segregation solver.
2012-03-16 13:41:10 +01:00
Bård Skaflestad
c5c9f58a23
Refactor construction of driving forces in preparation of well support.
2012-03-16 11:59:51 +01:00
Bård Skaflestad
f89746b8bd
Refactor ifs_tpfa_press_flux() flux calculation in preparation of wells.
...
Specifically, move calculation of cross-boundary fluxes introduced by
boundary conditions out to new internal function boundary_fluxes().
2012-03-16 11:21:34 +01:00
Bård Skaflestad
488f85d425
Align multi-line parameter lists and structure members.
...
No functional changes.
2012-03-16 11:06:01 +01:00
Bård Skaflestad
87aa556423
Initialise all tpfa_solution members to NULL in anticipation of well support.
2012-03-16 09:32:48 +01:00
Atgeirr Flø Rasmussen
589b24f945
Merge.
2012-03-16 08:33:35 +01:00
Atgeirr Flø Rasmussen
dd0cd85bf6
Added experimental Gauss-Seidel segregation solver. Not yet functioning.
2012-03-16 08:33:00 +01:00
Xavier Raynaud
c9e34bbf16
merge
2012-03-15 16:17:54 +01:00
Xavier Raynaud
7fa98bc5ae
Added solver for band matrix and a test example.
2012-03-15 16:17:16 +01:00
Xavier Raynaud
153fee692a
decrease tolerance for x1-x0 in falsi.
2012-03-15 16:16:31 +01:00
Xavier Raynaud
49a53f1935
Compute the derivative directly (not using epsilon parameter).
2012-03-15 16:15:32 +01:00
Bård Skaflestad
bb98b3083f
Merge from upstream.
2012-03-15 15:56:08 +01:00
Bård Skaflestad
116b8f9d95
Initialise all tpfa_solution members to zero (i.e., NULL).
...
This is in anticipation of introducing additional structure members to
represent solution variables associated with wells whilst having the
compiler generate the appropriate null pointers to aid debugging.
Unfortunately, GCC warns about the standard "structure = { 0 }" idiom
under -Wmissing-field-initializers which is enabled by default under
"-Wextra".
2012-03-15 15:13:03 +01:00
Bård Skaflestad
d69eb28dfc
Encapsulate ifs_tpfa pressure solution in ad-hoc structure.
...
This is to limit the number of explicit interface changes when we
produce solution variables for wells too.
Update callers accordingly.
2012-03-15 14:26:40 +01:00
Atgeirr Flø Rasmussen
fc3357e98a
Production must be computed with the correct saturation.
...
The bug was the following: the reordering transport solvers accounts for
sources and sinks, and modifies saturation accordingly. This saturation is
the one we must use for computing sink outflow (= fracflow(s)*outflux).
If we wait until after segregation, saturation is changed, and we
compute fracflow(s')*outflux instead.
2012-03-15 14:15:57 +01:00
Atgeirr Flø Rasmussen
c10c089d5e
Update for change in tpfa solver.
2012-03-15 11:16:03 +01:00
Bård Skaflestad
6d8531548b
ifs_tpfa: Build sparse matrix structure capable of handling wells.
...
Actual contributions not included at this time. Update caller
(IncompTPFA) accordingly, but don't modify observable behaviour.
2012-03-15 02:53:59 +01:00
Bård Skaflestad
193feace4e
Fix specification error: Header files go in _HEADERS.
...
Pointy hat: Bård Skaflestad
2012-03-14 20:14:10 +01:00
Bård Skaflestad
38a4456db9
Distribute 'ColumnExtract.hpp'.
...
This restores "make distcheck".
2012-03-14 20:09:15 +01:00
Atgeirr Flø Rasmussen
4a22a98459
Fix doc typo.
2012-03-14 13:46:21 +01:00
Atgeirr Flø Rasmussen
eccf52af0c
Minor comment changed.
2012-03-14 12:51:51 +01:00
Atgeirr Flø Rasmussen
06d72587cc
Moved Watercut class to miscUtilities.hpp.
2012-03-14 12:47:01 +01:00
Atgeirr Flø Rasmussen
86284d06c1
Reformatting only.
2012-03-14 11:16:48 +01:00
Atgeirr Flø Rasmussen
de1c0e8874
Untabify.
2012-03-14 10:40:41 +01:00
Atgeirr Flø Rasmussen
b56c397fa2
Use wellsToSrc() from utility, minor reordering of #includes.
2012-03-14 09:52:05 +01:00
Atgeirr Flø Rasmussen
a50bb8ffe9
Added wellsToSrc() function. Use forward declarations in header.
2012-03-14 09:51:08 +01:00
Atgeirr Flø Rasmussen
df3592473a
Minor additions to output, comments.
2012-03-14 09:38:43 +01:00
Bård Skaflestad
ba3cf61c2e
Adjust white-space for previous commit.
...
No functional change.
2012-03-14 00:03:17 +01:00
Bård Skaflestad
1130baf6d7
Staticise several functions to suppress warnings about missing prior declarations.
2012-03-14 00:01:45 +01:00
Bård Skaflestad
e502cc54d0
Merge from upstream.
2012-03-14 00:00:15 +01:00
Bård Skaflestad
686100a407
Account for explicit flux BCs during flux calculation.
2012-03-13 23:35:26 +01:00
