Commit Graph

3436 Commits

Author SHA1 Message Date
Roland Kaufmann
0ed0ac61e9 Only display an error message if C++11 support is noted as REQUIRED 2013-08-01 13:44:27 +02:00
Bård Skaflestad
e9b5a55b4b Merge pull request #293 from rolk/293_wogit
Make project buildable also without Git
2013-07-31 06:37:12 -07:00
Roland Kaufmann
1a04ae5125 Make project buildable also without Git
If Git is not found, revert to just dumping the label into the code.
(We currently have no way of getting the SHA into the tarball).
2013-07-31 15:08:51 +02:00
Bård Skaflestad
0e42c0e20c Merge pull request #292 from rolk/292_fastbuild
Add possibility to skip building tests and examples
2013-07-31 05:45:47 -07:00
Bård Skaflestad
93afe5fbb6 Merge pull request #291 from rolk/291_ertdep
Probe again later if ERT isn't found now
2013-07-31 05:19:47 -07:00
Roland Kaufmann
0e8b8191a9 Probe again later if ERT isn't found now
If we write a blank value into the cache, we tell CMake that ERT isn't
found and it won't check again. If we delete it from the cache in case
we didn't find the directories, then CMake will run the find module
again the next time we configure. Just probing for directories is cheap
so this is no problem. This allows us to install ERT, do a reconfigure
and it will then be picked up by the build system.

If we find ERT and it doesn't compile properly, a blank value will still
be written, and it won't try again the next time, so you must wipe the
cache if you *upgrade* ERT into a newer and more compatible version.
2013-07-31 14:17:41 +02:00
Roland Kaufmann
b53ba15a84 Let the AutoTools script disable tests and samples also 2013-07-31 14:13:56 +02:00
Roland Kaufmann
1378114cec Add a switch for examples similar to the one for tests
Running tests during development at least has a purpose, but compiling
all the samples *every* time is just an annoyance.
2013-07-31 14:03:53 +02:00
Roland Kaufmann
ea973849e0 Disable testing if BUILD_TESTING is switched off
This is an "official" switch for disable testing; our own code which
adds tests should adhere to it. (It is added by CTest)
2013-07-31 13:58:06 +02:00
Bård Skaflestad
3e803a4780 Merge pull request #290 from rolk/290_version
Embed version string into the library
2013-07-31 04:57:55 -07:00
Roland Kaufmann
6f43c7587f Don't update version info in Debug mode
It gets tiresome to rebuild the project everytime one makes changes to
any of the unit tests. We don't likely publish results based on the
debug code anyway, so tracking the version number there is not such a
pressing issue.
2013-07-31 13:14:30 +02:00
Bård Skaflestad
1967631b83 Merge pull request #285 from rolk/285_shadow
Provide way of shadowing only some properties
2013-07-31 04:05:13 -07:00
Roland Kaufmann
764c3c8e60 Make sure that version info is updated before building code
Otherwise, the library may be declared "done" before the version number
process have had any change to touch files it depends upon. This ensures
that the version number is correct before we start building the library.
2013-07-31 12:58:12 +02:00
Roland Kaufmann
155bb2fc9c Include version information in the library
This version information can be queried programmatically by using the
expored opm_core_version symbol.
2013-07-31 12:22:18 +02:00
Roland Kaufmann
928a67b77f Write version information into header file
Akin to config.h, we write project-version.h whenever the VCS sha hash
of the project changes. This file can then be included to embed this
into the project. Since this changes more frequently, we choose another
file than config.h. Care is also taken to not rewrite the header if the
information doesn't change, but the project is rebuilt.
2013-07-31 12:04:07 +02:00
Roland Kaufmann
f3693e2282 Read the label from project info 2013-07-31 11:50:19 +02:00
Roland Kaufmann
663c6240a8 Add a label field to the project information
The difference between the version number (1.0) and the label (2013.03)
is: The version is time-independent but shows the level of compatibility,
see e.g. <http://www.semver.org>, whereas the label is a marketing tool
which describes the project progress.
2013-07-31 11:45:56 +02:00
Roland Kaufmann
2183a243cb Strings must contain ONLY numbers to be integers
The old pattern matched if there was an integer (digit) in the string;
it would have to be all non-digits to be quoted.
2013-07-31 11:08:57 +02:00
Roland Kaufmann
6757860aac Make sure CMake is re-run if dune.module changes
Version number in this module is included in the name of the library;
if we make changes to dune.module, it should do a complete reconfigure.
2013-07-31 11:05:53 +02:00
Bård Skaflestad
2dac509c97 Merge pull request #289 from andlaus/make-gcc44-mandatory
Make gcc44 mandatory
2013-07-30 13:25:35 -07:00
Bård Skaflestad
6d3cbafa54 Merge pull request #288 from andlaus/fix-clang-warnings
fix a few CLang warnings
2013-07-30 12:18:54 -07:00
Andreas Lauser
b52b2cd555 fix new 'unused variable' warnings on GCC
that one was due to the fact that the constructor arguments were no
longer used to initialize (unused) private member variables. These
warnings did not appear in CLang for some reason. Again, thanks to
Bård Skaflestad for the review.
2013-07-30 19:07:46 +02:00
Andreas Lauser
31e7e7e01d better fix for the alignment warning of the previous patch
'work' is a small, constant size array for temporary data so it can be
allocated on the stack and the 'work' parameter can be eliminated entirely.

