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

446 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Atgeirr Flø Rasmussen
00e87d36b9 Changed forward declaration of 'class UnstructuredGrid' to 'struct UnstructuredGrid'. 2012-03-08 12:28:22 +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
Atgeirr Flø Rasmussen
e3a3a1306b Minor typo fix. 2012-03-07 09:15:34 +01:00
Bård Skaflestad
8ca51c0ca4 Merge from upstream. 2012-03-07 01:18:55 +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