Commit Graph

3905 Commits

Author SHA1 Message Date
Bård Skaflestad
6855f21af9 Merge pull request #389 from andlaus/fix_typo_in_findewoms
Findewoms.cmake: fix typo
2013-09-24 10:43:01 -07:00
Bård Skaflestad
74605d984e Catch up to opm-material reorganisation.
Specifically, file <opm/material/constants.hh> was renamed to
<opm/material/Constants.hpp> and this renaming must be reflected in
the CMake probes for opm-material.
2013-09-24 16:47:15 +02:00
Andreas Lauser
e256a233f0 Findewoms.cmake: fix typo
it's 'start.hh', not 'start.h'...
2013-09-24 15:49:50 +02:00
Tor Harald Sandve
d83c131b15 The initBlackoilStateFromDeck is now called only if RS is given in deck 2013-09-24 15:25:52 +02:00
Tor Harald Sandve
fa46810511 The old extrapolation code for the unsaturated table is no removed 2013-09-24 15:21:58 +02:00
Bård Skaflestad
35679649ae Merge pull request #388 from atgeirr/doc-wellreport
Documented WellReport and Watercut classes.
2013-09-24 05:49:32 -07:00
Atgeirr Flø Rasmussen
d5dd74aa9f Further improved WellReport and Watercut docs. 2013-09-24 14:39:41 +02:00
Atgeirr Flø Rasmussen
754ee7aa82 Documented WellReport and Watercut classes. 2013-09-24 14:14:54 +02:00
Bård Skaflestad
2800ce521b Merge pull request #387 from andlaus/change_material_and_ewoms_prerequisits
Change material and ewoms prerequisites
2013-09-24 04:44:52 -07:00
Bård Skaflestad
245ae65fb7 Merge pull request #385 from rolk/385_clang
Only use Clang-specific pragma if compiler is Clang
2013-09-24 04:09:40 -07:00
Andreas Lauser
0af1d9322f remove the dune-istl from the list of opm-material prerequisites
the only reason dune-istl was required was that the spline class used
ISTL's tridiagonal matrix. Since the spline class moved into the core
(along with a more capable tridiagonal matrix), ISTL is no longer
required by opm-material.
2013-09-24 11:49:30 +02:00
Andreas Lauser
06f0b302ca add opm-core to the ewoms prerequisites 2013-09-24 11:46:55 +02:00
Roland Kaufmann
f3877facb0 Only use Clang-specific pragma if compiler is Clang
Otherwise the compiler will probably give us a warning that these
pragmas are unknown. By default that warning is disabled with our
own build system, but we also want to be able to link to our library
without incorporating the entire build system too.
2013-09-24 11:15:26 +02:00
Tor Harald Sandve
ffd18adfa3 An initial guess of the surface volume is now computed using the RS
factor in order to compute a more accurate A matrix.
2013-09-24 11:14:22 +02:00
Tor Harald Sandve
62f81859cd Extend relperm and capilary pressure tables with constant values such
that the derivatives at the endpoints are zero
2013-09-24 11:14:22 +02:00
Tor Harald Sandve
badc3c0e9e Extrapolate unsaturated function values as in Eclipse and Mrst 2013-09-24 11:14:22 +02:00
Bård Skaflestad
b6e70da69a Merge pull request #384 from andlaus/include_tuple
include <tuple> in Spline.hpp
2013-09-23 06:40:48 -07:00
Andreas Lauser
a0c41819f7 include <tuple> in Spline.hpp
it seems like this is implicitly included by some other header, but
only in debug mode. *grr* thanks to @bska for catching this...
2013-09-23 15:21:39 +02:00
Atgeirr Flø Rasmussen
7a982833f6 Merge pull request #383 from andlaus/remove_constexpr_in_property_system
remove 'constexpr' from the property system
2013-09-23 04:55:02 -07:00
Andreas Lauser
c971e7c590 remove 'constexpr' from the property system
it is not really needed and unneccessarily breaks the build on gcc-4.4
2013-09-23 13:45:41 +02:00
Atgeirr Flø Rasmussen
d086ee5c63 Merge pull request #344 from andlaus/import_propertysystem
Import propertysystem
2013-09-23 04:18:02 -07:00
Bård Skaflestad
af1e3de84b Merge pull request #379 from rolk/379_famg
Fix LinearSolverIstl cleanup also for fast AMG branch
2013-09-23 01:31:04 -07:00
Alf Birger Rustad
4fe032576e Merge pull request #382 from rolk/382_dunemod
Search for dune.module in private installations
2013-09-20 06:37:19 -07:00
Roland Kaufmann
73d991adb4 Search for dune.module in private installations
When doing a private install of DUNE libraries, the dune.module file
is put in the lib/ directory, regardless of architecture.

