Atgeirr Flø Rasmussen
69f8d98f8f
Increase output precision for ascii dumps.
2012-10-02 14:39:12 +02:00
Atgeirr Flø Rasmussen
bcc03ef41d
Change interface for (blackoil) computeInjectedProduced().
...
Also use new computeInjectedProduced() and computeTransportSource()
functions in SimulatorCompressibleTwophase.
2012-10-02 11:12:23 +02:00
Atgeirr Flø Rasmussen
d74f0a9c52
Add output of surface volume.
2012-09-14 09:51:28 +02:00
Xavier Raynaud
38bcaeb362
Changed solvegravity interface. Fixed bug.
2012-09-05 10:10:02 +02:00
Xavier Raynaud
845c100dcd
Fixed order of arguments in function call.
2012-09-04 11:39:17 +02:00
Xavier Raynaud
76e517516f
Added missing initialization of gravity in constructor.
2012-09-03 14:55:19 +02:00
Atgeirr Flø Rasmussen
ac1ec3e9ac
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
opm/core/simulator/SimulatorIncompTwophase.cpp
2012-08-24 13:31:05 +02:00
Halvor Møll Nilsen
0ed597fee9
Corrected typing pointed out by atgeirr in respose to pullrequest
2012-08-24 12:52:41 +02:00
Halvor Møll Nilsen
7f3cbc476a
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
opm/core/simulator/SimulatorIncompTwophase.cpp
2012-08-24 12:26:27 +02:00
Atgeirr Flø Rasmussen
def904c6d6
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
cf3511663c
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
4cdb2a43a3
Fixed renormalization conditions.
2012-08-23 14:05:28 +02:00
Atgeirr Flø Rasmussen
70d33843e4
Chase changes to some interfaces after merging.
2012-08-22 11:16:51 +02:00
Atgeirr Flø Rasmussen
1fc5c8988f
Merge branch 'rock_comp_tpfa'
2012-08-22 11:13:16 +02:00
Atgeirr Flø Rasmussen
87e4b017ed
New class SimulatorCompressibleTwophase.
2012-08-22 10:37:52 +02:00
Atgeirr Flø Rasmussen
7c313282c0
Minor comment fix.
2012-08-22 09:05:54 +02:00
Atgeirr Flø Rasmussen
f2f49c7132
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
Atgeirr Flø Rasmussen
2acaa970e1
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
8e80848486
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
Atgeirr Flø Rasmussen
d09e60820f
Merge remote-tracking branch 'xavier/rock_comp_tpfa' into rock_comp_tpfa
2012-08-20 16:09:20 +02:00
Atgeirr Flø Rasmussen
a86239d10c
Renamed SimulatorTwophase -> SimulatorIncompTwophase.
2012-08-20 15:45:05 +02:00
Atgeirr Flø Rasmussen
67c13e794a
Moved SimulatorTimer class to opm/core/simulator directory.
2012-06-14 14:02:22 +02:00