Thanks to Bård Skaflestad for the suggestion!
2013-07-30 19:07:30 +02:00
Andreas Lauser
562bcf2e7d replace boost::array by std::array
GCC 4.4 supports std::array, so there is not much point in keeping
compatibility with ancient compilers...
2013-07-30 17:46:32 +02:00
Andreas Lauser
9465560ae4 make the c++-2011 feature set of GCC 4.4 mandatory
we now produce an error even if the module in question does not
actually use some of these features.
2013-07-30 17:43:01 +02:00
Andreas Lauser
5a7992fc56 fix a few CLang warnings
most of them quite insignificant, but still annoying. The only
exception is the warning about the changed alignment for the 'work'
argument of spu_implicit_assemble(). AFAICT, the only reason why it
worked was that the pointer produced by malloc() was passed
directly. (malloc() seems to fulfill all alignment criteria.) To fix
this, I've changed that argument's type from char* to double*.
2013-07-30 16:27:20 +02:00
Bård Skaflestad
0023e508e1 Merge pull request #286 from joakim-hove/save-eclgrid-after-deactivating-cells
Changed EclipseGridParser::saveEGRID() to take globalCells input
2013-07-30 07:06:52 -07:00
Joakim Hove
0595269934 Added static_cast<void> to avoid warnings about unused variables 2013-07-30 15:41:32 +02:00
Joakim Hove
f5ac9fc240 Actually using filename argument in GridManager::saveEGRID 2013-07-30 15:37:49 +02:00
Bård Skaflestad
054b764224 Merge pull request #287 from rolk/286_info
Read project settings from dune.module
2013-07-30 06:27:08 -07:00
Joakim Hove
bdd587bf93 Minor merge fixup - sorry 2013-07-30 14:56:21 +02:00
Joakim Hove
07ed1a19f1 Merge remote-tracking branch 'upstream/master' into save-eclgrid-after-deactivating-cells
Conflicts:
	opm/core/io/eclipse/EclipseGridParser.cpp
	opm/core/io/eclipse/EclipseGridParser.hpp
2013-07-30 14:49:37 +02:00
Roland Kaufmann
58d9e09d02 Added note about where to make likely modifications
People will head for CMakeLists.txt when making modifications (such
as adding a new file). This note directs them to where they should
rather look.
2013-07-30 14:20:34 +02:00
Roland Kaufmann
5ae4d44e54 Read project properties from dune.module
We cannot generate dune.module because that file is read by dunecontrol
before the build starts. It therefore make sense to let it be the
original and let the build system read it instead of duplicating the
information in CMakeLists.txt

This module is a adaption of Andreas Lauser's OpmParseDuneModule
in opm-material, modified to handle the more sparse info provided by
the other modules as well.
2013-07-30 14:11:26 +02:00
Roland Kaufmann
00c367f184 Add description back to dune.module
We want to read this from a declarative file instead of having it
in the build system source.
2013-07-30 13:37:32 +02:00
Roland Kaufmann
3f4695794d Eliminate _MODULE_DIR variable
It is only used in one place, where it can easily be replaced by its
expansion. The reason for removing it is that it depends on the name
of the project, and I intend to read this using a routine it the very
directory it is including, hence the need for a different approach.
2013-07-30 13:26:16 +02:00
Roland Kaufmann
a74791bcac Use underscore for data members 2013-07-30 13:24:57 +02:00
Roland Kaufmann
26b2d2794c Provide way of shadowing only some properties
The current implementations of IncompPropertiesInterface are very
all-or-nothing. In some situations, you want to read rock and fluid
properties from an Eclipse file, but use analytical functions for
the unsaturated properties. Or you want to update properties based
on a marching filter.

This patch provides a way to mix various property objects, or to
"shadow" the properties with a raw array of data, so you don't have
to reimplement the entire interface just to make a small change.
2013-07-30 13:11:52 +02:00
Andreas Lauser
0faa2bb49c Merge pull request #282 from juliohm/master
Remove trailing whitespaces
2013-07-28 10:08:26 -07:00
Júlio Hoffimann
8385a9bcbb Remove trailing whitespaces 2013-07-28 08:34:13 -03:00
Júlio Hoffimann
e45313e918 Purge unused variable in tutorial 4 2013-07-26 11:42:24 -03:00
Joakim Hove
9cc3d4dd2d Changed EclipseGridParser::saveEGRID() to take globalCells as input 2013-07-25 12:08:08 +02:00
Joakim Hove
59b99f7444 Added method saveEGRID() on GridManager 2013-07-24 14:43:06 +02:00
Joakim Hove
8c32146093 Rewritten EclipseGridParser to use input actnum instead of ACTNUM from deck 2013-07-24 14:42:40 +02:00
Bård Skaflestad
efc44daf76 Merge pull request #278 from rolk/278_linkver
Print linker version to log when configuring
2013-07-05 04:25:50 -07:00
Roland Kaufmann
56d3e1f8a4 Parse RHEL5 linker strings better 2013-07-05 13:18:53 +02:00
Roland Kaufmann
0696a21280 Print linker version to log 2013-07-05 12:45:39 +02:00
Roland Kaufmann
357db6c5e0 Add function to detect linker version
The linker that is used (ld vs. gold for instance) is often hidden
when using the compiler as a front-end (to include the correct
runtime libraries).

These functions enables us to probe the linker version and reports
its finding in the log.
2013-07-05 12:44:04 +02:00
Bård Skaflestad
94bc2525b2 Merge pull request #277 from blattms/fix-agmg-verbosity
Fixes setting the verbosity for AGMG.
2013-07-05 03:41:58 -07:00
Markus Blatt
4a9dd8c483 Fixes setting the verbosity for AGMG.
If verbosity is true, we set the iprint parameter such that the
output is print to standard out. If not, we use a negative number
such that only error messages are printed to standard out.
2013-07-05 12:19:57 +02:00