Commit Graph

3570 Commits

Author SHA1 Message Date
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
Bård Skaflestad
8fc205707b Merge pull request #276 from rolk/276_linsolres
Zero-initialize structure to avoid returning undefined
2013-07-05 02:36:57 -07:00
Bård Skaflestad
143417e2b2 Merge pull request #272 from blattms/satellite-exclude-all
Change marker EXCLUDE_ALL to EXCLUDE_FROM_ALL in opm_compile_satellite
2013-07-05 02:24:58 -07:00
Roland Kaufmann
002e22b9ec Zero-initialize structure to avoid returning undefined
The compiler will otherwise complain that we are returning undefined
data. There is no way for the client code to know whether this was
the case.
2013-07-05 10:59:52 +02:00
Markus Blatt
757973b713 Adjusts macro documentation to recent change. 2013-07-05 10:44:31 +02:00
Bård Skaflestad
33173396f5 Merge pull request #266 from rolk/266_library
Move all common build code to cmake/ directory
2013-07-05 01:28:55 -07:00
Roland Kaufmann
9853407ded Refer to other project-specific files at top-level
Having the include statements here will hopefully lead to others
quickly finding the list of prerequisite files needed to build.
2013-07-05 00:58:29 +02:00
Roland Kaufmann
91f96087b7 Include file list from top-level instead of module-level
Increase the visibility of the source file name include by no longer
putting it in a module, but rather by including it in CMakeLists.txt
2013-07-05 00:57:07 +02:00
Roland Kaufmann
a4767f754b Don't include prerequisites here; do it more explicitly
Developers that are working to familiarize themselves with OPM will
probably start out in CMakeLists.txt to figure out where the project
declare its dependencies, thus the list should be referred to from
there instead of inside one of the sub-modules.
2013-07-04 23:47:38 +02:00
Bård Skaflestad
d332129676 Merge pull request #274 from blattms/non-tr1
Changed std::tr1 occurences to boost.
2013-07-04 12:01:51 -07:00
Markus Blatt
68eb3fbcb1 Changed std::tr1 occurences to boost.
std::tr1 might not be supported by all compilers and will eventually
be dropped by others. Using boost instead makes this more
portable.
2013-07-04 16:04:35 +02:00
Markus Blatt
f739c607f9 Change marker EXCLUDE_ALL to EXCLUDE_FROM_ALL in opm_compile_satellite
Previously, when passing EXCLUDE_ALL to opm_compile_satellite this
resulted a cmake error:

CMake Error at cmake/Modules/UseDebugSymbols.cmake:71 (get_target_property):
  Cannot find source file:

    EXCLUDE_ALL

  Tried extensions .c .C .c++ .cc .cpp .cxx .m .M .mm .h .hh .h++ .hm .hpp
  .hxx .in .txx
Call Stack (most recent call first):
  cmake/Modules/OpmSatellites.cmake:77 (strip_debug_symbols)
  CMakeLists.txt:176 (opm_compile_satellites)
2013-07-04 12:28:10 +02:00
Roland Kaufmann
501e5ad0e9 Project-specific hooks no longer needs an extra arg.
This change is already implemented in its own commit, but the
CMakeLists.txt change is in its own commit to make it easier to
distribute the changes to other projects without merge conflicts.
2013-06-29 22:10:48 +02:00
Roland Kaufmann
2c8e068812 Remove the project parameter for the customization hook
The hooks are meant to be project specific, and should therefore
either know their own name or at least have access to a variable with
that name in it.
2013-06-29 22:04:00 +02:00
Bård Skaflestad
d3065fb3f6 Merge pull request #269 from rolk/269_sink
Use a more realistic measure for source and show use of units
2013-06-28 04:56:36 -07:00
Roland Kaufmann
1998e98a00 Use natural names instead of mathematical notation 2013-06-28 13:44:15 +02:00
Roland Kaufmann
405a6b021c Sink should match source
Although it already does numerically, this make is more explicitly
clear.
2013-06-28 13:40:22 +02:00