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

933 Commits

Author SHA1 Message Date
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
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
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
a63064bc94 Merge remote-tracking branch 'atgeirr/master' 2012-08-27 13:32:55 +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
88d1d9762d Addes support for initialisation of three phases using SWOF and SGOF 2012-08-27 12:20:03 +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
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
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
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
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
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
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
ae66fe74e3 New class SimulatorCompressibleTwophase. 2012-08-22 10:37:52 +02:00
Xavier Raynaud
6fd14bd76a Update surface volume in transport solver. 2012-08-22 10:11:32 +02:00
Atgeirr Flø Rasmussen
d3641baf75 Minor comment fix. 2012-08-22 09:05:54 +02:00
Xavier Raynaud
c949319bf1 Corrected bug (residual should not be divided by dt). 2012-08-21 17:12:07 +02:00
Xavier Raynaud
22fa63e6c4 Changed way to get total number of cells. 2012-08-21 17:10:49 +02:00
Xavier Raynaud
c431df3d77 Corrected typo in comment. 2012-08-21 17:09:19 +02:00
Bård Skaflestad
a3ac364ea2 Merge pull request #19 from Ivarun/fix_associativity_bug_in_get_zcorn_sign 
Fix associativity bug in get_zcorn_sign
 2012-08-21 06:47:35 -07:00
Halvor Møll Nilsen
66dea391a8 added writing of reorder iterations for each cell 2012-08-21 15:23:46 +02:00
Ivar Ursin Nikolaisen
462c7cf8e3 Add parentheses to c1 assignment for consistency. 2012-08-21 15:15:40 +02:00
Atgeirr Flø Rasmussen
81ca766b86 Fix pressure renormalization conditions. Some formatting fixes. 
Checking for both rock compressibility and pressure conditions
is necessary before we renormalize pressure.
 2012-08-21 14:52:43 +02:00
Ivar Ursin Nikolaisen
aaae8e170b Fix associativity bug in get_zcorn_sign 
The bug can also cause c2 to be larger than the length of
actnum, leading to segmentation faults.
 2012-08-21 14:15:49 +02:00
Atgeirr Flø Rasmussen
87ce47f70d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	examples/sim_2p_incomp_reorder.cpp
	opm/core/simulator/SimulatorIncompTwophase.cpp
 2012-08-21 12:47:52 +02:00
Atgeirr Flø Rasmussen
d9444d0dfb Added well constraint checking to SimulatorIncompTwophase. 
- Changed Wells constructor arg for SimulatorIncompTwophase to WellsManager.
 - Insert checking code for well constrains (mostly copied from spu_2p.cpp).
Unrelated to the above changes.
 - Added pressure normalization for incompressible case (from spu_2p.cpp)
 2012-08-21 10:51:14 +02:00
Xavier Raynaud
cbffe7203a Merge remote-tracking branch 'atgeirr/rock_comp_tpfa' into rock_comp_tpfa 2012-08-21 10:42:35 +02:00