Commit Graph

3052 Commits

Author SHA1 Message Date
Roland Kaufmann
a1141b56f7 Add define for SuperLU later than 2005
This is a prerequisite for using the find module, but some code
explicitly check this macro anyway.
2013-02-11 22:36:48 +01:00
Roland Kaufmann
779b02dda2 Search module for SuperLU library
Original downloaded from:
  <https://svn.dune-project.org/svn/dune-istl/branches/cmake/cmake/modules/FindSuperLU.cmake>

Renamed to all capitals in name so that the name of the package is
consistent with the variables it returns.
2013-02-11 22:36:48 +01:00
Roland Kaufmann
f5c9f97c83 Link with UMFPACK in SuiteSparse if available 2013-02-11 22:36:48 +01:00
Roland Kaufmann
751c721c55 Probe for SuiteSparse libraries
Search for modules in this library in the same style as Boost; by
specifying a list of components. If all on the list is present, then
a list of libraries to link with, is returned.
2013-02-11 22:36:48 +01:00
Roland Kaufmann
5876ab7f30 Check for dynamic linking of Boost::Test library
BOOST_TEST_DYN_LINK must be defined if you are *building* Boost::Test as
a shared object, and the client programs must also include this option
when they use the header files, to link to it correctly.
2013-02-11 22:36:48 +01:00
Roland Kaufmann
370b8580d1 Link with C++ Boost library 2013-02-11 22:36:48 +01:00
Roland Kaufmann
21c4194b7c Link against XML parser library 2013-02-11 22:36:48 +01:00
Roland Kaufmann
b47d0de4c6 Link against BLAS+LAPACK numerical libraries
The tests for these packages are part of the standard CMake installation
so there is no config modules for them here.
2013-02-11 22:36:48 +01:00
Roland Kaufmann
1af93bd757 Use generic boilerplate macro to include packages 2013-02-11 22:36:47 +01:00
Roland Kaufmann
4dd3f9ec96 Append standard variables to project after finding package
Normally a package returns a set of standard variables such as
Xxx_INCLUDE_DIRS. Adding this to a list that is collected for the
project amounts to a bunch of boilerplate which can rather be
encapsulated in a macro.
2013-02-11 22:36:47 +01:00
Roland Kaufmann
644fc9f5cf Don't repeat option if already present 2013-02-11 22:36:47 +01:00
Roland Kaufmann
a4cf98055d Add options without repeating them on the command-line 2013-02-11 22:36:47 +01:00
Roland Kaufmann
9a1b24c621 Compile with C++0x/11 if available
We want to compile with the -std=c++0x since DUNE uses this settings and
we need to use the same ABI as that one if we are going to link with it.

Find module is a copy of the one in cmake/modules in (the cmake branch of)
dune-common.
2013-02-11 22:36:47 +01:00
Roland Kaufmann
ddd9728f5e Added library version 2013-02-11 22:36:47 +01:00
Roland Kaufmann
6021359643 Remove files which are not part of the official library
Some files are distributed with the source, but does not end up in the
final shared object. These files are captured by the glob, so we have
to remove them afterwards. (There are fewer of these files than
explicitly list all files that should be included in the build).
2013-02-11 22:36:47 +01:00
Roland Kaufmann
400715656b Put results of platform checks in configuration header
Various features in the code base will be enabled depending on the
values written by the build system in here.
2013-02-11 22:36:47 +01:00
Roland Kaufmann
eee961a527 Define function to write a list of variables to config.h
A fundamental problem with the configure_file() command is CMake is that
the author of the template file config.h.in must know which variables
all modules need to have defined, and this is not easily communicated.

The idea behind this function is: Each Find-module can return a list of
variables that it has filled with probed values, and that should be
written to config.h, which is again included by the header file of this
module.

Each project thus defines its own config.h file, which is common between
all module's headers.
2013-02-11 22:36:47 +01:00
Roland Kaufmann
ec4c39c0d0 Ignore files generated by the CMake scripts 2013-02-11 22:36:47 +01:00
Roland Kaufmann
f675894df3 Barebones CMake configuration file 2013-02-11 22:36:47 +01:00
Roland Kaufmann
9f5eff19a2 Remove remnants of old attempt to support CMake 2013-02-11 22:36:47 +01:00
Bård Skaflestad
4d6eca1847 Merge pull request #135 from atgeirr/doc-improvements
Doc and comment improvements
2013-02-06 01:26:29 -08:00
Atgeirr Flø Rasmussen
ab5183f1c3 Merge pull request #140 from bska/ert-cleanup
Ert cleanup
2013-02-05 23:44:36 -08:00
Atgeirr Flø Rasmussen
a80141092d Minor mod: removed text about low-level interfaces. 2013-02-06 08:42:02 +01:00
Atgeirr Flø Rasmussen
974cf9c33f Merge pull request #138 from bska/release-cleanup
Correct a number of latent issues in `tarjan.c`
2013-02-05 23:38:25 -08:00
Bård Skaflestad
9d2191dd37 Catch up to changing location of ERT headers. 2013-02-05 15:20:12 +01:00
Bård Skaflestad
c245a0ae7a Catch up to ERT library reorganisation
Specifically, changing locations of headers and library renaming

    libgeometry.a -> libert_geometry.a
