Commit Graph

2308 Commits

Author SHA1 Message Date
Halvor Møll Nilsen
e913456fa6 Added constuctor to WellManager which used Wells struct. 2012-10-05 10:14:55 +02:00
Bård Skaflestad
47ab22fce0 New function clone_wells()
Used to create a deep copy (clone) of an existing Wells object.

While here, add test case for common Wells object operations.
2012-10-05 10:14:44 +02:00
Atgeirr Flø Rasmussen
e79dba2714 Merge pull request #43 from bska/revamp-build-system-for-boost
Revamp Build System for Boost
2012-10-04 23:38:09 -07:00
Atgeirr Flø Rasmussen
b2ce32b329 Merge pull request #42 from bska/read-grid
Grid Input Support
2012-10-04 23:30:46 -07:00
Atgeirr Flø Rasmussen
f852ddba53 Merge pull request #44 from bska/tighten-lapack-and-mex
Tighten LAPACK and MEX Support

Good! I will make similar changes to LAPACK usage in opm-polymer.
2012-10-04 23:22:35 -07:00
Bård Skaflestad
811bfa7712 Remove MEX support.
This has not been used in a long time, and actually prevents using the
module in MEX.
2012-10-05 00:56:25 +02:00
Bård Skaflestad
5c9c9b9c59 Reference <grid.h> from canonical location.
The header was removed from this directory upon import from the
preexisting "opmtransport" repository.
2012-10-05 00:56:12 +02:00
Bård Skaflestad
6fd5c36cc9 Remove a derelict statement inherited from original implementation.
Disabled by default, this statement attempted to pass a std::istream to
function std::fclose() which is meaningless and should not be enabled at
any time--even for a MATLAB-related build.
2012-10-05 00:55:14 +02:00
Bård Skaflestad
203728109f Honour exact interfaces of LAPACK routines.
The size type, MAT_SIZE_T, is not necessarily equivalent to 'int'.
2012-10-05 00:54:33 +02:00
Bård Skaflestad
8a3593c372 Unequivocally exclude MATLAB timing printing.
It is not actually needed and prevents building when symbol
MATLAB_MEX_FILE is defined.
2012-10-05 00:53:59 +02:00
Bård Skaflestad
a6dc97a706 Honour exact interface of LAPACK routine DGTSV.
The "MAT_SIZE_T" is not necessarily equivalent to 'int'.
2012-10-05 00:53:47 +02:00
Bård Skaflestad
b1ec06293e Obtain Boost libraries from libopmcore.la .
Specifically, commit ff4f709e made the support for transitively
conveying interlibrary dependencies onto clients of OPM-Core more
robust.  As a consequence, we no longer need to explicitly link in the
Boost.System or Boost.Filesystem libraries to use the software contained
therein.
2012-10-05 00:37:38 +02:00
Bård Skaflestad
37e14f468e Encode Boost library location in OPM-Core's run-path.
Specifically, use the OPM_BOOST_LIBDIR variable created in commit
5c97e512 and Libtool's "-R" link-time switch to encode the library
location within OPM-Core's run-path.  This simplifies using the library,
because the onus of satisfying the library's link-time requirements is
removed from the client.

A second refinement puts the additional link-requirements (i.e., "-l"
and "-L" options) within the *_LIBADD primary.  This moves the libraries
from the middle to the end of the link statement.
middle.
2012-10-05 00:36:49 +02:00
Bård Skaflestad
b7c0ba8b1a Expose the Boost library directory to the build system.
This enables explicitly encoding the directory, e.g., in the OPM-Core
run-path.  This, in turn, reduces the burden on library clients that
would otherwise have to satisfy library link requirements in addition to
any other link requirements they might have.
2012-10-05 00:33:59 +02:00
Bård Skaflestad
233e3601a8 Simplify the logic to support --with-unit*=speciallib syntax
This change implements the approach of (e.g.,) ax_boost_system.m4, but
may lose some of the initial refinements.  In that case, we will have to
refine this code.
2012-10-05 00:33:27 +02:00
Bård Skaflestad
c1970ac90d allocate_grid_from_file(): Name magic constant (6)
The constant 6 is the number of array dimensions needed to successfully
allocate a grid.  While unlikely, this number may change in the future
and it is better to have a manifest constant (in this case, GRID_NMETA)
than a hard-coded number.
2012-10-05 00:25:00 +02:00
Bård Skaflestad
66ee40c809 Add a simple test to demonstrate grid input.
Should be extended to test that the input is sane, too.
2012-10-05 00:24:06 +02:00
Bård Skaflestad
bfdd9917a8 Add a utility for creating a grid from textual representation.
There is little to no error checking, and the importer assumes that the
grid is serialised more or less directly from the grid structure.

