Commit Graph

1436 Commits

Author SHA1 Message Date
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
Bård Skaflestad
ea73002a0d Sort executables and per-target _SOURCES. 2012-03-01 15:24:37 +01:00
Bård Skaflestad
a0862a6ee0 Untabify. 2012-03-01 15:22:26 +01:00
Atgeirr Flø Rasmussen
565430c2e9 Prettified. 2012-03-01 15:12:50 +01:00
Atgeirr Flø Rasmussen
c21299085e Remove unused variable. 2012-03-01 14:38:51 +01:00
Atgeirr Flø Rasmussen
f02e1e9ff7 Added interface and test for lapack tridiagonal solver. 2012-03-01 14:36:10 +01:00
Kjetil Olsen Lye
21d118959b merge 2012-03-01 14:24:11 +01:00
Kjetil Olsen Lye
83f8155271 added unit test for column extraction 2012-03-01 14:24:02 +01:00
Atgeirr Flø Rasmussen
c2a18bc7ca Added parameter "use_segregation_split", implemented using ImplicitTransport. 2012-03-01 10:32:58 +01:00
Kjetil Olsen Lye
e8543adddc Added column extraction for a vertically aligned grid 2012-03-01 09:46:18 +01:00
Bjørn Spjelkavik
896ab97a2e Changed a print statement 2012-02-29 11:46:01 +01:00
Kjetil Olsen Lye
cea5324e4e merge 2012-02-29 09:42:40 +01:00
Bård Skaflestad
b425045224 Remove unused parameter "grav" from computeStaticGravity().
Update callers accordingly, and remove a previously disabled call.
2012-02-28 11:08:57 +01:00
Bård Skaflestad
1e5569df7d Use more traditional half-face loop to calculate transmissibilities. 2012-02-28 11:07:08 +01:00
Kjetil Olsen Lye
4d529bc20a merge 2012-02-28 11:02:58 +01:00
Bård Skaflestad
8a2aff536f Start solver messages on new line following "Scenario" output. 2012-02-28 09:42:21 +01:00
Bård Skaflestad
9c00ad8fe9 Support non-integral Cartesian cell sizes. 2012-02-27 23:43:58 +01:00
Bård Skaflestad
3ea1a823c8 Inspect global Cartesian cell when determining scenario 2 "left" reservoir half.
Assume that c_grid()->global_cell==0 signifies identity mapping (i.e.,
global_cell[cell]==cell).
2012-02-27 20:04:16 +01:00
Bård Skaflestad
84aad52d81 Fix logic error in defining "left" reservoir half in scenario 2.
Specifically, we must map into 0..cd[0]-1 and not some other
interval.  Moreover, as the "i" index cycles the most rapidly in
lexicographical ordering, a simple first dimension modulus operator is
sufficient.

On the other hand, this code does assume lexicographical ordering of
the cells which may or may not be guaranteed by the grid constructor.
The Cartesian constructors observe this behaviour, but other
constructors may not...
2012-02-27 19:59:01 +01:00
Kjetil Olsen Lye
9bb8406efa merge 2012-02-27 17:47:55 +01:00
Kjetil Olsen Lye
b002871fe1 Fixed some warnings 2012-02-27 17:46:06 +01:00
Bård Skaflestad
363c6564d9 Fully initialise the transport model gravity contributions when using gravity.
This initialisation used to be a part of the model construction, but
was refactored out in change-set 86c734a0ba48 and must thus be called
separately.
2012-02-27 17:34:57 +01:00
Bård Skaflestad
52608367e0 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
Bård Skaflestad
6c49c47f2f Turn unit test program declaration into a (C) prototype. 2012-02-27 16:18:04 +01:00
Bård Skaflestad
d491b83526 Bring unit test up to date wrt removal of 'grid_t' typedef. 2012-02-27 16:17:17 +01:00
Bård Skaflestad
acc2f42df3 Sort executables and per-target variables. 2012-02-27 14:50:20 +01:00
Bjørn Spjelkavik
8aaa5f6257 Added test program for reading polymer keywords 2012-02-27 13:26:36 +01:00
Bård Skaflestad
7cd60d7f9c Suppress "unused parameter" warning in TLMIXPAR::convertToSI(). 2012-02-27 11:29:44 +01:00
Bjørn Spjelkavik
1263c2f50f Merge. 2012-02-27 11:16:41 +01:00