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
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
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
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
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
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
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
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
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
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