Commit Graph

837 Commits

Author SHA1 Message Date
Bård Skaflestad
20b0c8f83b Use have_boost_redef.hpp rather than direct override. 2012-07-12 14:36:36 +02:00
Bård Skaflestad
82369f9109 Add facility for overriding `HAVE_BOOST' from Dune.
This is, at best, a work-around for an issue that presents when
earlier versions of Autoconf (e.g., 2.59) are used to process Dune's
DUNE_BOOST_BASE macro (introduced in dune-common@6480,
dune-istl@1492).  For reasons I've been unable to determine, the
HAVE_BOOST symbol just gets #define-d, not set to `ENABLE_BOOST' as
was intended.  Some kind of race condition?

Anyway, the Dune ISTL module uses statements such as

   #if HAVE_BOOST
     /* ... */
   #endif

to determine if particular software features should be enabled.
This breaks down if `HAVE_BOOST' is simply defined.  Following
commit fb614100, the symbol `OPM_HAVE_BOOST' is always defined (as a
Boolean state), so if we override ISTL's notion of `HAVE_BOOST', the
above construction continues to work.

We will, however, happily remove thise kluge if a better solution
arises in the core Dune modules.
2012-07-12 14:20:59 +02:00
Andreas Lauser
6f69de969a opm-core: make it work nicely with clang 2012-07-05 12:42:49 +02:00
Bård Skaflestad
c2eaa97049 Add partial Doxygen markup to public interfaces.
More work needed.
2012-07-03 01:30:18 +02:00
Bård Skaflestad
1235b8ecbc Document public interface for transmissibility calculation. 2012-07-03 01:29:34 +02:00
Bård Skaflestad
8e436e174a Include missing headers. 2012-07-02 22:29:47 +02:00
Bård Skaflestad
02e715fe14 makefhfQPeriodic(): Use less branch'y implementation. 2012-07-02 19:09:58 +02:00
Bård Skaflestad
4c36b397fd EquilLine: Initialise all members in default constructor. 2012-07-02 18:30:56 +02:00
Bård Skaflestad
4ffd9198bf Initialise all members in default constructor. 2012-07-02 17:44:16 +02:00
Bård Skaflestad
95df9e5e2f WpolymerLine: Initialise all members in constructor. 2012-07-02 17:42:10 +02:00
Bård Skaflestad
2ef628233e WeltargLine: Initialise all members in constructor. 2012-07-02 17:32:37 +02:00
Bård Skaflestad
f2f0b95a1d WgrupconLine: Initialise all members in constructor. 2012-07-02 17:29:59 +02:00
Bård Skaflestad
f57ed8856d WelSpecsLine: Initialise all members in constructor 2012-07-02 17:22:48 +02:00
Bård Skaflestad
381d4651e6 Doxygenise class spu_2p::ModelParameterStorage
Mostly stub comments.
2012-07-02 14:58:59 +02:00
Bård Skaflestad
cda6c93724 Initialise all members in constructor. 2012-07-02 14:13:42 +02:00
Bård Skaflestad
8947ef569f Mark return values as \return rather than \ret.
Needed for Doxygen compliance.
2012-07-02 12:55:28 +02:00
Bård Skaflestad
be54b53cb5 Add stub documentation for hybsys_well_cellcontrib_symm().
Expansion and refinement needed.
2012-07-01 00:20:06 +02:00
Bård Skaflestad
c40ddf42d0 Document public interface hybsys_compute_press_flux_well().
Refinements are likely.
2012-06-30 00:21:43 +02:00
Bård Skaflestad
fae98697a6 Document public interface hybsys_compute_press_flux().
Likely to be refined at a later stage.
2012-06-29 23:44:40 +02:00
Bård Skaflestad
fed0117242 Document public interface of hybsys_cellcontrib_unsymm(). 2012-06-29 23:13:18 +02:00
Bård Skaflestad
70e763c8bd Document hybsys_cellcontrib_symm() public interface. 2012-06-29 19:27:35 +02:00
Bård Skaflestad
3da361f88e Document interface of hybsys_well_schur_comp_symm() 2012-06-29 14:52:21 +02:00
Bård Skaflestad
5424ddaf86 Fix inverted logic.
Symbol NDEBUG is *defined* in release mode.
2012-06-27 10:44:51 +02:00
Bård Skaflestad
8f0637b090 Merge branch 'master' of git@github.com:bska/opm-core.git 2012-06-26 21:34:23 +02:00
Bård Skaflestad
f2a2811325 Merge branch 'silence-geom-calc'
Conflicts:
	opm/core/grid/cpgpreprocess/geometry.c

Defer printing diagnostic message concerning negative cell volumes
until we're absolutely sure that the volume actually *is*
negative.  Since we're now accumulating signed volumes, some of
the initial contributions might be negative but the end result
likely won̈́'t be.

This merge also brings feature parity with the MATLAB Reservoir
Simulation Toolbox.
2012-06-26 21:04:08 +02:00
Bård Skaflestad
7d7f62ebc3 Merge branch 'preprocess-svn-reintegrate'
Conflicts:
	Makefile.am
	opm/core/grid/cpgpreprocess/facetopology.c
	opm/core/grid/cpgpreprocess/mxgrdecl.c
	opm/core/grid/cpgpreprocess/preprocess.c
	opm/core/grid/cpgpreprocess/sparsetable.c
	opm/core/grid/cpgpreprocess/sparsetable.h
	opm/core/grid/cpgpreprocess/uniquepoints.c

This merge brings a new, more resilient and feature-complete
corner-point processing.  In particular, the new code features
exact, in-plane vertex coordinates for face nodes that arise as a
result of fault processing and which are not located on pillars.
Secondly, the resulting grid's cells are ordered lexicographically
with the I index cycling the most rapidly, followed by J and
finally K.

Finally, this merge also brings automatic handling of left-handed
coordinate systems which, until now, have produced negative cell
volumes as a result of face vertices being ordered such that
interface normals point from cell 2 to cell 1 in this case.
Left-handed coordinate systems are recognised using a simplistic
triple-product characterisation akin to the implementation of
function "processGRDECL" of MRST.

This code is now an (almost) exact replica of revision 1001 of
https://public.ict.sintef.no/viewvc/openrs/trunk/dune-cornerpoint/grid/preprocess/

The merge also removes opm/core/grid/cpgpreprocess/readvector*, so
remove tests/test_readvector.cpp (and accompanying Make rule) to
maintain a buildable tree.
2012-06-26 19:52:21 +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
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