Commit Graph

3399 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
7f9a47d64c Use markup for parameter lists. 2013-03-22 11:09:38 +01:00
Atgeirr Flø Rasmussen
74b5e3f3a1 Use markdown for parameter lists. 2013-03-22 10:02:04 +01:00
Atgeirr Flø Rasmussen
27647fc7f2 Change doxygen syntax to use markdown. 2013-03-22 09:55:12 +01:00
Atgeirr Flø Rasmussen
bc40c0174a More minor doc fixes. 2013-03-22 09:45:00 +01:00
Atgeirr Flø Rasmussen
3f8ba3c1e5 Fix minor doc errors. 2013-03-22 09:26:45 +01:00
Atgeirr Flø Rasmussen
db1220eb60 Fix docs for IncompPropertiesBasic. 2013-03-22 09:26:27 +01:00
Atgeirr Flø Rasmussen
3c7594d4c0 Fix exclusion of TinyXML from doc generation. 2013-03-22 08:35:00 +01:00
Atgeirr Flø Rasmussen
22c46acbf0 Fix tinyxml exclusion. 2013-03-22 08:00:00 +01:00
Atgeirr Flø Rasmussen
de32025bff Merge remote-tracking branch 'upstream/release/2013.03' into doc-fixes 2013-03-21 22:33:09 +01:00
Bård Skaflestad
f3c79402d6 Merge pull request #217 from atgeirr/install-programs
Add programs to be installed.
2013-03-21 09:54:52 -07:00
Atgeirr Flø Rasmussen
f84fa2c4bd Moved the VAG code to namespace Opm. 2013-03-21 15:01:17 +01:00
Atgeirr Flø Rasmussen
e770b1a6b4 Moved MonotCubicInterpolator to Opm namespace.
Also minor doc fix.
2013-03-21 14:57:36 +01:00
Atgeirr Flø Rasmussen
584fa8bc48 Fixes and improvements to transport solver docs. 2013-03-21 14:52:21 +01:00
Atgeirr Flø Rasmussen
d7a53261bd Fixes and improvements to time-of-flight solver docs. 2013-03-21 14:51:49 +01:00
Atgeirr Flø Rasmussen
7ccbf3597f Completed main doc page for opm-core. 2013-03-21 14:51:15 +01:00
Atgeirr Flø Rasmussen
bce34c1168 Add sim_* programs to be installed. 2013-03-21 13:11:14 +01:00
Atgeirr Flø Rasmussen
3433596dad Merge pull request #216 from rolk/216_build
Guess sibling build directories based on the name of this one
2013-03-21 04:58:40 -07:00
Atgeirr Flø Rasmussen
bf8e306172 Merge pull request #214 from rolk/214_utils
No programs installed by 'make install'
2013-03-21 04:58:25 -07:00
Roland Kaufmann
a23f09f7c9 Set up installation for target marked as such
Source files can be put on a special list of `utilities' that are
also marked for distribution after they are compiled.
2013-03-21 00:00:50 +01:00
Roland Kaufmann
2be16e8e61 Search in build directories named similarly to ours
Assume that a build that uses an out-of-source subdir, uses modules
with the same last component as ours.
2013-03-20 23:36:45 +01:00
Atgeirr Flø Rasmussen
ab59813dec Minor doc fix. 2013-03-20 14:21:19 +01:00
Atgeirr Flø Rasmussen
f84eb97f4f Clean up well docs.
Needed to rename structs in legacy_well.h to avoid clash in docs.
2013-03-20 14:14:53 +01:00
Atgeirr Flø Rasmussen
8c1dc782dd Update synopsis and file description. 2013-03-20 14:12:32 +01:00
Atgeirr Flø Rasmussen
8c8295cae6 Merge pull request #215 from rolk/215_no_sys
Follow the principle of least surprise when locating modules
2013-03-20 05:55:50 -07:00
Roland Kaufmann
631e377f6a Search siblings before system directories
If there is a sibling directory with the name of the module we are
searching for, it is probably part of the same suite, and is the
version we intend to use, before the system version.

This behaviour can be altered with the option SIBLING_SEARCH.

Note, however, that if the sibling is a source tree, it cannot guess
which subdir the build tree is in. You will then probably end up
with headers from the sibling and libraries from the system!
2013-03-20 12:24:04 +01:00
Roland Kaufmann
2b59d556f0 Use heuristics when finding rather than adjusting path
Commit b6cdc06b introduced heuristics to look in the parent directory
for header files alone, while leaving the path for binary files. This
is much better than adjusting the path because one does not potentially
confuse two build directories this way.
2013-03-20 11:30:44 +01:00
Roland Kaufmann
b709645181 Don't search in system dir if explicit dir given
If we give an explicit directory path it is because we want a special
version to be used instead of the system version; if there is any
problems with that, we should know up-front instead of silently start
using the system version again!
2013-03-20 09:58:33 +01:00
Roland Kaufmann
9406e198cb Use empty string instead of zero to indicate not found
When writing the variable HAVE_SUPERLU to the config.h file, an empty
string will be interpreted as "not defined". Thus, we can use both
if and ifdef preprocessor directives to check for it. If we use zero,
then we must be careful to always use if, never ifdef.
2013-03-20 09:34:33 +01:00
Roland Kaufmann
b6cdc06b7a Don't search system directories when path given
If the user has given a path to the module, then the system paths should
not be searched, as these may contain an old and outdated version. We
don't necessarily want that just because there was a problem with our
own installation!
2013-03-20 09:33:35 +01:00
Atgeirr Flø Rasmussen
2de919ece7 Merge pull request #213 from rolk/213_h_path
Prepend source directory to include path
2013-03-20 01:23:25 -07:00
Roland Kaufmann
2e5e3d2168 Prepend source directory to include path
If the dependencies have files with relative paths that are ambigious
to our own, we want our version to be the first candidate for inclusion.
This is a variant of the reason for why we always include the build
directory first (and still does).
2013-03-20 08:13:40 +01:00
Atgeirr Flø Rasmussen
58c8aad5cd Merge pull request #211 from akva2/fix_debian_packaging
small update to debian packaging
2013-03-19 14:45:42 -07:00
Atgeirr Flø Rasmussen
fe9d7ef743 Merge pull request #207 from blattms/release-dune-cmake
Add support for AMG improvements when using inofficial 2.2 DUNE release with CMake support
2013-03-19 08:11:44 -07:00
Arne Morten Kvarving
e5b28b52a5 fixed: dependency order in debian packages
previously, runtime would depend on doc. now it's as expected
with no dependencies between the two
2013-03-19 15:33:50 +01:00
Markus Blatt
7db4a83e96 Removed compile time warning. In verbose mode the warning will be issued during runtime. 2013-03-19 13:48:02 +01:00
Atgeirr Flø Rasmussen
68b735c7ad Merge pull request #210 from rolk/210_ifdef
SuiteSparse configuration returns zero instead of blank string when header not found
2013-03-19 05:35:07 -07:00
Atgeirr Flø Rasmussen
a3e949dfc3 Merge pull request #209 from atgeirr/fix-umfpack-conditional
Fixed conditional compilation issues with UMFPACK.
2013-03-19 05:34:36 -07:00
Atgeirr Flø Rasmussen
410a9b73e2 Changed #ifdef HAVE_... to #if HAVE_... 2013-03-19 13:33:07 +01:00
Roland Kaufmann
ed4b62ae4b Indicate failure to find header with blank string
Use empty string instead of zero, so it can be tested with #ifdef as
well as #if in the C++ source code.
2013-03-19 13:28:30 +01:00
Roland Kaufmann
0eb46b567d Indicate failure to find header with blank string
Use empty string instead of zero, so it can be tested with #ifdef as
well as #if in the C++ source code.
2013-03-19 13:06:43 +01:00
Atgeirr Flø Rasmussen
19767d5d97 Fix syntax error. 2013-03-19 11:17:24 +01:00
Atgeirr Flø Rasmussen
9a2f2c48fd Fixed conditional compilation issues with UMFPACK.
This should fix the issue reported in #208 introduced in #203.
2013-03-19 10:30:27 +01:00
Bård Skaflestad
36b3f46e93 Merge pull request #203 from atgeirr/combined
Reorganisation and improvements in significant parts of opm-core
2013-03-18 12:12:55 -07:00
Markus Blatt
67e89c7568 Fixed compilation with official DUNE release. 2013-03-18 15:36:35 +01:00
Markus Blatt
b6ad03b418 Merge remote-tracking branch 'origin/release-dune-cmake' into release-dune-cmake 2013-03-18 14:35:23 +01:00
Markus Blatt
b5e6757038 Adapted the documentation. 2013-03-18 14:34:04 +01:00
Markus Blatt
0658b787b7 Added a fast amg version of AMG (with one step of Gaus-Seidel smoothing) and AMG with Krylov-cycle.
The former is only available when using the inofficial 2.2.1 cmake release.
The latter is currently not optimized.
2013-03-18 14:34:03 +01:00
Markus Blatt
87f9cf8c77 Use 1e-8 as residual tolerance similar to istl. Added verbosity mode. 2013-03-18 14:34:03 +01:00
Atgeirr Flø Rasmussen
e59db97128 Merge pull request #205 from rolk/205_tinyxml
Dependent packages fail if opm-core uses embedded TinyXML
2013-03-18 05:12:20 -07:00
Atgeirr Flø Rasmussen
b32674f3ea Moved ColumnExtract and initState.
ColumnExtract -> opm/core/grid/ and initState -> opm/core/simulator/.
2013-03-18 12:47:23 +01:00