Commit Graph

2272 Commits

Author SHA1 Message Date
Bård Skaflestad
cbc5f924bf Add tentative implementation of surface-rate targets.
Not tested at present.
2012-09-26 10:14:45 +02:00
Alf Birger Rustad
80a084e0cb Merge pull request #34 from atgeirr/new_threephase_relperm
Thanks for the clarifications.
2012-09-25 02:28:18 -07:00
Atgeirr Flø Rasmussen
6eb9720263 Guard against input error.
If no valid threephase_model is input, throw instead of crashing.
2012-09-24 17:09:50 +02:00
Atgeirr Flø Rasmussen
1dbcebefe5 Add support for new three-phase relperm option to BlackoilPropertiesFromDeck.
New parameter option added: 'threephase_model' can now be 'gwseg'.
2012-09-24 16:43:00 +02:00
Atgeirr Flø Rasmussen
b898e20420 Add new saturation function class SatFuncGwseg.
Based on a model where gas and water is segregated,
and oil equally present in both gas and oil zones.
2012-09-24 16:41:34 +02:00
Atgeirr Flø Rasmussen
653d03d997 Fix comment and indentation. 2012-09-24 16:40:56 +02:00
Atgeirr Flø Rasmussen
4794341d06 Merge pull request #32 from rolk/lt_init
Silence faulty warning from libtoolize about LT_INIT
2012-09-24 00:42:30 -07:00
Atgeirr Flø Rasmussen
2c9e2d08d9 Merge pull request #33 from rolk/fieldvec
Disable warning for using DUNE's FieldVector::size
2012-09-24 00:41:28 -07:00
Roland Kaufmann
398f58323f Disable warning for using DUNE's FieldVector::size
In DUNE 2.2 FieldVector::size changed from being a member to being a
method. A compatibility warning is issued if you include the relevant
headers.

This warning can be silenced for DUNE modules by using passing the
option --enable-fieldvector-size-is-method to ./configure. This patch
effectively does the same, but through a macro definition.
2012-09-24 00:21:06 +02:00
Roland Kaufmann
d8766f322a Make LT_INIT recognizable by autoconf
The LT_INIT macro is wrapped in an m4_ifdef to handle older versions of
libtool. However, the text scanning done by libtoolize cause a warning
if this statement does not match a particular search expression.

Writing the clause in this form makes the (false) warning go away.
2012-09-23 23:59:47 +02:00
Atgeirr Flø Rasmussen
7f1b49db48 Merge pull request #31 from rolk/local-pkgconf
Support for pkg-config
2012-09-21 06:09:27 -07:00
Roland Kaufmann
72c732746d Provide pkgconfig files for library
A boilerplate .pc file is provided in the lib/pkgconfig directory. Using
this location has the advantage of being in the same path relative to
the libraries as it will be in the installation. The drawback is that the
lib/ directory no longer contains just output unless one uses out-of-tree
builds.

In the root directory of the project a local .pc file is provided which
instead of the usual end-installation directory rather points to the
build and source directories. By adding the build directory to the
PKG_CONFIG_PATH environment variable, a local build can be referred to
from other projects (such as examples or specific test-cases).

Having two different files is unfortunately necessary since pkgconfig
does not support prefix rewriting on Linux, and having them in two
different directories is necessary since the AutoMake-generated files
is not capable of renaming a file, only relocating it.
2012-09-21 13:07:00 +02:00
Roland Kaufmann
510ca4995c Avoid leading space in package name
By having an M4 line comment ("dnl") at the end of the line after the
comma, it seems that the indentation is included in the string on the
next line (it does not start at the escaping bracket).

