Atgeirr Flø Rasmussen
3e294a4a81
Formatting fixes.
2012-09-03 15:07:03 +02:00
Xavier Raynaud
eca2b4aea5
Merge remote-tracking branch 'upstream/master'
2012-09-03 14:57:11 +02:00
Xavier Raynaud
5aeb24433d
Added missing initialization of gravity in constructor.
2012-09-03 14:55:19 +02:00
Atgeirr Flø Rasmussen
b93bb4fcf9
Added copyright and license statement.
2012-09-03 14:37:28 +02:00
Atgeirr Flø Rasmussen
592b1cf743
Minor warning, formatting and comment fixes.
2012-09-03 14:31:02 +02:00
Atgeirr Flø Rasmussen
5dd3b2a673
Minor formatting fixes.
2012-09-03 14:17:36 +02:00
Atgeirr Flø Rasmussen
dff5716718
Documented new constructor. Fixed layout.
2012-09-03 14:16:54 +02:00
Atgeirr Flø Rasmussen
055f2d5f19
Whitespace cleanup and adding a check for #phases <= 3.
2012-09-03 14:04:52 +02:00
Atgeirr Flø Rasmussen
e37f003cb5
Added more checks in 3-phase init code.
2012-09-03 13:54:50 +02:00
Atgeirr Flø Rasmussen
142f186b81
Merge remote-tracking branch 'hnil/master'
2012-09-03 13:40:33 +02:00
Bård Skaflestad
f1de088af9
Merge remote-tracking branch 'upstream/master'
2012-09-03 13:27:50 +02:00
Atgeirr Flø Rasmussen
154571c768
Merge branch 'master' into nonuniform_fluid_tables
2012-09-03 13:12:11 +02:00
Xavier Raynaud
eef234b59a
Removed redundant header file include.
2012-09-03 12:55:10 +02:00
Atgeirr Flø Rasmussen
736dc2a238
Merge pull request #23 from xavierr/master
...
Changes needed by polymer solver.
2012-09-03 03:27:56 -07:00
Xavier Raynaud
87dc7affc5
Fixed comment.
2012-09-03 12:26:22 +02:00
Xavier Raynaud
596c988126
Improve documentation.
2012-09-03 11:29:48 +02:00
Halvor Møll Nilsen
ed2aa9da38
Introduced posibility to change number of sample points for pvt.
...
Did change the PVTW calculation so derivatives are exact.
Extended the test functions for pvt and relperm
2012-08-31 17:01:07 +02:00
Bård Skaflestad
3ef78dff64
Add debugging assertions to check input in several routines.
2012-08-29 15:15:55 +02:00
Bjørn Spjelkavik
4294431584
Defined private member function 'getNumericErtFields' in class 'EclipseGridParser'
...
The function stores data from one file from keyword IMPORT.
The file in 'fortio' format is read by ERT-functions.
2012-08-29 13:36:57 +02:00
Bjørn Spjelkavik
8694794aae
Added private member function getNumericErtFields
2012-08-29 11:28:23 +02:00
Xavier Raynaud
4d800cad3d
Added functionality to compute porosity for compressible fluid.
2012-08-29 10:54:21 +02:00
Halvor Møll Nilsen
7b1501cead
Added new SatFuncSimple fluid.
...
Introduced a simple fluid which has no problem with strange black oil behavior.
Intended for testing, but for now it is used in SaturationPropsFromDeck.
2012-08-28 16:41:06 +02:00
Bård Skaflestad
5b9c835510
Add a simple test to demonstrate grid input.
...
Should be extended to test that the input is sane, too.
2012-08-28 16:05:44 +02:00
Bård Skaflestad
e870c7726e
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-08-28 16:03:26 +02:00
Halvor Møll Nilsen
16f6d71a4e
Changed cmake file from listing all files to glob.
...
Due to structure of the code some files need to be removed. This is not optimal.
AGMG support is not integrated.
The CMakeFile make it easy to use opm-core in qtcreator.
2012-08-28 14:31:54 +02:00
Halvor Møll Nilsen
48360d23a1
Added param initializer on fluids with param to addjust table length.
...
Moved internal class SatFunc to SatFuncStone2.
2012-08-28 14:27:14 +02:00
Xavier Raynaud
84c75c5045
Corrected comment.
2012-08-28 13:12:54 +02:00
Xavier Raynaud
e000b02282
Merge remote-tracking branch 'atgeirr/master'
2012-08-28 08:44:38 +02:00
Atgeirr Flø Rasmussen
a74cd8e2c0
Enable choice of spline-smoothed saturation props (or not).
2012-08-27 17:56:01 +02:00
Atgeirr Flø Rasmussen
69cc72eec9
Merge branch 'master' into reorder_tof
2012-08-27 17:02:50 +02:00
Atgeirr Flø Rasmussen
15962a61a2
Merge branch 'master' into nonuniform_fluid_tables
2012-08-27 17:02:32 +02:00
Atgeirr Flø Rasmussen
547dc1648c
Added class SinglePvtDead, add parameter 'props_use_spline' to simulators.
...
Recall that the class that used to be called SinglePvtDead has
been renamed to SinglePvtDeadSpline. If 'props_use_spline' is true,
that class is used (this is the default), which makes a monotone
spline that is uniformly, densely sampled. The new class simply
uses linear interpolation in the input tables.
2012-08-27 16:48:21 +02:00
Bård Skaflestad
2b7ca36228
Merge remote-tracking branch 'upstream/master'
2012-08-27 15:37:07 +02:00
Bård Skaflestad
e300e316b2
Merge pull request #22 from atgeirr/master
...
Multiple changes to simulators and solvers
2012-08-27 05:52:12 -07:00
Atgeirr Flø Rasmussen
c920c83c76
Renamed class SinglePvtDead -> SinglePvtDeadSpline.
2012-08-27 14:00:12 +02:00
Xavier Raynaud
a63064bc94
Merge remote-tracking branch 'atgeirr/master'
2012-08-27 13:32:55 +02:00
Atgeirr Flø Rasmussen
1c0a67cfed
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
README
2012-08-27 13:32:10 +02:00
Xavier Raynaud
c93380b52f
Changed private->protected and added virtual to make class derivation.
2012-08-27 13:19:04 +02:00
Atgeirr Flø Rasmussen
80e54a93d0
Switch loop ordering for better cache performance.
2012-08-27 13:17:27 +02:00
Halvor Møll Nilsen
a6dcc52cba
Started work on supporting 3 phases for wellreport.
2012-08-27 12:22:32 +02:00
Halvor Møll Nilsen
ea09af47f4
Added programs to test test fluids.
2012-08-27 12:21:25 +02:00
Halvor Møll Nilsen
88d1d9762d
Addes support for initialisation of three phases using SWOF and SGOF
2012-08-27 12:20:03 +02:00
Roland Kaufmann
53130fec18
Add dependencies on Debian and build instructions for Dune
...
On Debian Squeeze/Ubuntu Precise, the DUNE libraries does not come
pre-compiled, so the instructions should show how to download the
DUNE prerequisite library and how to compile it, using its special
system.
2012-08-27 11:37:45 +02:00
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