Intended use: Testing on non-uniform grids created in MRST.
2012-10-05 00:23:41 +02:00
Bård Skaflestad
de3b7f002f Merge pull request #40 from atgeirr/fix_mass_balance_report
Fix mass balance reports

Thanks.  Looks good.  No regressions in testing.
2012-10-02 11:28:23 -07:00
Bård Skaflestad
ec5c6ca791 Merge pull request #38 from atgeirr/mods_for_surfvol_src
Changing transport source convention

Tested locally.  No regressions.  Merged.

Long-term, we may need to do away with scalar source terms though--at least for black-oil type problems.
2012-10-02 10:28:49 -07:00
Atgeirr Flø Rasmussen
d9f9a73ba1 Merge pull request #39 from bska/tidy-cpgpreprocess
Document appropriate structure fields.
2012-10-02 07:32:44 -07:00
Bård Skaflestad
3108031bfd Document appropriate structure fields.
Commit 642eaf6 introduced the correct documentation, but mixed the order
of the 'zcorn' and 'actnum' documentation.  This commit corrects that
oversight.
2012-10-02 16:24:13 +02:00
Atgeirr Flø Rasmussen
64aab3cc49 Fix mass balance reporting.
Multiple issues:
  - now reporting surface volumes, not reservoir volumes,
  - fixed reporting for the case of multiple transport steps.
2012-10-02 15:47:47 +02:00
Atgeirr Flø Rasmussen
66fe242280 Fix volume reporting with multiple transport substeps. 2012-10-02 15:47:21 +02:00
Atgeirr Flø Rasmussen
0669a2dd8b Add explanatory comment. 2012-10-02 15:46:33 +02:00
Atgeirr Flø Rasmussen
594d2a68da Increase output precision for ascii dumps. 2012-10-02 14:39:12 +02:00
Atgeirr Flø Rasmussen
358e6e93b1 Update compressible transport solver for new src convention.
Namely, that inflowing transport sources are water *surface* volumes,
not water *reservoir* volumes.
2012-10-02 14:37:18 +02:00
Atgeirr Flø Rasmussen
8c24c40a2a Bugfix: size of vector for A should be np*np. 2012-10-02 14:35:28 +02:00
Atgeirr Flø Rasmussen
490b8c01d1 Change interface for (blackoil) computeInjectedProduced().
Also use new computeInjectedProduced() and computeTransportSource()
functions in SimulatorCompressibleTwophase.
2012-10-02 11:12:23 +02:00
Atgeirr Flø Rasmussen
84a87990ff Modified functions dealing with transport source.
In preparation for switching to new convention for inflow
sources in the compressible case: source being surface volumes,
not reservoir volumes.
2012-10-01 16:40:47 +02:00
Atgeirr Flø Rasmussen
b020b4759b Update WellState::perfPress() after pressure solve. 2012-10-01 16:40:10 +02:00
Atgeirr Flø Rasmussen
7f9ea9041a Added perfPress() to WellState. 2012-10-01 16:39:35 +02:00
Atgeirr Flø Rasmussen
a0e7f113f2 Merge pull request #36 from alfbr/master
Improve the README for ubuntu installation.
2012-09-27 13:48:50 -07:00
rustad
58b2c7731d Oops, line moved to correct location. 2012-09-27 21:41:49 +02:00
rustad
dde150ecdb Unauthenticated packages fails with -y option and repo update needed. 2012-09-27 21:36:09 +02:00
Atgeirr Flø Rasmussen
67f5c4ffcd Merge pull request #35 from bska/implement-surface-rate
Add Tentative Implementation of Surface-Rate Targets
2012-09-27 01:35:59 -07:00
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