OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,287 Commits 9 Branches 35 Tags 15 MiB
c5c9f58a23
Commit Graph

1287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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