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
