Commit Graph

2603 Commits

Author SHA1 Message Date
Halvor M. Nilsen
1f0b08755c bska fixed integer overflow in malloc call
Signed-off-by: Bård Skaflestad <Bard.Skaflestad@sintef.no>
2012-06-26 18:43:01 +02:00
Bård Skaflestad
f2b111f504 Implement new, required field 'G.griddim'.
Signed-off-by: Bård Skaflestad <Bard.Skaflestad@sintef.no>
2012-06-26 18:43:01 +02:00
Jostein R. Natvig
5189046528 Separate build script and calling interface for processgrid. This enables simple Matlab postprocessing of output from C-code. This revision adds the 'griddim' field.
Signed-off-by: Bård Skaflestad <Bard.Skaflestad@sintef.no>
2012-06-26 18:43:01 +02:00
Jostein R. Natvig
f1ebf2e2cf Fix stupid typo.
Signed-off-by: Bård Skaflestad <Bard.Skaflestad@sintef.no>
2012-06-26 18:43:01 +02:00
Bård Skaflestad
ba347a9257 GCC 4.4 is perfectly fine. Don't bother using a non-default compiler that might not be available (or differently named) on another system.
Signed-off-by: Bård Skaflestad <Bard.Skaflestad@sintef.no>
2012-06-26 18:43:01 +02:00
Bård Skaflestad
691c3a3b7b By jrn's blessing, enable the alternative implementation of 'processgrid'. Also remove the existing implementation.
While here, assert copyright for 2011.

Signed-off-by: Bård Skaflestad <Bard.Skaflestad@sintef.no>
2012-06-26 18:43:00 +02:00
Bård Skaflestad
714e052822 Preserve parameter validity status in (nrhs == 2) case.
Signed-off-by: Bård Skaflestad <Bard.Skaflestad@sintef.no>
2012-06-26 18:43:00 +02:00
Bård Skaflestad
d78aae5276 The '.type' is supposed to be a cell array of strings, not a mere string. Update accordingly.
While here, infer the '.type' value from the function name rather than
  hard-coding 'processgrid'.

Signed-off-by: Bård Skaflestad <Bard.Skaflestad@sintef.no>
2012-06-26 18:43:00 +02:00
Bård Skaflestad
b23ad048a2 Suggest an alternative implementation of the 'processgrid' function. This, disabled, implementation follows a two-stage allocate+fill algorithm that is slightly easier to control in memory-tight environments. We still have to maintain two copies of the grid, though.
Signed-off-by: Bård Skaflestad <Bard.Skaflestad@sintef.no>
2012-06-26 18:43:00 +02:00
Bård Skaflestad
fbe8157332 Export the cell-face tags (i.e., cells.faces(:,2)) back to M in a manner consistent with the traditional semantics of the grid_structure.
Signed-off-by: Bård Skaflestad <Bard.Skaflestad@sintef.no>
2012-06-26 18:43:00 +02:00
Jostein R. Natvig
a566bc8346 Comment.
Signed-off-by: Bård Skaflestad <Bard.Skaflestad@sintef.no>
2012-06-26 18:43:00 +02:00
Bård Skaflestad
5d4e216cec Anchor Doxygen comments to current line.
Existing mark-up (/** ... */) would erroneously apply the documentation
of one field to the one below.  Using /**< ... */ avoids this problem.

