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

..

Makefile.am

Don't link in Fortran support libraries

2012-07-10 13:38:33 +02:00

refine_wells.cpp

Added program refine_wells.

2012-05-24 09:18:37 +02:00

scaneclipsedeck.c

Conform to C90 standard (don't mix declaration and code).

2011-12-08 16:40:43 +01:00

sim_2p_incomp_reorder.cpp

Merge remote-tracking branch 'upstream/master'

2012-08-21 12:47:52 +02:00

sim_wateroil.cpp

Gravity segregation column solver for compressible case implemented.

2012-08-14 11:25:59 +02:00

spu_2p.cpp

Added writing of timings in param format

2012-08-21 09:57:36 +02:00

wells_example.cpp

Constructors of *FromDeck classes now take an UnstructuredGrid.

2012-08-10 10:12:45 +02:00