Commit Graph

2603 Commits

Author SHA1 Message Date
Markus Blatt
a953a47fbb Removed DUNE artefacts.
Now uses AX_BLAS instead of ACX_BLAS.
2012-10-08 10:55:53 +02:00
Atgeirr Flø Rasmussen
d799898aec Merge pull request #50 from bska/link-boost-explicitly-where-needed
Link Boost.Filesystem Explicitly Where Needed.
2012-10-08 00:53:39 -07:00
Atgeirr Flø Rasmussen
4b70a08cac Merge pull request #47 from bska/expand-well-treatment
Expand Well Treatment
2012-10-08 00:18:37 -07:00
Markus Blatt
4529673c76 Adapted my changes to the changes Bard made, to make opm-core link on Debian. 2012-10-05 15:01:30 +02:00
Markus Blatt
35c657d9a0 Merge remote-tracking branch 'bard/link-boost-explicitly-where-needed' into superlu-support
This fixes the errors on Debian when linking the examples.
2012-10-05 14:14:52 +02:00
Markus Blatt
9d0f385e02 Make opm-core compile with boost on my Debian system 2012-10-05 12:28:13 +02:00
Bård Skaflestad
5e8f87d4fa Link Boost.Filesystem explicitly where needed.
While libopmcore, following commit 37e14f, depends on (and references)
Boost.Filesystem (through the $(BOOST_FILESYSTEM_LIB) macro) this
indirect dependency is not sufficient to satisfy the requirements of
targets that use the indirect libraries directly.

Additional details at
   https://fedoraproject.org/wiki/UnderstandingDSOLinkChange
2012-10-05 12:07:13 +02:00
Bård Skaflestad
5a27f2ca12 Merge pull request #45 from atgeirr/ert
Keeping ert branch up-to date

Builds fine.  Thanks.
2012-10-05 01:41:33 -07:00
Bård Skaflestad
e6ab4ec4c8 Add debugging assertions to check input in several routines. 2012-10-05 10:17:12 +02:00
Bård Skaflestad
fde2d25c86 Clone wells object when constructing from existing.
This installs a measure of safety on the part of the interface in that
the caller is free to dispose of the wells object upon returning from
the WellsManager constructor.
2012-10-05 10:15:06 +02:00
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
Markus Blatt
0db6439b9b Merged latest changes from upstream branch 2012-10-05 10:11:31 +02:00
Atgeirr Flø Rasmussen
5b6dd72cc2 Merge branch 'master' into reorder_tof 2012-10-05 09:20:37 +02:00
Atgeirr Flø Rasmussen
2c8b47b143 Merge branch 'master' into ert
Conflicts:
	Makefile.am
2012-10-05 09:20:04 +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
416086db2e 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-04 21:09:47 +02:00
Markus Blatt
694890e0cf Added missing m4 file with the test for SuperLU 2012-10-04 11:39:49 +02:00
Markus Blatt
ae52de0426 Added test for SuperLU and adapted the Makefile.am to support it 2012-10-04 11:37:28 +02:00
Bård Skaflestad
403c64aaeb Merge pull request #41 from atgeirr/ert
Thanks for keeping the branch up-to-date.
2012-10-03 02:42:14 -07:00
Atgeirr Flø Rasmussen
dd8b444bf5 Merge branch 'master' into reorder_tof 2012-10-03 10:05:53 +02:00
Atgeirr Flø Rasmussen
4b01cf53dd Merge branch 'master' into ert
Conflicts:
	opm/core/grid/cpgpreprocess/preprocess.h
2012-10-03 10:00:58 +02:00
Bård Skaflestad
862160c378 Merge remote-tracking branch 'upstream/master' 2012-10-02 20:30:13 +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
fb8ade64c1 Merge remote-tracking branch 'upstream/master' 2012-10-02 19:30:31 +02: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