OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,465 Commits 9 Branches 35 Tags 15 MiB
aec8029e85
Commit Graph

2465 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
eeca5abed1 Implemented rudimentary solveMultiCell(). 
Simply calls solveSingleCell() once for each cell in block.
 2012-08-27 11:26:51 +02:00
Atgeirr Flø Rasmussen
8e5ef9ac0d Fixed bug in matrix multiplication (matrix has Fortran element order). 2012-08-27 11:19:22 +02:00
Atgeirr Flø Rasmussen
cd1edde45d Minor revision, mostly whitespace cleanup and comments. 2012-08-27 09:48:06 +02:00
Atgeirr Flø Rasmussen
dfef531fc8 Program compute_tof added. 2012-08-27 09:34:03 +02:00
Bård Skaflestad
ea802947cb Merge remote-tracking branch 'upstream/master' 2012-08-24 20:44:05 +02:00
Bård Skaflestad
0adb113669 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-08-24 20:31:13 +02:00
Bård Skaflestad
2a4fed5c28 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-08-24 20:31:13 +02:00
Bård Skaflestad
4422bdfb3e 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-08-24 20:31:13 +02:00
Bård Skaflestad
eb40bdee13 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-08-24 20:31:13 +02:00
Bård Skaflestad
86e25f127c Remove MEX support. 
This has not been used in a long time, and actually prevents using the
module in MEX.
 2012-08-24 20:31:13 +02:00
Bård Skaflestad
58ad0863cd Reference <grid.h> from canonical location. 
The header was removed from this directory upon import from the
preexisting "opmtransport" repository.
 2012-08-24 20:31:13 +02:00
Bård Skaflestad
d03c468623 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-08-24 20:31:13 +02:00
Bård Skaflestad
47f9fbd17d Honour exact interfaces of LAPACK routines. 
The size type, MAT_SIZE_T, is not necessarily equivalent to 'int'.
 2012-08-24 20:31:13 +02:00
Bård Skaflestad
47a0b56b96 Unequivocally exclude MATLAB timing printing. 
It is not actually needed and prevents building when symbol
MATLAB_MEX_FILE is defined.
 2012-08-24 20:31:13 +02:00
Bård Skaflestad
cf111e1b04 Honour exact interface of LAPACK routine DGTSV. 
The "MAT_SIZE_T" is not necessarily equivalent to 'int'.
 2012-08-24 20:31:13 +02:00
Halvor Møll Nilsen
36fb50e803 Corrected typing pointed out by atgeirr in respose to pullrequest 2012-08-24 20:31:13 +02:00
Halvor Møll Nilsen
3f5ffcd75a added writing of reorder iterations for each cell 2012-08-24 20:31:13 +02:00
Atgeirr Flø Rasmussen
6c34ddd59d Initial commit of tof computation by reordering. 2012-08-24 16:08:26 +02:00
Atgeirr Flø Rasmussen
12228d021a Merge remote-tracking branch 'hnil/master' 
Conflicts:
	opm/core/transport/reorder/TransportModelTwophase.cpp
	opm/core/transport/reorder/TransportModelTwophase.hpp
 2012-08-24 15:28:06 +02:00
Atgeirr Flø Rasmussen
c4608327cf Improved README in some small ways. 2012-08-24 13:46:16 +02:00
Halvor Møll Nilsen
b7e9fbe9a5 Corrected mistake from moving function calls. 2012-08-24 13:39:42 +02:00
Atgeirr Flø Rasmussen
7d0b9fc3b0 Minor code cleanup in TransportModelTwophase. 2012-08-24 13:31:23 +02:00
Atgeirr Flø Rasmussen
86962d6230 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	opm/core/simulator/SimulatorIncompTwophase.cpp
 2012-08-24 13:31:05 +02:00
Atgeirr Flø Rasmussen
fb31671b15 Merge pull request #20 from hnil/master 
Add writing of reorder iterations.
 2012-08-24 04:17:52 -07:00
Halvor Møll Nilsen
fd0d060ed8 Corrected typing pointed out by atgeirr in respose to pullrequest 2012-08-24 12:52:41 +02:00
Halvor Møll Nilsen
bf082c57b6 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	opm/core/simulator/SimulatorIncompTwophase.cpp
 2012-08-24 12:26:27 +02:00
