OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-22 07:23:27 -06:00
Code Issues Packages Projects Releases Wiki Activity
766 Commits 24 Branches 102 Tags 84 MiB
22372710b8
Commit Graph

152 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
07b04825fd Fix bug related to arithmetic if operator ( ? : ). 2012-05-16 14:15:50 +02:00
Atgeirr Flø Rasmussen
a6c71288aa Merged. 2012-05-16 12:55:05 +02:00
Bård Skaflestad
83274c4027 compute_cell_contrib(): Advance derivative pointer for each connection. 
Failing to do this operation resulted in incorrect matrices in cases
with anisotropic tensors and/or non-cube cells.  The error has been
present since the inception of this implementation.
 2012-05-15 14:34:56 +02:00
Atgeirr Flø Rasmussen
27eecd954e Added preliminary sketch of compressible tpfa solver. 
This solver is:
 - using the residual based assembler,
 - aiming to include the nonlinear Newton iterations
   (therefore also the (re-)evaluation of fluid data).
 2012-05-14 10:53:50 +02:00
Atgeirr Flø Rasmussen
8b27b4a05d Minor doc update. 2012-05-11 15:10:02 +02:00
Atgeirr Flø Rasmussen
0a2c9ff000 Update doc. 2012-05-11 13:02:48 +02:00
Bård Skaflestad
a865f01478 comprock_increment(): Don't proceed to mult_csr() unless OK. 2012-05-10 22:29:41 +02:00
Atgeirr Flø Rasmussen
a4b32311b2 Fix indexing bug in well handling code for incremental (Newton) pressure assembly. 2012-05-10 15:31:51 +02:00
Kjetil Olsen Lye
10b738c7e3 Merge. 2012-05-10 12:50:22 +02:00
Xavier Raynaud
8842943794 Make compressible pressure solver compatible with well management. 2012-05-10 12:38:29 +02:00
Kjetil Olsen Lye
f24d286f18 Added error handling to pressure solver. 2012-05-10 09:55:34 +02:00
Bård Skaflestad
0cd6a0a0c6 Realign pointer offsets to provide additional visual cues. 2012-05-09 22:39:28 +02:00
Bård Skaflestad
9809afb3a8 Whitespace adjustment. No functional changes. 2012-05-09 19:21:52 +02:00
Bård Skaflestad
56802231ce Re-align variable declarations various assemble*() methods. 2012-05-09 19:21:00 +02:00
Bård Skaflestad
97ed64f438 Call malloc() once, at pimpl construction time, rather than in each *_increment(). 
It's slightly wasteful, however.  Maybe we can just reuse h->x for the
mult_csr_matrix() output?
 2012-05-09 19:15:41 +02:00
Bård Skaflestad
00b1ce27f0 Follow file conventions in mult_csr_matrix(). 2012-05-09 19:07:59 +02:00
Bård Skaflestad
323914eaba Don't expose a (presently) internal function. 2012-05-09 18:58:17 +02:00
Bård Skaflestad
d23c93e661 Merge from upstream. 2012-05-09 18:56:09 +02:00
Bård Skaflestad
6a7c6cfeb0 Convert Residual-based solver to conventions of <newwells.h>. 
Almost a mechanical translation.
 2012-05-09 16:26:41 +02:00
Xavier Raynaud
1892f80af2 merge 2012-05-09 15:15:13 +02:00
Xavier Raynaud
f7e2d88fd9 Added Newton compressible fluid solver. 2012-05-09 15:06:13 +02:00
Kjetil Olsen Lye
b5d474beca Added failure checking for solve method. 2012-05-09 11:28:56 +02:00
Atgeirr Flø Rasmussen
962a3b6445 Added shut well support to ifs_tpfa. 
This was done using the convention that for a well w in W,
    W.ctrls[w]->current < 0
means that it should be treated as shut. This allows us to keep the matrix
structure related to wells constant, without needing to remake it when wells
shut or open.
 2012-05-04 08:15:06 +02:00
Atgeirr Flø Rasmussen
8b33bd261d Remove unused variable. 2012-05-03 13:32:30 +02:00
Atgeirr Flø Rasmussen
88a24ef839 Verify that RESERVOIR_RATE controlled wells have specified total rate. 2012-04-26 15:03:55 +02:00
Atgeirr Flø Rasmussen
6d4f0fe293 Updated pressure solver after changes to well data structure. 2012-04-26 14:49:25 +02:00
Atgeirr Flø Rasmussen
b107180272 Added ifs_tpfa_assemble_comprock() to handle compressible rock cases. 
This allows us to remove the hack from IncompTpfa.cpp.
 2012-04-25 15:00:28 +02:00
