Atgeirr Flø Rasmussen
3f683e607e
Added RockCompressibility class.
2012-03-19 13:55:26 +01:00
Bård Skaflestad
049f02e1df
solve(rock_comp): Replace manual index search with csrmatrix_elm_index().
2012-03-19 13:55:21 +01:00
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
Atgeirr Flø Rasmussen
6a6c039d8f
Added parameter 'output_interval'.
2012-03-15 15:10:09 +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
b227b7e954
Add reporting of adsorbed polymer. Buggy, do not trust yet.
2012-03-14 16:03:28 +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
97cd0ffa73
Added polymer reporting to mass balances. Not with absorbed polymer yet.
2012-03-14 14:03:47 +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
48d0fdf0ba
Added comment.
2012-03-14 13:07:40 +01:00
Atgeirr Flø Rasmussen
5cd19e6dfa
Amount injected now defaults to max given by polymer properties.
2012-03-14 13:05:39 +01:00
Atgeirr Flø Rasmussen
46cc14a308
More changes for feature parity with spu_2p.
2012-03-14 12:52:38 +01:00
Atgeirr Flø Rasmussen
d98b83bd3d
Moved Watercut class to miscUtilities.hpp.
2012-03-14 12:47:01 +01:00
Atgeirr Flø Rasmussen
ae172597e0
Untabify again.
2012-03-14 11:19:47 +01:00
Atgeirr Flø Rasmussen
d8f39c747c
Adding features from opm-core/examples/spu_2p.cpp.
2012-03-14 11:19:05 +01:00
Atgeirr Flø Rasmussen
120055dc94
Untabify.
2012-03-14 10:40:05 +01:00
Atgeirr Flø Rasmussen
393807b165
Minor #include changes.
2012-03-14 10:39:43 +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
938640f180
Catch up to interface change of writeVtkData().
...
OPM-Core change-set 57bac968c8a6 replaced UnstructuredGrid pointers
with the corresponding (const) references.
2012-03-14 09:11:32 +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