Bård Skaflestad
c32d40c813 Merge remote-tracking branch 'upstream/master' 2012-08-24 08:59:17 +02:00
kristinf
5df2980f6d First attempt at README file 2012-08-24 08:56:05 +02:00
Atgeirr Flø Rasmussen
219cb17144 Merge remote-tracking branch 'upstream/master' 2012-08-24 08:22:08 +02:00
Atgeirr Flø Rasmussen
de55ae5d69 Merge remote-tracking branch 'xavier/master' 2012-08-24 08:21:58 +02:00
Atgeirr Flø Rasmussen
3f2d1773f5 Require DIMENS or SPECGRID also for DXV, DYZ etc. grid specs. 
Also check that dimensions are consistent.
 2012-08-24 08:19:24 +02:00
Atgeirr Flø Rasmussen
24a9b8b539 Removed unneeded function numGlobalCells(). 2012-08-24 08:18:59 +02:00
Xavier Raynaud
73fc6afab9 Merge remote-tracking branch 'atgeirr/master' 2012-08-23 15:25:19 +02:00
Bård Skaflestad
2b610dfce7 Assert that all cells are in range. 
This will (hopefully) prevent the issues fixed in commits aaae8e1 and
462c7cf from reoccurring.
 2012-08-23 15:25:04 +02:00
Bård Skaflestad
bb6563ffc0 Merge pull request #21 from Ivarun/automake_1.12_compatibility 
Make configure.ac compatible with automake 1.12
 2012-08-23 06:23:40 -07:00
Atgeirr Flø Rasmussen
af5cc531ef Use the start-of-timestep pore volume in transport solver. 
This is to improve consistency with other solvers, and relates
to the expression that is converted into a finite difference when
discretising:
  (phi s) - (phi s)^0 = phi^0(s - s^0) + (phi - phi^0)s
                        ^^^^^
The above marks the spot where we now use phi^0 instead of phi.
 2012-08-23 14:58:32 +02:00
Atgeirr Flø Rasmussen
26149c30a2 Fixed solveGravity(): now properly modifies surfacevolume. 
Also:
  - solveGravity() interface changed to take surface volume as a parameter,
  - gravity vector is now given in initGravity() instead of
    solveGravity(), for consistency with the incompressible solver.
 2012-08-23 14:45:23 +02:00
Ivar Ursin Nikolaisen
b448adff16 Make configure.ac compatible with automake 1.12 
Since automake 1.12 warnings in the category 'extra-portability' are
enabled with -Wall [1]. In automake 1.11.2 the AM_PROG_AR macro was
added and is required when compiling with extra-compatibility [2].

[1] http://lists.gnu.org/archive/html/automake/2012-04/msg00060.html
[2] http://lists.gnu.org/archive/html/automake/2011-12/msg00055.html
 2012-08-23 14:20:41 +02:00
Atgeirr Flø Rasmussen
2030c6a735 Added compressible 2-phase simulator, to replace sim_wateroil.cpp. 2012-08-23 14:07:11 +02:00
Atgeirr Flø Rasmussen
bab4f8cb57 Fixed renormalization conditions. 2012-08-23 14:05:28 +02:00
Atgeirr Flø Rasmussen
b0522a499a New singularPressure() method propagates singularity information. 2012-08-23 14:03:20 +02:00
Atgeirr Flø Rasmussen
e5d0bb98c1 Function cfs_tpfa_residual_assemble() and friends now return singularity flag. 
The singularity flag is true if there are no pressure conditions and no
compressibility (so the absolute values of the pressure solution will be
arbitrary).
 2012-08-23 14:00:04 +02:00
Atgeirr Flø Rasmussen
82204f2b3b Whitespace cleanup. 2012-08-23 08:59:09 +02:00
Atgeirr Flø Rasmussen
234d125266 Added computeSurfacevol() method. 
The method is called by the reordering transport solver after computing
new saturations in order to update the surface volumes.
 2012-08-23 08:57:48 +02:00
Xavier Raynaud
712f2ed16b Added comments on how to run the script generate_doc_figures.py. 2012-08-22 16:07:26 +02:00
Atgeirr Flø Rasmussen
a34fc775dd Document and check (primitive) for non-miscibility requirement. 2012-08-22 12:31:59 +02:00
Atgeirr Flø Rasmussen
f7dafe6c85 Chase changes to some interfaces after merging. 2012-08-22 11:16:51 +02:00
Atgeirr Flø Rasmussen
51d4e04d36 Merge branch 'rock_comp_tpfa' 2012-08-22 11:13:16 +02:00
Atgeirr Flø Rasmussen
856c33af74 Merge remote-tracking branch 'xavier/rock_comp_tpfa' into rock_comp_tpfa 2012-08-22 10:55:31 +02:00
Atgeirr Flø Rasmussen
ae66fe74e3 New class SimulatorCompressibleTwophase. 2012-08-22 10:37:52 +02:00