This patch searches the lib/ directory as a catch-all after having
searched the platform-specific directories. This should minimize the
chance of hitting an accidentally unrelated dune.module.
2013-09-20 13:17:38 +02:00
Andreas Lauser
71e6638f04 className(): minor comment and guard macro name fixes 2013-09-20 12:45:10 +02:00
Andreas Lauser
1b3217ec4b className(): get rid of the ugly ClassNameHelper_ class
since full specialization of function templates is okay in C++ (only
partial specialization is not allowed for them).
2013-09-20 12:36:40 +02:00
Atgeirr Flø Rasmussen
eea3e3a4e3 Merge pull request #380 from rolk/380_spline
Fix small problems in spline testing code which give build errors
2013-09-20 03:22:31 -07:00
Andreas Lauser
c3cc059860 className(): remove unused argument object for the className(foo) variant
some compilers may warn about this under some circumstances.
2013-09-20 12:18:10 +02:00
Roland Kaufmann
8faf68dabb Replace int with size_t to avoid possible size mismatch 2013-09-20 10:53:47 +02:00
Roland Kaufmann
cbe232e880 Add missing header include 2013-09-20 10:51:18 +02:00
Atgeirr Flø Rasmussen
dd3c69032d Merge pull request #372 from rolk/372_spill
Update the CMake cache to reflect current settings
2013-09-20 01:51:06 -07:00
Atgeirr Flø Rasmussen
e6d80ae368 Merge pull request #378 from rolk/378_dunemod
Make finding and installing dune.module redux
2013-09-20 01:50:50 -07:00
Roland Kaufmann
44d1dac890 Fix LinearSolverIstl cleanup also for fast AMG branch
To avoid deprecation warnings the number of smoothing steps was passed
through the Criterion instead of directly to the constructor in commit
a7f32b934b.

However, due to an insufficient test matrix this was not tested using
the fast AMG variant of DUNE so it breaks the builds if
`-DHAS_DUNE_FAST_AMG` is defined.

This change should apply the same type of change to this branch as for
the others. The number of smoothing steps is put into a constant to
avoid the magic number 1 to appear in too many places (although I am
not sure the number for pre- and post-smoothing always should be the
same).
2013-09-20 10:00:21 +02:00
Roland Kaufmann
b09dd0894b Improve detection of dune.module
Remove lib/.libs/ and lib64/ as well as lib/ to find the prefix for the
installation root.
2013-09-20 09:37:33 +02:00
Roland Kaufmann
e661d18554 Improve troubleshooting for missing dune.module
If the library is found, but dune.module is not, we really should give
an error because the #ifdefs in the code will not work as intended.

Print the locations where we expect the library to appear to the console
for better tracking.
2013-09-20 09:37:33 +02:00
Andreas Lauser
d416ed279b add Exceptions.hpp to the list of public header files 2013-09-19 20:09:16 +02:00
Andreas Lauser
783950060d make sure the header files related to the property system are installed 2013-09-19 20:09:16 +02:00
Andreas Lauser
9733d9c995 add a test for the property system 2013-09-19 20:09:07 +02:00
Andreas Lauser
e15a28de68 add authors to the files according to git logs 2013-09-19 20:09:07 +02:00
Andreas Lauser
d5770b92ea Import the property system from eWoms 2013-09-19 20:08:59 +02:00
Andreas Lauser
9284edb16b import Dune's class name code 2013-09-19 20:00:14 +02:00
Atgeirr Flø Rasmussen
86d09115b9 Merge pull request #345 from andlaus/import_splines
Import splines
2013-09-19 10:26:02 -07:00
Andreas Lauser
0d0ab3bd5a refactor the spline code: merge everything into one class 2013-09-19 18:48:54 +02:00
Atgeirr Flø Rasmussen
3ef57842a9 Merge pull request #376 from rolk/376_warn
Quelch needless warnings (found by Clang)
2013-09-19 05:05:00 -07:00
Roland Kaufmann
13705d0394 Issue warning if unknown parameters are given 2013-09-19 13:10:16 +02:00
Roland Kaufmann
82cf04d9f1 Convert functions in anonymous namespace into statics
These functions are referred to from templates which may not be
instantiated. Since they were in an anonymous namespace they were
not reachable otherwise, and a warning is emitted. This only applies
to Clang; GCC consider them used.

If we make them static helper functions instead, the warning
disappears.
2013-09-19 13:10:16 +02:00
Roland Kaufmann
244c867505 Don't warn about functions not emitted
If a function is used by a template but this template is not
instantiated, the function will still be defined in the header
of a module but it won't be callable because it is in an anonymous
namespace and thus we get a warning.

This only happens in Clang; GCC consider functions referenced from
templates as used.

fixup! Don't warn about functions not emitted
2013-09-19 13:09:44 +02:00
Roland Kaufmann
a7f32b934b Set linear solver steps in criterion instead of ctor
The constructor that takes the number of steps is deprecated; this
generates needless warnings.
2013-09-19 10:32:49 +02:00
Roland Kaufmann
18fad484ed Use struct since that was the original declaration
Otherwise we get a warning later when the real thing is defined.
2013-09-19 10:00:31 +02:00
Andreas Lauser
c106385d9e move the new stuff to opm/core/utility 2013-09-18 23:02:16 +02:00