Atgeirr Flø Rasmussen
3b09776355 Added fixes and assertions suggested by static analysis. 2012-04-23 13:28:18 +02:00
Atgeirr Flø Rasmussen
605933abba Pretty-formatting only. 2012-04-19 15:33:25 +02:00
Kjetil Olsen Lye
3058e26447 merge 2012-04-13 13:20:36 +02:00
Bård Skaflestad
6a5534ae2e Pass correctly sized well-rate solution vectors to ifs_tpfa_press_flux(). 
The function computes a total flux at each perforation (connection), not
just one total flux per well.  Update documentation accordingly.
 2012-04-12 20:27:29 +02:00
Kjetil Olsen Lye
74fc0a5c25 Made a (possibly wrong) adjustment to well_controls_append. Each control now has its current index set to 0, as there's only supposed to be one control per well. 2012-04-12 18:47:06 +02:00
Xavier Raynaud
4b193f34ec Added Latex format in documentation. 2012-04-12 18:13:57 +02:00
Kjetil Olsen Lye
7c21765100 Made a computeWDP-function 2012-04-12 17:50:51 +02:00
Kjetil Olsen Lye
6756d6b6c3 Made us of wells output arguments in IncompTpfa 2012-04-12 16:39:12 +02:00
Kjetil Olsen Lye
ee736d8071 Made IncompTpfa receive wells-output-arguments 2012-04-12 16:36:08 +02:00
Kjetil Olsen Lye
a9dfab1b37 Fixed namespacing issue 2012-04-10 14:47:29 +02:00
Atgeirr Flø Rasmussen
c961f8e7d2 Suppressed multiple warnings. 2012-03-28 11:56:20 +02:00
Bård Skaflestad
1a873633c1 Implement solution recovery from wells (BHP and perf. fluxes) 
Contingent upon passing non-NULL well_press and well_flux pointers in
the solution structure.  The forces must be the same as the ones used
in assembling the system of linear equations.
 2012-03-21 11:54:34 +01:00
Bård Skaflestad
7988921f21 ifs_tpfa: Prepare for well solution recovery (BHP and perf. fluxes). 
Expose new elements '.well_press' and '.well_flux' in the solution
structure and update callers accordingly.
 2012-03-21 11:08:56 +01:00
Bård Skaflestad
18cdd5f1e3 Assemble_bhp_well(): Don't look up wdof diagonal element multiple times. 2012-03-21 10:59:21 +01:00
Bård Skaflestad
af80492ff3 Assemble_rate_well(): Don't look up wdof diagonal element multiple times. 2012-03-21 10:48:58 +01:00
Bård Skaflestad
de44295f32 Implement RESV constraint assembly. 2012-03-20 23:17:52 +01:00
Bård Skaflestad
1492d9b665 Delete trailing whitespace. 2012-03-20 22:46:38 +01:00
Bård Skaflestad
e41b786c16 Assemble_bhp_well(): Remove unused variable. 2012-03-20 22:45:28 +01:00
Bård Skaflestad
2085a381f3 Merge from upstream. 2012-03-20 19:34:30 +01:00
Bård Skaflestad
e04b48f05e Assemble BHP-type wells into system of linear equations. 
All wells are represented, but BHP wells get trivial equations
(n*p=n*target).  While here, stub out RESV assembly process.

BHP and perforation flux recovery is unimplemented at this time.
 2012-03-20 19:32:35 +01:00
Bård Skaflestad
e76e224de8 Revert to original (fractional flow) model of perforation fluxes. 2012-03-20 18:46:54 +01:00
Bård Skaflestad
27271b57b5 Pass number of fluid phases along with well data. 
Needed to properly index into Wdata->phasemob.  Update callers
accordingly.
 2012-03-20 15:43:25 +01:00
Atgeirr Flø Rasmussen
6688ea1031 Make comments relating to omega (frac.flow-weighted density) precise. 2012-03-20 14:21:22 +01:00
Bård Skaflestad
60a9bee4ac Declare well support in ifs_tpfa module. Currently not implemented. 
Update callers accordingly.
 2012-03-20 13:39:34 +01:00
