Commit Graph

3806 Commits

Author SHA1 Message Date
Joakim Hove
9b8e02a621 Added method equals in BlackoilState.hpp 2013-10-28 17:42:32 +01:00
Arne Morten Kvarving
28060b694d update packaging 2013-10-22 13:12:55 +02:00
Bård Skaflestad
e02a0b1139 Merge pull request #415 from atgeirr/bump-version
Bump version numbers.
2013-10-21 06:16:01 -07:00
Atgeirr Flø Rasmussen
823cc64c78 Bump version numbers.
Since there are a few new APIs and features, but no major changes,
it seems proper to move from 1.0 to 1.1, even though strict
backward compatibility cannot be expected.

Label bumped to 2013.10.
2013-10-21 13:53:29 +02:00
Bård Skaflestad
84f442bfd1 Merge pull request #413 from rolk/413_inst
Install header-only pkgconfig file to generic lib/
2013-10-21 04:13:48 -07:00
Bård Skaflestad
64ac686e8e Merge pull request #411 from rolk/411_doc
Reduce amount of boilerplate in Doxylocal
2013-10-21 04:03:12 -07:00
Roland Kaufmann
ac042e426f Install header-only pkgconfig file to generic lib/
The previous version assumed that we had libraries, and thus always
installs the .pc file in the multi-arch library directory. However,
we now have modules which does not have a library, but whose header
files still need to be located. Since the lib/ directory is usually
in the pkgconfig search path, it is natural to put them there.
2013-10-17 09:39:59 +02:00
Bård Skaflestad
ca427092bd Merge pull request #412 from atgeirr/fix-rockcomp
Fix bug in RockCompressibility class.
2013-10-16 05:31:00 -07:00
Atgeirr Flø Rasmussen
d06c8a53d9 Bugfix: vector was used with size zero. 2013-10-16 14:02:15 +02:00
Roland Kaufmann
16b459f31d Remove options that are stored in the common template
The Doxylocal file now only contains things that are specific to this
project (although most projects still does it like this)
2013-10-16 11:43:02 +02:00
Roland Kaufmann
41be11ebd8 Specify dir. layout and stylesheets in common templates
These options should be common to all OPM modules to get the same look
for the generated documentation.
2013-10-16 11:43:02 +02:00
Bård Skaflestad
0531ef357b Merge pull request #410 from rolk/410_static
Allow static linking for SuiteSparse to be forced
2013-10-11 05:22:16 -07:00
Roland Kaufmann
f0b2f82069 Allow static linking for SuiteSparse to be forced
If -DSUITESPARSE_USE_STATIC=ON, then the build system will only look for
static versions of the libraries that are part of SuiteSparse, even if
dynamic/shared versions are present on the system. Thus, the default of
preferring dynamic libraries can be overridden.

SuiteSparse is rarely built ourselves, but still uncommon enough to not
be present on computing clusters.

This patch allows us to install the libraries on a workstation, for
instance from package suitesparse-devel and link to it statically
without having to maintain our own build tree.
2013-10-10 19:53:16 +02:00
Bård Skaflestad
4ec7c2bc67 Merge pull request #408 from rolk/408_sizet
Use unsigned when iterating through vector indices
2013-10-09 07:15:51 -07:00
Roland Kaufmann
13d145fc1d Use unsigned when iterating through vector indices
A vector can of course never contain a negative number of elements, so
naturally size() returns size_t instead of a regular int. This costs us
a warning unless we also change the loop counter (since it is only used
to index that vector).
2013-10-09 15:09:14 +02:00
Bård Skaflestad
c1c6f5256b Merge pull request #407 from karbor/master
Changed EclipseGridParser and CornerpointChopper to handle NTG
2013-10-09 05:05:22 -07:00
Kari B. Skjerve
09e572a15e changes after pull to opm/opm-core 2013-10-09 13:23:24 +02:00
Kari B. Skjerve
99a599be94 Merge remote-tracking branch 'upstream/master' 2013-10-08 17:40:37 +02:00
Kari B. Skjerve
97bdba139f Only output NTG if not synthetic 2013-10-08 17:39:42 +02:00
Bård Skaflestad
fc8b727ee7 Merge pull request #406 from rolk/406_name
Pass BUILDNAME and SITE options along to CTest/CDash
2013-10-08 08:11:21 -07:00
Kari B. Skjerve
d53e06ec7c Changed EclipseGridParser and CornerpointChopper to handle NTG 2013-10-08 16:33:19 +02:00
Roland Kaufmann
315f42104e Pass BUILDNAME and SITE options along to CTest/CDash
By passing these options through ./configure, one can use dunecontrol
to build a complete stack and still get a customized description in
CDash (such as when building in a cluster or VM where the actual machine
name does not matter, or when you want to add key options to the name
shown) without having to run a second configuration just to set those
in the cache.

