Joakim Hove d176de0075 Merge remote-tracking branch 'upstream/opm-parser-integrate' into wellsmanager-rates ...

Conflicts:
	opm/core/wells/WellsManager.cpp

2014-01-30 09:50:09 +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

convert users of the ASSERT and the ASSERT2 macros to standard assert()

2013-09-05 13:04:37 +02:00

WellCollection.hpp

use std::shared_ptr instead of boost::shared_ptr

2013-08-08 13:25:58 +02:00

wells.c

Merge remote-tracking branch 'upstream/opm-parser-integrate' into wellsmanager-rates

2014-01-30 09:50:09 +01:00

WellsGroup.cpp

Implemented well_control based on well_controls_iset_xxx() functions.

2014-01-06 12:40:03 +01:00

WellsGroup.hpp

use std::shared_ptr instead of boost::shared_ptr

2013-08-08 13:25:58 +02:00

WellsManager.cpp

Merge remote-tracking branch 'upstream/opm-parser-integrate' into wellsmanager-rates

2014-01-30 09:50:09 +01:00

WellsManager.hpp

Compdat extraction from new CompletionXXX classes

2014-01-29 11:58:13 +01:00