opm-core/opm/core/io
Markus Blatt eeb0039683 Merge branch 'refactor-for-cpgrid-support' into master-refactor-for-cpgrid-support
Manually resolved conflicts in:
	opm/core/props/BlackoilPropertiesFromDeck.cpp
	opm/core/wells/WellsManager.cpp
2014-03-13 13:41:45 +01:00
..
eclipse Merge branch 'refactor-for-cpgrid-support' into master-refactor-for-cpgrid-support 2014-03-13 13:41:45 +01:00
vag Remove trailing whitespaces 2013-07-28 08:34:13 -03:00
vtk convert users of the ASSERT and the ASSERT2 macros to standard assert() 2013-09-05 13:04:37 +02:00
OutputWriter.cpp Propagate initial state to the writer as well 2013-11-26 22:34:42 +01:00
OutputWriter.hpp Do without the timestep index adjustment 2013-11-27 00:24:30 +01:00