Markus Blatt c6daebc35d 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

..

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

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

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

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

WellsGroup.hpp

Create WellsGroupInterface from opm-parser Well/Group objects

2014-02-12 15:39:57 +01:00

WellsManager_impl.hpp

Merge branch 'refactor-for-cpgrid-support' into master-refactor-for-cpgrid-support

2014-03-13 13:41:45 +01:00

WellsManager.cpp

Merge branch 'refactor-for-cpgrid-support' into master-refactor-for-cpgrid-support

2014-03-13 13:41:45 +01:00

WellsManager.hpp

Merge branch 'refactor-for-cpgrid-support' into master-refactor-for-cpgrid-support

2014-03-13 13:41:45 +01:00