Markus Blatt 472844e454 Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support ... Removed conflicts in opm/core/wells/WellsManager.cpp that were due to the change ```diff - pd.well_index = WellsManagerDetail::computeWellIndex(radius, cubical, cell_perm, completion->getDiameter()); + pd.well_index = WellsManagerDetail::computeWellIndex(radius, cubical, cell_perm, completion->getSkinFactor()); ``` in WellsManager::createWellsFromSpecs which moved from WellsManager.cpp to WellsManager_impl.hpp file in a previous commit.		2014-04-04 21:21:22 +02: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 the access to Parser/EclipseState/Schedule to use new well injection and production properties. To be aligned with opm-parser:e75970a28b96374409a55e3e6cea2198b6a0ea23	2014-03-21 00:35:15 +01:00
WellsGroup.hpp	Create WellsGroupInterface from opm-parser Well/Group objects	2014-02-12 15:39:57 +01:00
WellsManager_impl.hpp	Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support	2014-04-04 21:21:22 +02:00
WellsManager.cpp	Bugfix: skin factor, not diameter.	2014-03-31 14:47:16 +02:00
WellsManager.hpp	Removed last artefact of checkCellExistence (in constructor taking wells)	2014-03-29 10:35:12 +01:00