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

1414 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
cadb370011 Remove disabled code. 2012-03-07 19:42:41 +01:00
Bård Skaflestad
ea2bf25d8f Don't #include flow_bc.h twice. 2012-03-07 19:40:35 +01:00
Bård Skaflestad
6bff141c93 Merge from upstream. 2012-03-07 19:18:57 +01:00
Bård Skaflestad
64f1112997 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
Bård Skaflestad
0d7b7f173f Ensure a valid face->boundary condition mapping before assembly. 2012-03-07 17:54:12 +01:00
Atgeirr Flø Rasmussen
be892f5059 Follow change to IncompTpfa (adding BCs). 2012-03-07 09:33:28 +01:00
Atgeirr Flø Rasmussen
3137a477e5 IncompTpfa::solve() now accepts boundary conditions. 2012-03-07 09:32:56 +01:00
Atgeirr Flø Rasmussen
d0afc1f8e4 Made bc argument const. 2012-03-07 09:32:02 +01:00
Atgeirr Flø Rasmussen
23a890d841 Added FlowBCManager class. 2012-03-07 09:18:44 +01:00
Atgeirr Flø Rasmussen
158f2c2513 Minor typo fix. 2012-03-07 09:15:34 +01:00
Atgeirr Flø Rasmussen
23decbddd0 Update for new treatment of driving forces in tpfa/ifs* functions. 2012-03-07 08:18:04 +01:00
Bård Skaflestad
3721e57ecb Merge from upstream. 2012-03-07 01:18:55 +01:00
Bård Skaflestad
4c27f8dcd7 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
Atgeirr Flø Rasmussen
046e9b1f2f Merge. 2012-03-06 22:55:59 +01:00
Atgeirr Flø Rasmussen
c9d3cb86ea Added (commented out) experimental code. 
Experiment consists of trying to solve first in cells where all upstream
cells have been updated. Did not seem to change much.
 2012-03-06 22:55:47 +01:00
Atgeirr Flø Rasmussen
e33c204832 Pass tol and maxit to column solver, clean up a scenario message and reindent. 2012-03-06 22:33:19 +01:00
Atgeirr Flø Rasmussen
763ba0d438 Bug fixed, column solver now seems to work. Made max # iters and tolerance user-controllable. 2012-03-06 22:31:56 +01:00
Bård Skaflestad
f54a6c0979 Merge from upstream. 2012-03-06 21:41:33 +01:00
Bård Skaflestad
7323243015 Catch up to recent changes in boundary condition representation. 
Specifically, accommodate the sparse BC representation introduced in
change-set 30f12a392a03.
 2012-03-06 21:40:16 +01:00
Bård Skaflestad
e669a162cd Catch up to recent changes in underlying C-implementation. 
Specifically: Update boundary condition handling to incorporate the
sparse representation introduced in change-set 30f12a392a03.
Furthermore, catch up to ifs_tpfa_assemble() now accepting a general
"force" parameter (currently containing sources only) as introduced in
change-set 6c2b5de8faaa.
 2012-03-06 21:30:02 +01:00
Bård Skaflestad
f52aad24e2 Adjust to new semantics of "struct FlowBoundaryCondtions". 
We may now pass "NULL" if there are no active (flow) boundary conditions.
 2012-03-06 20:08:34 +01:00
