Atgeirr Flø Rasmussen a6c71288aa Merged.

2012-05-16 12:55:05 +02:00

..

fluid

Merged.

2012-05-16 12:55:05 +02:00

linalg

Fix bug: mistakenly swapped macros.

2012-04-13 16:36:51 +02:00

pressure

Merged.

2012-05-16 12:55:05 +02:00

transport/reorder

Simplified data structure for extracted columns.

2012-05-11 09:37:12 +02:00

utility

Added initStateBasic() overload taking BlackoilPropertiesInterface props.

2012-05-16 12:54:48 +02:00

InjectionSpecification.cpp

Included voidage_replacment in injection specification.

2012-05-09 15:54:25 +02:00

InjectionSpecification.hpp

Included voidage_replacment in injection specification.

2012-05-09 15:54:25 +02:00

newwells.h

Correct inaccuracy in WellControls::distr description.

2012-05-09 11:11:47 +02:00

ProductionSpecification.cpp

Changed enums, variable names and defaults.

2012-05-02 09:26:36 +02:00

ProductionSpecification.hpp

Added explicit number of ControlMode.

2012-05-09 14:26:30 +02:00

TwophaseState.hpp

Renamed initStateTwophaseFromDeck() -> initStateFromDeck().

2012-05-16 11:37:31 +02:00

well.h

Add field for specifying which surface volume fraction is injected.

2011-12-12 18:43:11 +01:00

WellCollection.cpp

Made relevant methods in WellCollection and WellsManager to call the reinjection control functions

2012-05-09 13:03:37 +02:00

WellCollection.hpp

Made relevant methods in WellCollection and WellsManager to call the reinjection control functions

2012-05-09 13:03:37 +02:00

WellsGroup.cpp

Remove unneeded debug output.

2012-05-16 09:24:34 +02:00

WellsGroup.hpp

Added simple reinjection to group control (explicit)

2012-05-09 12:57:36 +02:00

WellsManager.cpp

WCONINJE: Distinguish injectors based on first character only.

2012-05-16 00:50:23 +02:00

WellsManager.hpp

Merge from upstream.

2012-05-09 18:56:09 +02:00