Commit Graph

1423 Commits

Author SHA1 Message Date
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
Bård Skaflestad
f2df9fe123 Account for compressed BC representation during flux calculation. 2012-03-13 23:28:43 +01:00
Bård Skaflestad
436a7d666d 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
f72bac2432 Printing volume balance report, although somewhat messy. Writing watercut curve to file. 2012-03-13 15:58:09 +01:00
Atgeirr Flø Rasmussen
bae286e000 Added computeSaturatedVol() and computeInjectedProduced() functions. 2012-03-13 15:56:52 +01:00
Bård Skaflestad
4f7a84d630 Rename confusing variable to promote better understanding. 2012-03-13 14:48:09 +01:00
Bård Skaflestad
f00bd49292 Refactor transmissibility reference during Dirichlet BC assembly. 2012-03-13 14:43:56 +01:00
Bård Skaflestad
e727bf34e9 Take gravity into effect when assembling Dirichlet boundary conditions. 2012-03-13 14:42:38 +01:00
Atgeirr Flø Rasmussen
c8f542fc3f Added water-oil contact init (scenario 4), controllable from param or deck. 2012-03-13 11:41:11 +01:00
Atgeirr Flø Rasmussen
bf142b7eda Added warning for segregation scenario. 2012-03-12 17:29:42 +01:00
Atgeirr Flø Rasmussen
e2f00b66a4 Now using SimulatorTimer class (therefore supporting TSTEP). 2012-03-12 16:20:13 +01:00
Atgeirr Flø Rasmussen
87cad4ccff Added asserts and docs about methods that cannot be called if done(). 2012-03-12 16:19:41 +01:00
Bård Skaflestad
16a32142ff Re-implement computeTotalMobilityOmega() in terms of computePhaseMobilities(). 2012-03-12 16:18:02 +01:00
Bård Skaflestad
3a275748c0 Re-implement computeTotalMobility() in terms of computePhaseMobilities(). 2012-03-12 16:09:26 +01:00
Atgeirr Flø Rasmussen
2132b0ed79 Added class SimulatorTimer. 2012-03-12 16:05:59 +01:00
Bård Skaflestad
385ff36455 Add utility for calculating all phase mobilities. 2012-03-12 16:03:29 +01:00
Atgeirr Flø Rasmussen
f5ad161409 Changed some function signatures to take const UnstructuredGrid& instead of ptr. 2012-03-12 13:44:05 +01:00
Atgeirr Flø Rasmussen
dd85dc522c Added computeTransportSource() function. Handling bdy fluxes in spu_2p. 2012-03-12 13:00:48 +01:00
Bård Skaflestad
364b177237 Remove a useless explicit type conversion. 2012-03-12 09:59:30 +01:00
Bård Skaflestad
660dea787c Move source term assembly out main loop. 2012-03-12 09:50:35 +01:00
Atgeirr Flø Rasmussen
9c226c1b24 Simple well handling done (only simple rates -> src terms). 2012-03-09 15:51:17 +01:00
Atgeirr Flø Rasmussen
30acd08b61 Fixed indexing bug in findSideFaces(). 2012-03-09 15:50:48 +01:00
Atgeirr Flø Rasmussen
bac0b16c77 Initialising wells (unused for the moment). 2012-03-09 14:39:31 +01:00
Atgeirr Flø Rasmussen
59998f8aef Added default constructor. 2012-03-09 14:25:52 +01:00
Atgeirr Flø Rasmussen
33fbc02490 Fixed s_min/s_max bug in ad hoc fluid, improved saturation init, print average sat. 2012-03-09 11:47:32 +01:00
Atgeirr Flø Rasmussen
ce03532c15 Implemented capillary pressure derivatives. 2012-03-09 11:45:18 +01:00
Atgeirr Flø Rasmussen
abc03de73c Added computeAverageSat() function. 2012-03-09 11:44:21 +01:00
Bård Skaflestad
d3955b0a34 Support variable number of physical grid dimensions (typically 2 or 3). 2012-03-09 08:56:28 +01:00
Bård Skaflestad
ab438b94af Use more traditional implementation of cartCoord(). 2012-03-09 00:50:44 +01:00
Bård Skaflestad
61c1e69c58 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
94317cc02f 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
Bård Skaflestad
ac18454902 Merge from upstream. 2012-03-08 18:47:37 +01:00
Bård Skaflestad
47ae9a454d Add comments to summarise the two main blocks of fill_cell_topology(). 2012-03-08 18:18:28 +01:00
Atgeirr Flø Rasmussen
f919da439b Improved saturation initialization, new parameter 'init_sat'. 2012-03-08 15:54:24 +01:00
Atgeirr Flø Rasmussen
471d95c662 Max water sat set to always be 1.0. 2012-03-08 15:46:27 +01:00