Also fixes a bug where --with-cmake would skip any further option
specified after it.
2013-10-08 14:54:39 +02:00
Bård Skaflestad
b5387bae69 Merge pull request #405 from rolk/405_mpi
Enable MPI if path is given
2013-10-07 06:43:57 -07:00
Roland Kaufmann
cbece4a5ec Enable MPI if path is given
Assume that ./configure --with-mpi= also implies --enable-mpi; if you
absolutely want to specify path without enabling (?!) then you can do
--with-mpi=... --disable-mpi (in that order).

This patch look for anything after the equal sign of the --with
parameter and only set the variable _MPI_PREFIX_PATH if that is given;
it always toggle USE_MPI.
2013-10-07 14:46:07 +02:00
Bård Skaflestad
e243306340 Merge pull request #404 from atgeirr/fix-initblackoilsurfvol
Guard against erroneous use of initBlackoilSurfvol().
2013-10-07 04:45:07 -07:00
Atgeirr Flø Rasmussen
0800bd9e33 Modify error message. 2013-10-07 12:57:51 +02:00
Atgeirr Flø Rasmussen
170a1dc956 Guard against erroneous use of initBlackoilSurfvol(). 2013-10-07 12:46:35 +02:00
Atgeirr Flø Rasmussen
83c6d5255b Merge pull request #386 from totto82/propsMRST
Changes to the props in order to  sync with MRST (Eclipse)
2013-10-07 03:41:09 -07:00
Bård Skaflestad
e8e42c6ef1 Merge pull request #401 from atgeirr/fix-oilinjection
Fix oil injecting behaviour of TransportSolverTwophaseReorder.
2013-10-04 04:50:24 -07:00
Atgeirr Flø Rasmussen
9c7ca19c8b Merge pull request #402 from rolk/401_dsym
Use dSYM bundles as debugging containers (on MacOS X)
2013-10-04 04:44:23 -07:00
Roland Kaufmann
6644e9a1b9 Use dSYM bundles as debugging containers (on MacOS X)
gdb on MacOS X does not seem to be very fond of "flat" dSYM files, but
it can read the bundle variant fine. Thus we change that to enable
debugging across several tools.
2013-10-04 13:28:31 +02:00
Atgeirr Flø Rasmussen
97f94cb269 Remove unneeded term, fixing oil injecting behaviour.
The 'comp_term' is supposed to be a total divergence term, which is supposed
to be zero for incompressible flow. It was added for improved robustness in
stagnant areas, but as implemented it would not be computed properly for
oil injection scenarios, due to the convention for two-phase transport
source terms (positive terms are inflow of first phase [water], negative
terms are total outflow).
2013-10-04 13:16:02 +02:00
Atgeirr Flø Rasmussen
12d5bf64bf Merge pull request #395 from bska/nullptr-deref
Fix null-pointer dereference during well construction
2013-10-03 06:52:25 -07:00
Atgeirr Flø Rasmussen
8eca49cde2 Merge pull request #400 from bska/Wunused
Remove unused "typedef"s
2013-10-03 06:52:09 -07:00
Bård Skaflestad
19ac69bd6b Merge pull request #399 from rolk/399_macosx
Add instructions on how to build prerequisites on MacOS X
2013-10-03 05:50:43 -07:00
Atgeirr Flø Rasmussen
ef861b44e9 Merge pull request #396 from bska/resv-injectors
Tentative solution to problem of RESV injectors in `ifs_tpfa.c`
2013-09-27 05:52:40 -07:00
Bård Skaflestad
fdc6c7b6ed Remove unused "typedef"s
CLang and recent versions of GCC warn about unused "typedef"s.  This
change-set removes currently known instances in opm-core.
2013-09-26 19:22:59 +02:00
Roland Kaufmann
9dbe8dbe9c Instructions on how to build prerequisites on MacOS X
Although it is possible using the GNU toolchain, there is
probably a larger base which has the Apple toolchain and want to
use that.
2013-09-26 14:42:08 +02:00
Bård Skaflestad
3fd6a41de5 Merge pull request #394 from andlaus/fix_spline_monotonic
Spline: fix a few issues with the monotonic() methods
2013-09-26 04:52:16 -07:00
Andreas Lauser
bbf5a9767a spline: actually return something in evalDerivative() in the extrapolate case
once more, thanks to @bska to catching this!
2013-09-26 13:32:20 +02:00
Andreas Lauser
fc6503d2e7 spline: use evalDerivative_() instead of evalDerivative() if the segment index is known
thanks to @bska for catching this!
2013-09-26 13:28:13 +02:00
Bård Skaflestad
d0f3821c9a Merge pull request #392 from rolk/392_quiet
Add option to suppress output in SimulatorIncompTwophase
2013-09-26 04:20:44 -07:00
Roland Kaufmann
5f25339890 Disable output to console if parameter quiet = true
If the standard output is not desirable, it can be suppressed and
custom output can be written through the timestep_completed event
instead.
2013-09-26 12:37:02 +02:00
Roland Kaufmann
afdb330d54 Provide stream that ignores everything written to it
Use this stream when you want a straight code path, but also be able
to disable output at will.
2013-09-26 12:37:02 +02:00
Bård Skaflestad
88b447daca assemble_well_contrib(): Fix misprint in comment. 2013-09-25 15:39:37 +02:00
Bård Skaflestad
6a31f54a6e RESV: Ignore phase distribution for non-PRODUCERs
The WellsManager class handles INJECTORS by assigning a phase
distribution (W->ctrls[i]->distr) that coincides with the injected
fluid for the corresponding well (e.g., {1,0,0} for WATER injectors in
a three-phase WATER/OIL/GAS simulation).  This, however, meshes poorly
with the restriction that all phase components must be ONE in the case
of wells constrained by total reservoir volume flow targets (RESV)
that was introduced in commit b7d1634.

This change-set limits the restriction on phase distributions to
PRODUCERs only and is a tentative solution to GitHub PR #360.
2013-09-25 15:38:55 +02:00
Bård Skaflestad
794673d7b4 Fix null-pointer dereference during well construction
The three-argument WellsManager constructor needs access to the real
permeability field lest a null-pointer dereference result when the
problem actually contains any wells.
2013-09-25 15:11:14 +02:00
Andreas Lauser
d1bd0f24e4 Spline: fix a few issues with the monotonic() methods
This should fix the common case where the curve is non-constant within
an intervall. I'm not really sure whether it's correct in all corner
cases, though.

this fixes the eWoms test case for the blackoil model which failed in
debug mode due to some asserts incorrectly triggering...
2013-09-25 15:02:33 +02:00
Bård Skaflestad
8added1bc8 Merge pull request #390 from andlaus/fix_averages
fix the averages wrt negative values and divisions by zero
2013-09-25 02:17:18 -07:00
Andreas Lauser
3ac996debe fix the averages wrt negative values and divisions by zero
it could be discussed whether it's better to throw a
std::runtime_error instead...
2013-09-25 11:04:23 +02:00