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

2162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Atgeirr Flø Rasmussen
7984bd5024 Merge remote-tracking branch 'xavier/rock_comp_tpfa' into rock_comp_tpfa 2012-08-22 08:53:37 +02:00
Xavier Raynaud
a8eefa4a4c Merge remote-tracking branch 'atgeirr/rock_comp_tpfa' into rock_comp_tpfa 2012-08-21 17:14:06 +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
Ivar Ursin Nikolaisen
462c7cf8e3 Add parentheses to c1 assignment for consistency. 2012-08-21 15:15:40 +02:00
Bård Skaflestad
d1fef7c0df Merge pull request #18 from atgeirr/master 
Improvements to Simulator* class.
 2012-08-21 06:10:46 -07: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
fe0581b69b Preserve sorting order. 2012-08-21 14:09:44 +02:00
Atgeirr Flø Rasmussen
80bba295ce Merge remote-tracking branch 'xavier/rock_comp_tpfa' into rock_comp_tpfa 2012-08-21 12:49:08 +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
Bård Skaflestad
d2e6125570 Merge pull request #17 from hnil/master 
Added output of timing in param format.
 2012-08-21 02:28:41 -07: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
Xavier Raynaud
6db144ec65 Fixed sign error and replaced porevol->porevol0. 2012-08-21 10:20:59 +02:00
Halvor Møll Nilsen
29c6be6752 Added writing of timings in param format 2012-08-21 09:57:36 +02:00
Atgeirr Flø Rasmussen
98c8e6a294 Merge remote-tracking branch 'xavier/rock_comp_tpfa' into rock_comp_tpfa 2012-08-20 16:09:20 +02:00
Atgeirr Flø Rasmussen
1678bcad7f Merge branch 'master' into rock_comp_tpfa 2012-08-20 16:08:15 +02:00
Atgeirr Flø Rasmussen
1170727f1e Renamed SimulatorTwophase -> SimulatorIncompTwophase. 2012-08-20 15:45:05 +02:00
Xavier Raynaud
9e480cd997 Fix initialization bug. 2012-08-20 15:18:24 +02:00
Xavier Raynaud
f15a6e03f0 Added common root name for vtk file names. 2012-08-20 15:14:01 +02:00
Atgeirr Flø Rasmussen
bbf2b4f369 Changed name of parameter output file to 'simulation.param'. 2012-08-20 14:46:51 +02:00
xavier
d706f4ea36 Merge remote-tracking branch 'atgeirr/rock_comp_tpfa' into rock_comp_tpfa 2012-08-20 11:04:56 +02:00
Bård Skaflestad
9a44eababc Merge pull request #16 from atgeirr/master 
Added parameter output_vtk.
 2012-08-17 05:14:56 -07:00
Atgeirr Flø Rasmussen
427fb67e9b Merge remote-tracking branch 'upstream/master' 2012-08-17 13:58:13 +02:00
Atgeirr Flø Rasmussen
a23f8d1706 Added parameter output_vtk. 
Defaults to true, if false do not write .vtu output.
 2012-08-17 13:54:19 +02:00
Atgeirr Flø Rasmussen
f3169d7dc5 Merge branch 'master' into rock_comp_tpfa 2012-08-17 12:55:41 +02:00
Bård Skaflestad
21b33e40d7 Merge pull request #15 from atgeirr/master 
Modifications to compressible transport solver, other minor mods.
 2012-08-17 03:49:30 -07:00
Atgeirr Flø Rasmussen
9a1bcaf496 Whitespace cleanup. 2012-08-17 12:40:15 +02:00
Atgeirr Flø Rasmussen
8fa0140e66 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	opm/core/simulator/SimulatorTwophase.cpp
 2012-08-17 11:31:59 +02:00
Atgeirr Flø Rasmussen
f582627f2a Merge pull request #14 from hnil/master 
Corrected use of boost header.
 2012-08-17 02:26:51 -07:00