opm-core/examples
Atgeirr Flø Rasmussen 00bbfa06a8 Merge branch 'master' into ert
Conflicts:
	Makefile.am
	configure.ac
	examples/Makefile.am
	opm/core/GridManager.cpp
	opm/core/eclipse/EclipseGridParser.cpp
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am
2012-09-05 13:36:19 +02:00
..
Makefile.am Merge branch 'master' into ert 2012-09-05 13:36:19 +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_comp_reorder.cpp Merge branch 'master' into nonuniform_fluid_tables 2012-09-04 11:42:31 +02:00
sim_2p_incomp_reorder.cpp Fix pressure renormalization conditions. Some formatting fixes. 2012-08-21 14:52:43 +02:00
sim_wateroil.cpp Merge branch 'master' into nonuniform_fluid_tables 2012-09-04 11:42:31 +02:00
spu_2p.cpp Merge branch 'master' into ert 2012-09-05 13:36:19 +02:00
wells_example.cpp Constructors of *FromDeck classes now take an UnstructuredGrid. 2012-08-10 10:12:45 +02:00