Commit Graph

80 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
bae286e000 Added computeSaturatedVol() and computeInjectedProduced() functions. 2012-03-13 15:56:52 +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
Atgeirr Flø Rasmussen
2132b0ed79 Added class SimulatorTimer. 2012-03-12 16:05:59 +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
Atgeirr Flø Rasmussen
abc03de73c Added computeAverageSat() function. 2012-03-09 11:44:21 +01:00
Bård Skaflestad
ac18454902 Merge from upstream. 2012-03-08 18:47:37 +01:00
Bård Skaflestad
47ae9a454d Add comments to summarise the two main blocks of fill_cell_topology(). 2012-03-08 18:18:28 +01:00
Atgeirr Flø Rasmussen
2a9296bdc2 Merge. 2012-03-08 15:05:48 +01:00
Atgeirr Flø Rasmussen
00ed7b1650 Preprocessing accepts a null pointer for actnum. 2012-03-08 15:04:51 +01:00
Bård Skaflestad
262ae9146d Whitespace adjustment. No functional changes. 2012-03-08 14:14:20 +01:00
Bård Skaflestad
41f00e955c Remove obsolete comment. 2012-03-08 14:13:42 +01:00
Atgeirr Flø Rasmussen
4fb4580948 Changed forward declaration of 'class UnstructuredGrid' to 'struct UnstructuredGrid'. 2012-03-08 12:28:22 +01:00
Atgeirr Flø Rasmussen
941bd814f0 Fix minor typo. 2012-03-06 15:10:21 +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
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
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
2bc15fb31b Generate 2D normals of length equal to face area. 2012-02-27 10:09:06 +01:00
Bård Skaflestad
53f05d3eab Don't assume that num_phases==2 when calculating total mobility. 2012-02-27 10:07:00 +01:00
Atgeirr Flø Rasmussen
8a0d5728a8 Moved simulator utility functions to opm/core/utility/miscUtilities.hpp.
We want to avoid having hundreds of files with a single function, therefore
these functions have been lumped together. With time, a more sophisticated
organization of such free functions may be in order.
2012-02-26 21:05:19 +01:00
Atgeirr Flø Rasmussen
ccda9308ce Proper vtk output of multicomponent fields (i.e. saturation, velocity). 2012-02-25 22:36:07 +01:00
Xavier Raynaud
e36c5bd46f Decrease tolerance requirement for x1-x0 in modifiedregularFalsi 2012-02-24 17:17:05 +01:00
Bård Skaflestad
203a384324 Merge from upstream. 2012-02-22 23:53:34 +01:00
Bård Skaflestad
9f74500a9f Generate 3D normals of length equal to face area. 2012-02-22 01:58:45 +01:00
Bård Skaflestad
4c5f982811 Add support for variable top-node depths in 3D tensor grid. 2012-02-22 01:56:24 +01:00
Atgeirr Flø Rasmussen
4839b56e98 Remove #include "config.h".
- Since many other files don't.
  - We may want to establish a policy on this, that works with CMake.
An alternative (not chosen) could have been to wrap the #include in
#ifdef HAVE_CONFIG_H etc.
2012-02-21 13:53:54 +01:00
Atgeirr Flø Rasmussen
f1502b722b Renamed function that was already renamed in header. 2012-02-19 21:31:58 +01:00
Atgeirr Flø Rasmussen
0395d7725e Moved writeVtkData() functions to utility/, added a test program. 2012-02-19 21:24:59 +01:00
Bård Skaflestad
a3a45519a2 Fill_geometry_3d(): Support tensor product of variable cell sizes.
Also: Re-implement create_hexa_grid_3d() in terms of
create_tensor_grid_3d().
2012-02-18 00:36:37 +01:00
Bård Skaflestad
e6649ad25d Remove two instances of EOL whitespace. 2012-02-16 02:19:10 +01:00
Bård Skaflestad
eb86ac92ad Use a sane definition of areas and volumes in 2D tensor grid. 2012-02-16 02:12:49 +01:00
Bård Skaflestad
911ce3b145 Fill_geometry_2d(): Support tensor product of variable cell sizes.
Also: Re-implement create_cart_grid_2d() in terms of
create_tensor_grid_2d().
2012-02-16 01:58:57 +01:00
Bård Skaflestad
a609175f79 Change grid creation semantics: Return NULL in case of allocation failure.
Let caller handle out of memory conditions.  We are in no business to
enforce a particular failure handling policy.
2012-02-16 01:12:46 +01:00
Bård Skaflestad
ddfcd4a1e3 Extract Cartesian dimensions from grid when filling topology/geometry.
The dimensions are already set in the grid structure during allocation.
2012-02-16 01:04:35 +01:00
Bård Skaflestad
3a004d21ac Include <gridinterface.h> for free_grid(), compute_geometry() and preprocess(). 2012-02-10 14:12:19 +01:00
Atgeirr Flø Rasmussen
909007942e Re-added necessary include files. 2012-02-09 23:14:50 +01:00
Atgeirr Flø Rasmussen
ba13070a74 Added new function create_hexa_grid_3d(). 2012-02-08 15:00:56 +01:00
Bård Skaflestad
2de58be3fd Fix code on platforms for which sizeof(double)!=sizeof(double*). 2012-02-06 12:52:41 +01:00
Bård Skaflestad
32f5ae1030 Implement basic memory management for new well interface.
Hook up to build, but actual location is likely to change...
2012-02-03 21:35:19 +01:00
Jostein R. Natvig
9def4966cc Remove old function "create_cart_grid", please use "create_cart_grid_3d". 2012-02-03 10:56:28 +01:00
Atgeirr Flø Rasmussen
3c3db99076 Include necessary header for free_grid(). 2012-02-01 15:57:02 +01:00
Jostein R. Natvig
7439640098 Unify grid destructors: new common function is called free_grid(...). 2012-02-01 15:45:13 +01:00