2013-02-05 15:19:36 +01:00
Bård Skaflestad
fb482740d4 Catch up to changing location of ERT headers 2013-02-05 15:18:17 +01:00
Arne Morten Kvarving
af388bb81c Update import of ERT-Eclipse headers to new location 2013-02-05 15:07:35 +01:00
Bård Skaflestad
edeb9d7551 Replace an assignment with intended equality test
This corrects a latent error that has been present since the inception
of this module.
2013-02-01 16:30:45 +01:00
Bård Skaflestad
089988aa16 Eliminate redundant explicit type conversion.
The pointers in question are already type 'int *'.  There is no need to
explicitly convert them to that type too.
2013-02-01 16:25:46 +01:00
Bård Skaflestad
cf922e73ce Eliminate release-mode build warning.
The 'cbottom' variable is only used within an assert().  Don't define
the variable in release (i.e., "NDEBUG") mode.
2013-02-01 16:15:35 +01:00
Bård Skaflestad
8f6be16ac3 Use portable method of zeroing vector of ints.
The memset() technique is only applicable to platforms for which
numerical zero is represented by all bits zero.
2013-02-01 16:06:39 +01:00
Atgeirr Flø Rasmussen
1ca82a7e9f Merge pull request #136 from bska/release-cleanup
Avoid clobbering existing tests for SuperLU
2013-01-31 00:20:37 -08:00
Atgeirr Flø Rasmussen
eeadbe60ce Merge pull request #121 from rolk/compgeo2d
Compute (extra) geometry properties for 2D grids
2013-01-31 00:19:55 -08:00
Bård Skaflestad
845db22a52 Avoid clobbering existing tests for SuperLU
We inherited this test from the Dune repositories, but failed to install
sufficient protection in the form of symbol renaming to guarantee that
both tests could coexist.

This issue was exposed by a recent pull request in the OPM-Porsol
repository, namely OPM/opm-porsol#16.
2013-01-30 19:50:32 +01:00
Atgeirr Flø Rasmussen
954b0b6e2b Minor fixes to top-level docs. 2013-01-29 14:02:49 +01:00
Atgeirr Flø Rasmussen
f23d14a309 Changed OpenRS->OPM in copyright notices and #include guards. 2013-01-29 13:42:24 +01:00
Atgeirr Flø Rasmussen
8995543467 Changed OpenRS->OPM in copyright notices and #include guards. 2013-01-29 13:29:44 +01:00
Atgeirr Flø Rasmussen
8e30215f16 Changed OpenRS->OPM in copyright notices and #include guards. 2013-01-29 13:17:01 +01:00
Atgeirr Flø Rasmussen
c6d07f76ab Remove info about low-level assembler routines. 2013-01-29 12:48:44 +01:00
Atgeirr Flø Rasmussen
6cbc7e3e60 Added some top-level docs: wells and pressure solvers. 2013-01-29 11:10:17 +01:00
Atgeirr Flø Rasmussen
e7e9a7d701 Exclude embedded TinyXML library from doc generation. 2013-01-29 11:09:42 +01:00
Atgeirr Flø Rasmussen
2b2b877de2 Merge branch 'master' into doc-improvements 2013-01-29 10:14:55 +01:00
Atgeirr Flø Rasmussen
6f9eac0c50 Merge pull request #134 from bska/release-cleanup
Assorted clean-ups in preparation of release
2013-01-28 05:30:03 -08:00
Bård Skaflestad
3437ec8b32 Fix DisjointColumn test case
The test started failing in commit 7d7f62e, but this was not detected
due to no automatic test environment.  The commit changed the cell
numbering from "per-column (K,I,J)-ordering" to "per-plane
(I,J,K)-ordering".  Consequently, the "correct_answer" seized to be
correct.

This change restores the "correct_answer" in the ordering introduced by
commit 7d7f62e.

While here, adjust style of the DisjointColumn test case for legibility.
2013-01-25 17:35:21 +01:00
Bård Skaflestad
f46bd9b95a Bring ParameterGroup interface into scope.
The constructor accepts a parameter::ParameterGroup reference and thus
needs a valid interface in scope.  Relying on header pollution is
unwise.
2013-01-23 17:35:05 +01:00
Bård Skaflestad
d4363a04e9 Merge pull request #120 from atgeirr/dg-improvements
Further DG time-of-flight improvements
2013-01-23 04:38:26 -08:00
Atgeirr Flø Rasmussen
8f1aa94481 Merge remote-tracking branch 'upstream/master' into dg-improvements 2013-01-23 10:06:01 +01:00
Atgeirr Flø Rasmussen
b719bc8b1e Added evalFunc() method.
This public method is not virtual, and implemented in the base class using calls to
the virtual methods. Not yet used by the DG solver.
2013-01-23 09:51:30 +01:00
Atgeirr Flø Rasmussen
5bdaeeafa0 Refactored applyMinUpwindLimiter(). 2013-01-23 09:50:25 +01:00