Commit Graph

3169 Commits

Author SHA1 Message Date
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
Atgeirr Flø Rasmussen
d7353145c1 Update to follow previous moves and deletes. 2013-03-18 12:40:34 +01:00
Atgeirr Flø Rasmussen
987aa5b6fd Further reorganising of opm-core.
Deleted some unused code (or moved to opm-porsol), moved all code dealing with
time-of-flight to opm/core/tof, moved code for implicit transport solver to
opm/core/transport/implicit, spu_[im|ex]plicit.[ch] to opm/core/transport/minimal.
2013-03-18 12:38:04 +01:00
Atgeirr Flø Rasmussen
2405758e2d Renamed newwells.h -> wells.h.
Also moved implementation file to subdir.
2013-03-18 10:33:34 +01:00
Roland Kaufmann
ce16450e43 Bugfix change from function to macro
This change is similar to commit 89be4e14: After find_package_append_to
changed from function to macro to pick up the configuration not only
from the module itself but also from everything it pulled it, the
variable MODULE is overwritten (variable module in lower case is a
parameter, so it is replaced in the source body). Thus, the test in the
end is not whether *this* module was found, but if its last dependency
was! This made the build crash only in some projects but not in others.
2013-03-18 10:32:53 +01:00
Atgeirr Flø Rasmussen
1e6e733bb7 Moved deprecated opm/core/well.h -> opm/core/pressure/legacy_well.h
Still used by some pressure system assemblers.
2013-03-18 10:23:51 +01:00
Atgeirr Flø Rasmussen
0a935774d2 Move GridManager to grid subdir.
Also remove GridAdapter (moved to dune-cornerpoint), and
moved grid.c implementation file to grid subdir.
2013-03-18 10:16:46 +01:00
Markus Blatt
71a2493ac0 Adapted the documentation. 2013-03-18 10:11:28 +01:00
Markus Blatt
699a61e57b 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 10:11:28 +01:00
Markus Blatt
bf04993820 Use 1e-8 as residual tolerance similar to istl. Added verbosity mode. 2013-03-18 10:11:28 +01:00
Atgeirr Flø Rasmussen
5fba4ca2b3 Merge remote-tracking branch 'upstream/release/2013.03' into combined 2013-03-18 08:28:36 +01:00
Atgeirr Flø Rasmussen
d86b4c09a4 Merge pull request #204 from rolk/204_precomp
Allow precompiled headers to be enabled from command-line
2013-03-17 13:10:37 -07:00
Roland Kaufmann
040b7adb4e Search for libraries in dunecontrol's default build dir 2013-03-17 21:03:19 +01:00
Roland Kaufmann
4d7752b980 Don't search for source in build directories 2013-03-17 21:03:09 +01:00
Roland Kaufmann
5401df41b5 Use find modules for libraries with extra processing
Some libraries require more information than what is present in the
xxx-config.cmake file, e.g. the caller must know whether HAVE_TUPLE
is available and probably used when compiling dune-common, and put
this in its own config.h file.

Code to take care of these variables must therefore be in the client
configuration, and this is the same code which is used to handle the
autotools version, namely the find module, so a practical solution
is to just revert to that in both cases.
2013-03-17 21:03:00 +01:00
Roland Kaufmann
6cfa13f136 Allow precompiled headers to be enabled from command-line 2013-03-15 20:06:40 +01:00
Atgeirr Flø Rasmussen
6cdcff0ae3 Removed unused example applications.
Actually, the program spu_2p is the only place the class GravityColumnSolver
is currently used, and it is also the only program capable of doing an operator
splitting with gravity segregation being solved by full Newton-Raphson (not by
columns). These features should be made available by refactoring the transport
solvers: making the segregation solvers inherit TransportSolverTwophaseInterface
and creating a general composite solver.
2013-03-15 15:13:01 +01:00
Atgeirr Flø Rasmussen
911a16e157 Reinstate correct porevolume usage.
The porevolume at the start of the timestep should be provided to
the solver.
2013-03-15 15:10:16 +01:00
Atgeirr Flø Rasmussen
af62639513 Bugfix: check for null ptr before use. 2013-03-15 15:02:42 +01:00
Atgeirr Flø Rasmussen
e2893a5696 Bugfix: order of arguments in function call. 2013-03-15 15:00:18 +01:00
Bård Skaflestad
520d97c63a Merge pull request #202 from rolk/202_mpi
Allow MPI to be found and opm-core configured the same way as DUNE
2013-03-15 06:52:17 -07:00
Atgeirr Flø Rasmussen
8c47ad970f Removed unneeded simulator class, renamed a simulator. 2013-03-15 14:22:26 +01:00