Markus Blatt 21864388bd Merge remote-tracking branch 'origin/opm-parser-integrate' into refactor-for-cpgrid-support ... Resolved Conflicts: opm/core/props/BlackoilPropertiesFromDeck.cpp opm/core/props/rock/RockFromDeck.hpp opm/core/props/satfunc/SaturationPropsFromDeck.hpp opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp		2014-02-19 15:22:18 +01:00
..
InjectionSpecification.cpp	make config.h the first header to be included in any compile unit	2013-04-10 12:56:14 +02:00
InjectionSpecification.hpp	Renamed newwells.h -> wells.h.	2013-03-18 10:33:34 +01:00
ProductionSpecification.cpp	Remove trailing whitespaces	2013-07-28 08:34:13 -03:00
ProductionSpecification.hpp	Remove trailing whitespaces	2013-07-28 08:34:13 -03:00
well_controls.c	Merge remote-tracking branch 'upstream/opm-parser-integrate' into wellsmanager-rates	2014-01-30 09:50:09 +01:00
WellCollection.cpp	Removed the previously introduced getAndUnRootChild method	2014-02-14 13:46:54 +01:00
WellCollection.hpp	Removed the previously introduced getAndUnRootChild method	2014-02-14 13:46:54 +01:00
wells.c	Merge remote-tracking branch 'upstream/opm-parser-integrate' into wellsmanager-rates	2014-01-30 09:50:09 +01:00
WellsGroup.cpp	Added an else to avoid unnecessary checking.	2014-02-14 09:01:21 +01:00
WellsGroup.hpp	Create WellsGroupInterface from opm-parser Well/Group objects	2014-02-12 15:39:57 +01:00
WellsManager.cpp	Merge remote-tracking branch 'origin/opm-parser-integrate' into refactor-for-cpgrid-support	2014-02-19 15:22:18 +01:00
WellsManager.hpp	Merge remote-tracking branch 'origin/opm-parser-integrate' into refactor-for-cpgrid-support	2014-02-19 15:22:18 +01:00