This whitespace should be removed so the PACKAGE define can be used in
for instance filenames.
2012-09-21 12:34:23 +02:00
Roland Kaufmann
b04753fee6 Ignore wrapper for lib.exe on Windows
This file is copied into the directory by newer versions of autoconf.
2012-09-21 11:20:19 +02:00
Roland Kaufmann
fdb66b1886 Ignore executable for sim_2p_comp_reorder example
Actually, it is a libtool wrapper script, but it is automatically
generated anyway.
2012-09-21 11:20:19 +02:00
Atgeirr Flø Rasmussen
91cc9e2ab4 Merge pull request #30 from bska/fix-impedance-mismatch
Fix Impedance Mismatch Between CompressibleTpfa and cfs_tpfa_residual
2012-09-20 14:33:06 -07:00
Bård Skaflestad
1251d5a7c3 Merge remote-tracking branch 'upstream/master' into fix-impedance-mismatch 2012-09-20 15:49:59 +02:00
Bård Skaflestad
fc195b8449 Interpret `wells != 0 && wells->W == 0'' as `no wells''.
The CompressibleTpfa class always passes a non-null `forces->wells'
object to the constructor, assembly, and reconstruction routines but
uses ``forces->wells->W == 0'' to signify a simulation model without
wells.  This is, arguably, an error in the CompressibleTpfa class but
one that does not require a lot of work to support in the
cfs_tpfa_residual module.

Insert the extra tests in an effort to honour the ``liberal in what you
accept, strict in what you produce'' principle.
2012-09-20 15:48:48 +02:00
Roland Kaufmann
f10d10e33e Add volumetic unit liter
For simulating laboratory experiments, liter is a more suitable base
unit than gallons or barrels.
2012-09-20 15:14:51 +02:00
Bård Skaflestad
0364072977 Merge pull request #29 from atgeirr/master
Handling shut wells, improved SWAT/SGAS init.
2012-09-20 06:09:33 -07:00
Bård Skaflestad
e7059d6116 Don't crash on models without wells.
The user will legitimately want to run models that do not specify wells
(e.g., using boundary conditions).  While we do not yet fully support
that configuration (no wells), we absolutely must not crash by
dereferencing null pointers or generating pointers into ::empty()
std::vector<>s.

This commit installs the required guards needed to avoid said failure
mode.
2012-09-20 15:03:38 +02:00
Atgeirr Flø Rasmussen
c221dca66c Fix treatment of WELOPEN keyword.
Now you can actually shut and open wells with WELOPEN. The following
caveats apply:
 - this may interact improperly with group controls,
 - dynamic usage of WCONINJE/WCONPROD should not be mixed with WELOPEN.
2012-09-20 14:35:03 +02:00
Atgeirr Flø Rasmussen
075df5bb1b Support shut wells in compressible tpfa solver. 2012-09-20 14:34:33 +02:00
Atgeirr Flø Rasmussen
8fdebccef6 Improve diagnostic output if crossflow is detected. 2012-09-20 14:33:57 +02:00
Roland Kaufmann
2e75b74909 Remove instructions for building DUNE from source
A large portion of the instructions was for building DUNE from source
without providing any real benefit for someone starting with OPM
development.

Instead provide a link to a repository where backports of the necessary
packages can be downloaded. This will hopefully enable beginners to get
up to speed faster.
2012-09-20 14:02:13 +02:00
Atgeirr Flø Rasmussen
e00f208608 Merge remote-tracking branch 'upstream/master' 2012-09-14 20:56:30 +02:00
Atgeirr Flø Rasmussen
4110e40b62 Typo fix. 2012-09-14 20:56:08 +02:00
Bård Skaflestad
9571b30556 Merge pull request #28 from atgeirr/master
Change well property calculation + minor changes
2012-09-14 08:35:18 -07:00
Atgeirr Flø Rasmussen
a6fccb6790 Made initialization from SWAT/SGAS etc. more robust and general. 2012-09-14 10:40:36 +02:00
Atgeirr Flø Rasmussen
b90b803b80 Changed well initialization and property calculation.
Bhp is now initialized to bhp target for bhp-controlled wells.
Mobilities and pvt properties are now calculated from
well perforation pressure and injection specifications for
injectors, producers still use cell properties as before.
2012-09-14 09:53:11 +02:00
Atgeirr Flø Rasmussen
75382c7f9e Fix error message. 2012-09-14 09:52:13 +02:00
Atgeirr Flø Rasmussen
373f628095 Add output of surface volume. 2012-09-14 09:51:28 +02:00
Atgeirr Flø Rasmussen
fa27792c45 Merge pull request #27 from xavierr/master
Fixes in compressible transport solver.
2012-09-05 05:19:42 -07:00
Xavier Raynaud
132880570b Fixed documentation. 2012-09-05 14:07:51 +02:00
Xavier Raynaud
e1fbe4430d Merge remote-tracking branch 'upstream/master' 2012-09-05 13:35:48 +02:00
Xavier Raynaud
04726d677d Fixed source term (measured at reservoir conditions). 2012-09-05 13:34:25 +02:00
Bård Skaflestad
d14943515e Merge pull request #25 from atgeirr/nonuniform_fluid_tables
Nonuniform fluid tables
2012-09-05 02:42:59 -07:00
Atgeirr Flø Rasmussen
2653a695bf Massive whitespace cleanup: entire fluid subdir. 2012-09-05 11:28:54 +02:00
Xavier Raynaud
417cd2fd0e Merge remote-tracking branch 'upstream/master' 2012-09-05 10:11:02 +02:00
Xavier Raynaud
19c7f516b1 Changed solvegravity interface. Fixed bug. 2012-09-05 10:10:02 +02:00
Xavier Raynaud
8ddbefd1ee Add initial guess in root solver for gravity residual. 2012-09-04 15:13:55 +02:00
Xavier Raynaud
783c97ef99 Use same search interval in computation of flux and gravity residuals. 2012-09-04 15:01:14 +02:00
Xavier Raynaud
8c9ba88454 Removed unappropriate conversion from water saturation to complete saturation. 2012-09-04 14:22:56 +02:00
Xavier Raynaud
964f61a438 Use porevolume of last step in computation of gravity residual. 2012-09-04 14:21:51 +02:00
Bård Skaflestad
25451498a4 Merge pull request #24 from atgeirr/three_phase_fluid_work
Three phase fluid work.
2012-09-04 04:50:13 -07:00
Atgeirr Flø Rasmussen
064d408b20 Merge branch 'master' into nonuniform_fluid_tables
Conflicts:
	opm/core/fluid/BlackoilPropertiesFromDeck.cpp
	opm/core/fluid/BlackoilPropertiesFromDeck.hpp
	opm/core/fluid/SaturationPropsFromDeck.cpp
2012-09-04 13:34:30 +02:00
Atgeirr Flø Rasmussen
95fac1074b Constified some local variables. 2012-09-04 13:15:26 +02:00
Atgeirr Flø Rasmussen
3fa259496b Fix stride bug in WellReport::push(). Use convert::to(). 2012-09-04 13:12:06 +02:00
Atgeirr Flø Rasmussen
d8bc458631 Minor cleanup. 2012-09-04 13:08:30 +02:00
Atgeirr Flø Rasmussen
72e13ffd0d Fix stride bug in SGAS/SWAT init. 2012-09-04 13:06:13 +02:00