Atgeirr Flø Rasmussen
39e55a34cf Merged. 2012-03-20 12:12:21 +01:00
Atgeirr Flø Rasmussen
07c4938e00 Compensate for matrix adjustment in rock comp case. 2012-03-20 12:05:59 +01:00
Bård Skaflestad
433485c4f9 Solve(rock_comp): Refactor rock-compressibility diagonal term calculation. 2012-03-20 11:21:02 +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
Bård Skaflestad
e8712565a8 ifs_tpfa_assemble(): Coalesce external forces into single branch. 2012-03-16 14:30:13 +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
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
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
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
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
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
c68ccff998 Handle flow_conditions_construct(0) correctly. 2012-03-08 15:24:50 +01:00
Atgeirr Flø Rasmussen
c27e881c1a Added methods pressureSide() and fluxSide(). 2012-03-08 13:48:26 +01:00
Bård Skaflestad
cb6d72cfd3 Remove disabled code. 2012-03-07 19:42:41 +01:00
Bård Skaflestad
8fd3a6e079 Don't #include flow_bc.h twice. 2012-03-07 19:40:35 +01:00
Bård Skaflestad
a8df219344 Merge from upstream. 2012-03-07 19:18:57 +01:00
Bård Skaflestad
7bc5ef229a Enable further compression of boundary conditions. 
Specifically, refine the representation to allow a boundary condition
to apply to a set of interfaces rather than just a single face.  This
support is realised by the introduction of new interface
flow_conditions_append_multi().

Update all consumers of struct FlowBoundaryConditions to accommodate
the one-to-many boundary condition interface mapping in the process.
 2012-03-07 19:08:14 +01:00
Atgeirr Flø Rasmussen
9a0c454687 IncompTpfa::solve() now accepts boundary conditions. 2012-03-07 09:32:56 +01:00
Atgeirr Flø Rasmussen
b37681be43 Made bc argument const. 2012-03-07 09:32:02 +01:00
Atgeirr Flø Rasmussen
649e9aa639 Added FlowBCManager class. 2012-03-07 09:18:44 +01:00
Bård Skaflestad
85144a9291 Add tentative support for pressure boundary conditions in IncompTPFA. 
Not enabled in C++ glue layer (presently assumes no boundary conditions).
 2012-03-07 01:18:03 +01:00
Bård Skaflestad
0a99364c27 Switch to a sparse/compressed boundary condition representation. 
Specifically, replace the existing flowbc_t (that was densely
represented on each interface, including internal interface and
external no-flow interfaces) with a new structure given by

    struct FlowBoundaryConditions

The semantics of this structure mirror those of "struct Wells" from
<opm/core/newwells.h>, but is currently mostly intended for simple,
incompressible flow purposes.

Update pressure solvers supporting boundary conditions to accommodate
the new boundary condition representation in the process.
 2012-03-06 20:07:35 +01:00
Bård Skaflestad
0d5431aaba Start encapsulating ifs_tpfa driving forces into a managing structure. 2012-03-06 14:00:34 +01:00
Kjetil Olsen Lye
d1e8525c4d merge 2012-02-27 17:47:55 +01:00
Kjetil Olsen Lye
c06401ef5b Fixed some warnings 2012-02-27 17:46:06 +01:00
Bård Skaflestad
a0598eae4a Expose internal half-transmissibility through read-only reference. 
Useful to initialise the Opm::ImplicitTransport<> solver with gravity
effects.
 2012-02-27 17:29:09 +01:00
Atgeirr Flø Rasmussen
87723a08a0 IncompTpfa now takes a linear solver as a constructor argument. 2012-02-21 21:45:04 +01:00
Atgeirr Flø Rasmussen
8f8baa62c8 Using LinearSolverUmfpack for the linear solver. 2012-02-21 21:32:11 +01:00
Atgeirr Flø Rasmussen
22bf83dda7 Bugfix: must always initialize gpress_omegaweighted_, even if no gravity. 2012-02-20 17:05:28 +01:00
Atgeirr Flø Rasmussen
2aac2255b5 Ensuring gravity feature is used consistently. 2012-02-20 13:39:40 +01:00
Atgeirr Flø Rasmussen
e5a7157bc3 Added class IncompTpfa. 2012-02-20 13:23:01 +01:00
Jostein R. Natvig
37296545a4 1) Move extra fields found in struct CornerpointGrid into struct UnstructuredGrid. 
2) Remove typedef grid_t
3) Remove struct CornerpointGrid.
4) handle fallout.
 2012-02-01 14:56:38 +01:00
Bård Skaflestad
e7e5d94628 Compute perforation fluxes (no gravity adjustments). 
Requires additional parameter 'pmobc' (phase mobilities per cell) in
public function cfs_tpfa_res_flux().
 2011-12-20 02:13:50 +01:00
Bård Skaflestad
99e5635af2 Impose outflow sign convention when assembling w->c contributions. 2011-12-19 14:09:27 +01:00
Bård Skaflestad
2b65e19c6f Only perform incompressible adjustment if there are no BHP wells. 2011-12-19 14:07:57 +01:00