Bård Skaflestad
abd8973382
Merge remote-tracking branch 'upstream/master'
2012-09-04 13:58:43 +02:00
Atgeirr Flø Rasmussen
23ae62f8dc
Constified some local variables.
2012-09-04 13:15:26 +02:00
Atgeirr Flø Rasmussen
0f9d572f9a
Fix stride bug in WellReport::push(). Use convert::to().
2012-09-04 13:12:06 +02:00
Atgeirr Flø Rasmussen
14aab769f2
Fix stride bug in SGAS/SWAT init.
2012-09-04 13:06:13 +02:00
Atgeirr Flø Rasmussen
7c7609698f
Added proper Doxygen tags.
2012-09-04 12:52:17 +02:00
Atgeirr Flø Rasmussen
e9c4c2499c
Documented parameters.
2012-09-03 15:09:55 +02:00
Atgeirr Flø Rasmussen
4e1647bb62
Formatting fixes.
2012-09-03 15:07:03 +02:00
Atgeirr Flø Rasmussen
489501b49b
Documented new constructor. Fixed layout.
2012-09-03 14:16:54 +02:00
Atgeirr Flø Rasmussen
c2d41a6639
Whitespace cleanup and adding a check for #phases <= 3.
2012-09-03 14:04:52 +02:00
Atgeirr Flø Rasmussen
913054c473
Added more checks in 3-phase init code.
2012-09-03 13:54:50 +02:00
Atgeirr Flø Rasmussen
c409fcccce
Merge remote-tracking branch 'hnil/master'
2012-09-03 13:40:33 +02:00
Bård Skaflestad
ca428559ab
Merge remote-tracking branch 'upstream/master'
2012-09-03 13:27:50 +02:00
Xavier Raynaud
a8cb519d4e
Fixed comment.
2012-09-03 12:26:22 +02:00
Xavier Raynaud
0701daa4dc
Improve documentation.
2012-09-03 11:29:48 +02:00
Halvor Møll Nilsen
2dede29f20
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
b4a4e297a8
Added functionality to compute porosity for compressible fluid.
2012-08-29 10:54:21 +02:00
Halvor Møll Nilsen
6852be422c
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
94c04f343d
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
9aa349b1e5
Corrected comment.
2012-08-28 13:12:54 +02:00
Bård Skaflestad
bf70195448
Merge remote-tracking branch 'upstream/master'
2012-08-27 15:37:07 +02:00
Xavier Raynaud
22372710b8
Merge remote-tracking branch 'atgeirr/master'
2012-08-27 13:32:55 +02:00
Xavier Raynaud
af8a6fa7da
Changed private->protected and added virtual to make class derivation.
2012-08-27 13:19:04 +02:00
Atgeirr Flø Rasmussen
5182fef48d
Switch loop ordering for better cache performance.
2012-08-27 13:17:27 +02:00
Halvor Møll Nilsen
cf9b9cdf20
Started work on supporting 3 phases for wellreport.
2012-08-27 12:22:32 +02:00
Halvor Møll Nilsen
9ef6014964
Addes support for initialisation of three phases using SWOF and SGOF
2012-08-27 12:20:03 +02:00
Atgeirr Flø Rasmussen
9bb76d74cc
Fixed bug in matrix multiplication (matrix has Fortran element order).
2012-08-27 11:19:22 +02:00
Atgeirr Flø Rasmussen
0a8ac1ddb5
Minor revision, mostly whitespace cleanup and comments.
2012-08-27 09:48:06 +02:00
Bård Skaflestad
a8d75d2b25
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
c2a0b51365
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
Halvor Møll Nilsen
6390cceaa2
Corrected typing pointed out by atgeirr in respose to pullrequest
2012-08-24 20:31:13 +02:00
Halvor Møll Nilsen
7ee5d5e403
added writing of reorder iterations for each cell
2012-08-24 20:31:13 +02:00
Halvor Møll Nilsen
0da049f4c8
Corrected mistake from moving function calls.
2012-08-24 13:39:42 +02:00
Atgeirr Flø Rasmussen
46fb488410
Minor code cleanup in TransportModelTwophase.
2012-08-24 13:31:23 +02:00
Atgeirr Flø Rasmussen
3dfb2eb29b
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
opm/core/simulator/SimulatorIncompTwophase.cpp
2012-08-24 13:31:05 +02:00
Halvor Møll Nilsen
a26c6779c6
Corrected typing pointed out by atgeirr in respose to pullrequest
2012-08-24 12:52:41 +02:00
Atgeirr Flø Rasmussen
c7bbf1146c
Removed unneeded function numGlobalCells().
2012-08-24 08:18:59 +02:00
Atgeirr Flø Rasmussen
caff665c10
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
Atgeirr Flø Rasmussen
73949f892e
New singularPressure() method propagates singularity information.
2012-08-23 14:03:20 +02:00
Atgeirr Flø Rasmussen
983a29691c
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
e96421dbd7
Whitespace cleanup.
2012-08-23 08:59:09 +02:00
Atgeirr Flø Rasmussen
96327164cc
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
Atgeirr Flø Rasmussen
010715ad03
Document and check (primitive) for non-miscibility requirement.
2012-08-22 12:31:59 +02:00
Atgeirr Flø Rasmussen
2f03664408
Merge branch 'rock_comp_tpfa'
2012-08-22 11:13:16 +02:00
Xavier Raynaud
9ed0923279
Update surface volume in transport solver.
2012-08-22 10:11:32 +02:00
Xavier Raynaud
660f14df3b
Corrected bug (residual should not be divided by dt).
2012-08-21 17:12:07 +02:00
Xavier Raynaud
52ab67201d
Changed way to get total number of cells.
2012-08-21 17:10:49 +02:00
Xavier Raynaud
712ccb0309
Corrected typo in comment.
2012-08-21 17:09:19 +02:00
Halvor Møll Nilsen
5743225be2
added writing of reorder iterations for each cell
2012-08-21 15:23:46 +02:00
Xavier Raynaud
7e1e1e7951
Fixed sign error and replaced porevol->porevol0.
2012-08-21 10:20:59 +02:00
Halvor Møll Nilsen
50ff22141d
Added writing of timings in param format
2012-08-21 09:57:36 +02:00
