Commit Graph

3570 Commits

Author SHA1 Message Date
Roland Kaufmann
0e456909e6 Use a more realistic injection rate
In addition, this also shows how to use the units to specify the
measure.
2013-06-28 13:20:09 +02:00
Roland Kaufmann
6a7a9541f4 Give a name to the porosity
Mostly one would assume that this would be the porosity since that's the
only non-named argument, but stating this explicitly saves us from one
trip to the manual.
2013-06-28 13:08:16 +02:00
Bård Skaflestad
254f70e504 Merge pull request #267 from laods/verbosity
Change verbosity level of warning message in transport solver
2013-06-28 02:02:31 -07:00
Roland Kaufmann
f44cd35d81 Move configure script to cmake/Scripts/ directory
We want all changes to happen there; retain a small script that
simply forwards the action to the main script in that directory.
2013-06-26 00:05:02 +02:00
Roland Kaufmann
df6c17a9c4 Use common library code and define customization in macros
Only the code that is special for this particular project is retained
in the main file; all the common code is imported from the cmake/
directory.
2013-06-25 23:55:58 +02:00
Roland Kaufmann
38bd5b0ad3 Common code for building OPM library modules
Most of the OPM libraries follow the same template; this include file
contains all the common code.
2013-06-25 23:53:40 +02:00
Roland Kaufmann
bc9c8a7068 Get prerequisites from a separate "header" file
Note that the variable containing the dependencies must be expanded
inside quotes; otherwise the list will spill into the argument list!
2013-06-25 23:49:36 +02:00
Roland Kaufmann
fe6d7e8889 List prerequisites for modules in a separate file
This file can be included both in the project itself, and also in the
find module for the library, so that the list of dependencies can be
maintained in only one place.
2013-06-25 23:42:50 +02:00
Atgeirr Flø Rasmussen
b23ffaa7f0 Merge pull request #265 from bska/remove-unwanted-commits
Remove files that were inadvertenly introduced
2013-06-25 02:51:37 -07:00
Bård Skaflestad
c737a1b01b Remove files that were inadvertenly introduced
Requested by: qilicun
2013-06-25 11:33:23 +02:00
Liu Ming
25dd2fadaa qq 2013-06-25 16:01:14 +08:00
Liu Ming
70eebfdad8 test for new files 2013-06-25 15:52:35 +08:00
Atgeirr Flø Rasmussen
34f2d637ab Merge pull request #263 from bska/remove-redef-kluge
Disable build kluge that is no longer pertinent
2013-06-24 06:02:10 -07:00
Bård Skaflestad
6afd914756 Merge pull request #262 from blattms/unify-amg-calls
Unify amg calls
2013-06-21 04:01:03 -07:00
Markus Blatt
4f41c2ac72 Fixed unused parameters and whitespace issues. 2013-06-21 12:49:35 +02:00
Bård Skaflestad
33320270fc Disable build kluge that is no longer pertinent
The <have_boost_redef.hpp> header was introduced (commit 82369f9) as
a work-around for a particular interaction in the Autotools-based
setup of OPM-Core and the Dune core modules.  Notably, Dune's
"Enable" trick for Boost failed on some older Autoconf systems.  Now
that we're using CMake, however, that kluge is no longer needed
because we (OPM-Core) always

  #define HAVE_BOOST 1

i.e., as an explict true/false value.

Therefore, we need no longer include <have_boost_redef.hpp> .  The
header will be removed at a later time.
2013-06-20 23:14:39 +02:00
Markus Blatt
b3f24972cc Fixed spelling 2013-06-20 17:01:35 +02:00
Markus Blatt
c87b98abbb Unifies the way how AMG is called.
After this patch one can set the prolongation factor for all
AMG calls and the number of smoothing steps for all except
of FastAMG that currently only supports on step.
2013-06-20 16:55:07 +02:00
Markus Blatt
97b8203773 Merge remote-tracking branch 'upstream/master' 2013-06-20 16:07:58 +02:00
Bård Skaflestad
2b4298f366 Merge pull request #261 from rolk/261_parse
Sideport of OPM/opm-material@48f6d4d to opm-core
2013-06-20 04:55:27 -07:00
Bård Skaflestad
e3577085c2 Add CMake backwards compatibility for version < 2.8.3
Add features that aren't available in early versions of the 2.8.x
release series, enabling use of 2.8.0 if needed (e.g. Ubuntu 10.04)
2013-06-20 13:30:57 +02:00
Lars Vingli Odsæter
f8bad8fd92 Change verbosity level of warning message in transport solver
Don't print message "s was clamped in some cells" unless preprocessor
symbol 'VERBOSE' is set.
2013-06-20 13:30:23 +02:00
Bård Skaflestad
79b180976f Merge pull request #260 from rolk/260_auto
Sideport of OPM/opm-material@7298744 to opm-core
2013-06-20 04:27:49 -07:00
Andreas Lauser
8f6df1ebf9 Test if the auto keyword is supported 2013-06-20 13:22:02 +02:00
Andreas Lauser
20fcad55c5 Fixed spelling mistake 2013-06-20 13:20:58 +02:00
Markus Blatt
4c49da33ad Merge remote-tracking branch 'origin/master' 2013-06-19 14:56:34 +02:00
Markus Blatt
5072014198 Merge remote-tracking branch 'upstream/master'
Conflicts:
	opm/core/linalg/LinearSolverIstl.cpp