Bård Skaflestad
69bc8e16d6 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
Kjetil Olsen Lye
f6e26672fc Added 3rd scenario to spu_2p: Top heavy, bottom light 2012-03-06 16:37:49 +01:00
Xavier Raynaud
ab93403b18 Minor bug. 2012-03-06 15:58:30 +01:00
Atgeirr Flø Rasmussen
941bd814f0 Fix minor typo. 2012-03-06 15:10:21 +01:00
Bård Skaflestad
7149d10cb2 Start encapsulating ifs_tpfa driving forces into a managing structure. 2012-03-06 14:00:34 +01:00
Atgeirr Flø Rasmussen
4f9095a543 Added WellsManager class (untested). 2012-03-06 13:59:51 +01:00
Xavier Raynaud
da5f2e0023 Fixed PLYMAX. 2012-03-05 15:09:45 +01:00
Xavier Raynaud
9cf4442383 Keyword POLYMER acknowledged. 2012-03-05 11:59:49 +01:00
Bård Skaflestad
f4b459dde4 Merge from upstream. 2012-03-02 19:09:06 +01:00
Bård Skaflestad
a82b1062ab Clarify a few other allocation-related comments. 2012-03-02 19:05:03 +01:00
Bård Skaflestad
ef83b4f829 Explicitly relinquish resources from processed_grid conveyed onto the UnstructuredGrid. 
This enables calling free_processed_grid() at the end of preprocess(),
whence all resources allocated in process_grdecl() and present in the
processed_grid can be properly disposed of, even in case of extending
the processed_grid structure.
 2012-03-02 19:00:59 +01:00
Bård Skaflestad
dc2974e8f0 Remove several instances of end-of-line whitespace. 2012-03-02 17:48:32 +01:00
Bård Skaflestad
fb7ca8a91d Don't attempt to allocate_geometry() if we fail to construct cell topology. 2012-03-02 17:43:48 +01:00
Bård Skaflestad
da19df122f Don't generate out-of-bounds ACTNUM references when inspecting ZCORN monotonicity. 
The C parsing rules (effectively) impose a "maximal munch" strategy.
When iterating over the cell-nodes (i.e., ZCORN), the coordinate map
integer division *must* apply to the iterators and not to a product of
the form N*it.  Enforce this interpretation by explicit parentheses.
 2012-03-02 17:42:26 +01:00
Bård Skaflestad
833182329f Add documentation to substantiate that preprocess() does not leak. 2012-03-02 15:07:55 +01:00
Bård Skaflestad
1a4367587f Initialise ->global_cell prior to allocating memory for geometry. 
This prevents freeing a random pointer in case of geometry allocation
failure.
 2012-03-02 14:04:44 +01:00
Atgeirr Flø Rasmussen
e5802e0532 Added optional column segregation solver (parameter "use_column_solver"). 2012-03-02 13:55:54 +01:00
Atgeirr Flø Rasmussen
dc80e2a38f Added Newton iterations to column solver. 2012-03-02 13:45:33 +01:00
Atgeirr Flø Rasmussen
560cb08313 Added initial version of column-based gravity segregation solver. 2012-03-02 13:20:46 +01:00
Atgeirr Flø Rasmussen
cac47830ed Made column extractor work also if grid.global_cell is null. 2012-03-02 13:18:49 +01:00
Atgeirr Flø Rasmussen
14a8990d15 Added missing #include. 2012-03-01 21:24:09 +01:00
Atgeirr Flø Rasmussen
320ec554db Removed unused variable. 2012-03-01 21:19:46 +01:00
Kjetil Olsen Lye
e91f29d349 Corrected Makefile to reflect the newly deleted files 2012-03-01 16:27:53 +01:00
Kjetil Olsen Lye
551accd08d Fixed documentation for extractColumn 2012-03-01 16:24:44 +01:00
Kjetil Olsen Lye
90c5929d00 Removed to newly created, unused files 2012-03-01 16:21:58 +01:00
Kjetil Olsen Lye
ef93d66d96 Added lapack linking for test_lapack 2012-03-01 16:20:11 +01:00
Kjetil Olsen Lye
617e786270 merge 2012-03-01 16:15:23 +01:00
Kjetil Olsen Lye
6a0df4a752 Correct column extract 2012-03-01 16:15:02 +01:00
Bård Skaflestad
f6470f3319 Put _SOURCES ahead of per-target _LDADD. 
Forgotten in change-set 5eaff819c9e4.
 2012-03-01 15:31:46 +01:00