Atgeirr Flø Rasmussen
ed5cf7270c
Implemented solve() with rock compressibility (untested). Struct init warning suppression.
2012-03-19 11:52:03 +01:00
Xavier Raynaud
b6b720f338
Removed useless comment.
2012-03-19 11:30:00 +01:00
Xavier Raynaud
2daf397268
removed dmcds because the coefficient mc does not depend on s.
2012-03-19 11:28:55 +01:00
Xavier Raynaud
b513b129ce
changed syntax for BandMatrixCoef.
2012-03-19 09:56:20 +01:00
Bård Skaflestad
f3ce1369c4
Merge from upstream.
2012-03-16 20:35:52 +01:00
Bård Skaflestad
e8712565a8
ifs_tpfa_assemble(): Coalesce external forces into single branch.
2012-03-16 14:30:13 +01:00
Atgeirr Flø Rasmussen
75b6e1fc97
Fixed bugs and changed interface for Gauss-Seidel segregation solver.
2012-03-16 13:41:10 +01:00
Bård Skaflestad
78687dc5c9
Refactor construction of driving forces in preparation of well support.
2012-03-16 11:59:51 +01:00
Bård Skaflestad
3dbd7e4599
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
83345b4e3a
Align multi-line parameter lists and structure members.
...
No functional changes.
2012-03-16 11:06:01 +01:00
Atgeirr Flø Rasmussen
a02089eabb
Merge.
2012-03-16 08:33:35 +01:00
Atgeirr Flø Rasmussen
6e916914d6
Added experimental Gauss-Seidel segregation solver. Not yet functioning.
2012-03-16 08:33:00 +01:00
Xavier Raynaud
dc0771ee3e
merge
2012-03-15 18:10:10 +01:00
Xavier Raynaud
efe0408b71
Gravity column solver with polymer.
2012-03-15 18:09:29 +01:00
Xavier Raynaud
54844f60c1
Computes s and c-residual and its Jacobian at a cell interface.
2012-03-15 18:08:30 +01:00
Bård Skaflestad
4378bf7192
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
27226eaacb
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
Bård Skaflestad
bc106cb286
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
Atgeirr Flø Rasmussen
b120aa6c90
Bugfix: corrected computation of polymer contained in reservoir.
2012-03-14 21:12:54 +01:00
Atgeirr Flø Rasmussen
1554bfff11
Still working on adsorption computations.
2012-03-14 16:13:59 +01:00
Atgeirr Flø Rasmussen
efc03f1596
Remove unneeded dps argument from computePolymerAdsorbed().
2012-03-14 15:59:56 +01:00
Atgeirr Flø Rasmussen
2f06b301bf
Change function name to computePolymerAdsorbed() [with a d, not b].
2012-03-14 15:57:28 +01:00
Atgeirr Flø Rasmussen
ad470a7796
Bugfix: dead pore space in polymer mass calc. Added computePolymerAbsorbed().
2012-03-14 15:54:36 +01:00
Atgeirr Flø Rasmussen
bf44f9f72e
Added computePolymerMass() and polymer-aware overload of computeInjectedProduced().
2012-03-14 14:03:07 +01:00
Atgeirr Flø Rasmussen
5a47b3b075
Fix doc typo.
2012-03-14 13:46:21 +01:00
Atgeirr Flø Rasmussen
d98b83bd3d
Moved Watercut class to miscUtilities.hpp.
2012-03-14 12:47:01 +01:00
Atgeirr Flø Rasmussen
08e12d7be1
Added wellsToSrc() function. Use forward declarations in header.
2012-03-14 09:51:08 +01:00
Bård Skaflestad
e93ae04452
Merge from upstream.
2012-03-14 00:00:15 +01:00
Bård Skaflestad
7e74da8021
Account for explicit flux BCs during flux calculation.
2012-03-13 23:35:26 +01:00
Bård Skaflestad
81f3c31392
Account for compressed BC representation during flux calculation.
2012-03-13 23:28:43 +01:00
Bård Skaflestad
11671f0cad
Assemble flux boundary conditions into system of linear equations.
...
A few restrictions apply:
* The bc->value is interpreted as an inflow *into* the connecting
cell. Outflow conditions must be specified using a negative
sign.
* We do not currently support general total flux conditions
(necessitates the introduction of additional degrees of freedom),
so bc->cond_pos[i+1]-bc->cond_pos[i] must be one (1) for all
BC_FLUX_TOTVOL conditions.
2012-03-13 21:00:51 +01:00
Atgeirr Flø Rasmussen
f72fdf1914
Added computeSaturatedVol() and computeInjectedProduced() functions.
2012-03-13 15:56:52 +01:00
Bård Skaflestad
47a3af5cfd
Rename confusing variable to promote better understanding.
2012-03-13 14:48:09 +01:00
Bård Skaflestad
89aaf3dea2
Refactor transmissibility reference during Dirichlet BC assembly.
2012-03-13 14:43:56 +01:00
Bård Skaflestad
427a2e6712
Take gravity into effect when assembling Dirichlet boundary conditions.
2012-03-13 14:42:38 +01:00
Bård Skaflestad
29ba859a80
Re-implement computeTotalMobilityOmega() in terms of computePhaseMobilities().
2012-03-12 16:18:02 +01:00
Bård Skaflestad
c4f803fedd
Re-implement computeTotalMobility() in terms of computePhaseMobilities().
2012-03-12 16:09:26 +01:00
Bård Skaflestad
2ac5157148
Add utility for calculating all phase mobilities.
2012-03-12 16:03:29 +01:00
Atgeirr Flø Rasmussen
dfa5bda17d
Changed some function signatures to take const UnstructuredGrid& instead of ptr.
2012-03-12 13:44:05 +01:00
Atgeirr Flø Rasmussen
03200bbf37
Added computeTransportSource() function. Handling bdy fluxes in spu_2p.
2012-03-12 13:00:48 +01:00
Bård Skaflestad
5caa3eb3e8
Remove a useless explicit type conversion.
2012-03-12 09:59:30 +01:00
Bård Skaflestad
f06b5e3589
Move source term assembly out main loop.
2012-03-12 09:50:35 +01:00
Atgeirr Flø Rasmussen
38aaa867bb
Fixed indexing bug in findSideFaces().
2012-03-09 15:50:48 +01:00
Atgeirr Flø Rasmussen
8ac62545cf
Added default constructor.
2012-03-09 14:25:52 +01:00
Atgeirr Flø Rasmussen
100108b5ad
Added computeAverageSat() function.
2012-03-09 11:44:21 +01:00
Bård Skaflestad
4fc45dea82
Support variable number of physical grid dimensions (typically 2 or 3).
2012-03-09 08:56:28 +01:00
Bård Skaflestad
29fa476715
Use more traditional implementation of cartCoord().
2012-03-09 00:50:44 +01:00
Bård Skaflestad
501a1d9a51
findSideFaces(): Support grids that don't define an explicit global_cell.
...
Assume that global_cell==0 denotes the identity mapping (typically a
Cartesian grid).
2012-03-08 20:53:32 +01:00
Bård Skaflestad
52cda7cbb9
findSideFaces(): Generate initial 'ijk' that was (probably) intended.
...
The trick of eliding explicit initialisers can only be use to zero an
array (or structure), not to copy an arbitrary initialiser to all
elements of the array.
2012-03-08 20:51:17 +01:00
Atgeirr Flø Rasmussen
9263fa1f08
Issue warning instead of throwing if input requests compressible effects.
2012-03-08 15:25:36 +01:00
