OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-16 18:01:56 -06:00
Code Issues Packages Projects Releases Wiki Activity
17,160 Commits 24 Branches 102 Tags 90 MiB
6afee54ec0
Commit Graph

5005 Commits

Author SHA1 Message Date
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