Bård Skaflestad d23c93e661 Merge from upstream.

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

..

fluid

Accounting for (constant) formation volume factor in incompressible fluids.

2012-04-20 14:00:38 +02:00

linalg

Fix bug: mistakenly swapped macros.

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

pressure

Merge from upstream.

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

transport/reorder

Make column gravity Gauss-Seidel solver report average number of iterations.

2012-04-19 11:46:41 +02:00

utility

Remove a variable rendered unused by change-set 5a9bf9f4a8b9.

2012-05-09 11:27:23 +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

Made state before init() valid (0.0 water sat, 1.0 oil sat).

2012-04-02 15:41:13 +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

Added correct handling of VREP and REIN keyword. No longer generates a warning, just a friendly hint.

2012-05-09 16:03:21 +02:00

WellsGroup.hpp

Added simple reinjection to group control (explicit)

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

WellsManager.cpp

Merge from upstream.

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

WellsManager.hpp

Merge from upstream.

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