Found by reading the Doxygen manual more carefully...
2012-06-26 11:44:30 +02:00
Roland Kaufmann
27a450405b Convert ignore file from Mercurial to Git 2012-06-25 23:22:22 +02:00
Roland Kaufmann
d879c7e2f9 Remove superfluous tags file 2012-06-25 23:22:22 +02:00
Bård Skaflestad
e90e71ef6a Add stub documentation of public interfaces.
Typical usage process is not discussed.
2012-06-25 01:15:57 +02:00
Bård Skaflestad
dbde5af7e4 Document module and routines relating to per-cell contributions.
Per-well contributions and pressure/flux reconstruction remain.
2012-06-25 00:57:36 +02:00
Bård Skaflestad
6e8df003f1 Document the obsolescent well representation.
It is still in use by the hybridised pressure solvers.
2012-06-25 00:55:50 +02:00
Bård Skaflestad
bfaf6e0b87 Document public interface of common FSH module. 2012-06-24 16:50:16 +02:00
Bård Skaflestad
14f9faa011 Add Doxygen-style documentation to all interfaces. 2012-06-24 03:59:18 +02:00
Bård Skaflestad
c176893e97 Reference public header from canonical location. 2012-06-22 19:44:26 +02:00
Bård Skaflestad
94580a9b5f Annotate preprocessor conditional for readability. 2012-06-22 19:43:22 +02:00
Bård Skaflestad
f362036e17 Reference public header from canonical location in !MEX case. 2012-06-22 19:42:07 +02:00
Bård Skaflestad
f77a7c19ae Reference module headers from canonical location. 2012-06-22 19:39:52 +02:00
Bård Skaflestad
7946509f6c Reference public header from canonical location. 2012-06-22 19:37:51 +02:00
Bård Skaflestad
25cc61d481 Reference <ErrorMacros.hpp> from canonical location. 2012-06-22 19:35:19 +02:00
Bård Skaflestad
c5ed1cae04 Reference headers from canonical locations. 2012-06-22 19:33:36 +02:00
Bård Skaflestad
d7b7a930ac Reference class header from canonical position. 2012-06-22 19:32:18 +02:00
Bård Skaflestad
46389f85e3 Insert another <CODE></CODE> pair that was missing. 2012-06-22 15:44:39 +02:00
Bård Skaflestad
13738e32fe Merge from upstream. 2012-06-22 15:41:37 +02:00
Bård Skaflestad
c155c221e9 Refine description of csrmatrix_new_elms_pushback()
While here, tighten the distinction between <CODE> and non-<CODE>
mark-up.
2012-06-22 15:37:50 +02:00
Bård Skaflestad
484bd7a92e Use canonical include path to reference header. 2012-06-22 10:17:34 +02:00
Bård Skaflestad
27abf3f740 Re-wrap Doxygen comments introduced in cset 6d9f8b35dd4e. 2012-06-22 02:07:02 +02:00
Bård Skaflestad
47a8aab621 Document sparse matrix interface. 2012-06-22 02:03:41 +02:00
Halvor M. Nilsen
dedac2d493 Mearge from upstream 2012-06-20 13:11:46 +02:00
Halvor M. Nilsen
20318826c8 Changed default for relperm to not set. 2012-06-20 13:11:13 +02:00
Bård Skaflestad
4f4439a854 Restore a blank line that was lost in an earlier cset. 2012-06-20 00:38:47 +02:00
Bård Skaflestad
fbefe5d854 Replace all <tab>s by (8) spaces. 2012-06-20 00:04:48 +02:00
Bård Skaflestad
e0d33d6d71 Ignore additional auto-generated files
These pertain particularly to the ECLIPSE IDE with the Autotools plugin
2012-06-19 21:56:53 +02:00
Bård Skaflestad
54e908ff75 Replace all <tab>s by (8) spaces. 2012-06-19 20:37:35 +02:00
Bård Skaflestad
3383100690 Slight normalisation and clean-up of coding style.
Notably:
  * Replace all remaining <tab>s with (8) spaces.
  * Use post-increment for all counters.
  * Insert a number of blank lines to highlight important groups.
2012-06-19 18:37:26 +02:00
Halvor M. Nilsen
f31bbf5b48 Merge from upstream 2012-06-19 13:38:51 +02:00
Halvor M. Nilsen
4eb1457c61 Added inizialization of ok, which correct error for solves without wells. The only thing which is check is if the well object have incompressible form. 2012-06-19 13:37:22 +02:00
Bård Skaflestad
6cf71b3ba4 Prune an unused header. 2012-06-19 09:34:34 +02:00
Bård Skaflestad
9133e73a33 *Control::mode(): Defer control-mode look-up to std::map. 2012-06-19 00:30:32 +02:00
Bård Skaflestad
f300a9736e Sort includes. 2012-06-19 00:01:30 +02:00
Bård Skaflestad
149e1952a5 *Control::mode(): Defer keyword look-up to std::find() algorithm.
This is simpler than implementing our own version of the same.
2012-06-18 15:21:27 +02:00
Bård Skaflestad
a913bfffe9 Document add_well()s "name" parameter.
Forgotten in cset 728302a69229.
2012-06-18 10:18:14 +02:00
Bård Skaflestad
0156c2d4f9 Dispose of "Wells" object at end of simulation.
Discovered by valgrind.
2012-06-18 10:16:28 +02:00
Bård Skaflestad
b8a6a14747 Add support for storing well names in "Wells" structure.
The well name must be passed as a parameter to add_well(), so update
callers accordingly.
2012-06-18 10:15:53 +02:00
Bård Skaflestad
0abd570864 Sort _SOURCES and _HEADERS.
No functional change.
2012-06-16 19:18:04 +02:00