2013-06-19 14:55:50 +02:00
Markus Blatt
a5313ec301 Merge remote-tracking branch 'upstream/master' 2013-06-18 10:48:28 +02:00
Bård Skaflestad
4273ce4dd3 Merge pull request #259 from rolk/259_withwarn
Recognize lib dirs that may be used later
2013-06-17 04:54:55 -07:00
Roland Kaufmann
4cd16438ea Recognize lib dirs that may be used later
This let you specify a bunch of directory names on the command line
to *all* packages, without getting annoying warnings that they are
defined but not used.
2013-06-15 22:11:14 +02:00
Bård Skaflestad
2c85189c6c Merge pull request #258 from rolk/258_nolto
Disable link-time, whole program optimization
2013-06-14 01:10:56 -07:00
Bård Skaflestad
28406d287d Include flag for enabling link-time optimizations
When LTO is disabled by default, we need a flag to re-enable it.
2013-06-14 08:54:32 +02:00
Roland Kaufmann
bfeac75fa9 Disable link-time, whole program optimization
When using LTO, the linker calls back to the compiler to figure out
where a certain symbol is defined. However, in many versions there
is apparently a bug that is triggered if a template in inlined in
both a used library and in the main program, but with different
versions of the compiler. The Boost exception class is particular
prone for this.

Thus, we disable the -lto from the development builds by default;
if anyone wants to test of the behaviour of their own compiler, they
must now explicitly turn on this flag.
2013-06-13 23:19:27 +02:00
Bård Skaflestad
5cf50de0c5 Merge pull request #254 from totto82/newfluid2
A test for the blackoil fluid based on the [p,r] interface
2013-06-10 06:50:37 -07:00
Tor Harald Sandve
e1e37c8b8c Merge pull request #1 from bska/totto82-newfluid2
Correct a few minor issues in PR OPM/opm-core#254
2013-06-10 06:45:41 -07:00
Bård Skaflestad
1b3670084f Merge pull request #255 from rolk/255_repo
Use science repo on SuSE, recommend ERT on Debian
2013-06-06 03:26:58 -07:00
Roland Kaufmann
0e814274d4 Provide instructions for installing ERT on SuSE
We just reuse the RedHat-repo containing precompiled libraries.
2013-06-06 10:03:50 +02:00
Roland Kaufmann
056e98716e Recommend ERT also on Debian
Using ERT will give a more full-featured toolkit, and we already
recommend adding the PPA repository.
2013-06-06 09:17:29 +02:00
Roland Kaufmann
f853d8ad0a Get all SuSE packages from repo if necessary
For older OpenSuSE versions (12.1 comes to mind), the packages mentioned
here are only available in the repository and not the base distro, so we
should start out by adding it instead of doing it later in the process.
2013-06-06 09:06:10 +02:00
Bård Skaflestad
f5d67fafc8 Favour std::vector<> over variably-sized arrays.
Variably-sized arrays of the form

   int n = 6;
   double a[n];

are an extension to the language that will illicit a suitably
persnickety diagnostic from GCC when invoked with "-pedantic".
2013-06-05 17:14:33 +02:00
Bård Skaflestad
61caec19d4 Merge pull request #248 from rolk/248_m4
Replace remnants of original autotools config with m4 that imports the CMake config
2013-06-05 07:43:13 -07:00
Bård Skaflestad
f16b9f10e7 Mark deck as FIELD units.
The numbers in the deck are more indicative of FIELD unit conventions
than METRIC unit conventions, so allow the input parser to interpret
the data in that manner.
2013-06-05 12:24:23 +02:00
Bård Skaflestad
fdf8a0ddcb Indent lists using <tab> rather than <space>.
This is the convention used throughout the .cmake files of OPM-Core.
2013-06-05 12:18:21 +02:00
Tor Harald Sandve
a89b081ac0 A test that compares the blackoil fluid based on the [p,r] interface
with the blackoil fluid based on the [p,z] interface
2013-06-05 11:21:47 +02:00
Atgeirr Flø Rasmussen
4a3ba3f7d6 Merge pull request #252 from bska/dont-run-non-unit-tests
Dont run non unit tests
2013-06-03 08:19:28 -07:00
Bård Skaflestad
278a054019 Don't build/run "test_newfluidinterface.cpp" during "make test"
The executable is not written as a unit test (e.g., using Boost.Test)
and furthermore requires external data (in a very specific location).
This makes it inappropriate for use during "make test", but it could
(and should) be cleaned up and incorporated into the test portfolio at
a later time.
2013-06-03 17:07:53 +02:00
Bård Skaflestad
f4588ff7b4 Merge remote-tracking branch 'upstream/master' 2013-06-03 17:05:04 +02:00
Bård Skaflestad
32091a5fc7 Merge pull request #251 from atgeirr/rockcomp
Add transMult(), poroMultDeriv() and transMultDeriv() to RockCompressibility.
2013-06-03 07:58:14 -07:00
Atgeirr Flø Rasmussen
eac83e6fd2 Add transMult(), poroMultDeriv() and transMultDeriv(). 2013-06-03 14:33:18 +02:00
Bård Skaflestad
7a7787f05c Merge remote-tracking branch 'upstream/master' 2013-06-03 09:59:19 +02:00