Commit Graph

3840 Commits

Author SHA1 Message Date
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
Roland Kaufmann
02165cd9d2 Merge pull request #391 from bska/find-opm-material
[Build System] Catch up to opm-material reorganisation.
2013-09-25 01:31:34 -07:00
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