Markus Blatt c282949400 Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support ... Manually resolved conflicts: opm/core/io/eclipse/EclipseWriter.cpp opm/core/io/eclipse/EclipseWriter.hpp opm/core/props/BlackoilPropertiesFromDeck.cpp opm/core/simulator/initState_impl.hpp opm/core/wells/WellsManager.cpp opm/core/wells/WellsManager.hpp		2014-03-27 15:27:11 +01:00
..
linalg	Include fastamg.hh for dune-istl 2.3	2014-03-19 19:51:17 +01:00
pressure	Changed open / close behaviour of well_controls: 1) well_controls has an explicit open_close flag. 2) Will NOT flip current value to change open|close status	2014-03-04 20:23:19 +01:00
props	Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support	2014-03-27 15:27:11 +01:00
simulator	Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support	2014-03-27 15:27:11 +01:00
tof	convert users of MESSAGE to OPM_MESSAGE	2013-09-05 13:04:38 +02:00
transport	Remove unneeded term, fixing oil injecting behaviour.	2013-10-04 13:16:02 +02:00
utility	Added support for computePoreVolume for grids apart from UnstructuredGrid.	2014-02-25 15:12:16 +01:00
wells	Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support	2014-03-27 15:27:11 +01:00
well_controls.h	Changed open / close behaviour of well_controls: 1) well_controls has an explicit open_close flag. 2) Will NOT flip current value to change open|close status	2014-03-04 20:23:19 +01:00
wells.h	Merge remote-tracking branch 'upstream/opm-parser-integrate' into wellsmanager-rates	2014-01-30 09:50:09 +01:00