Markus Blatt 7fd5b65691 Merge remote-tracking branch 'upstream/master' into parallel-solver-support ...

Removed conflicts in:
	opm/core/linalg/LinearSolverIstl.cpp

2014-04-04 20:38:52 +02:00

..

liveoil.DATA

Added pvt functionality for wetgas

2014-01-10 16:07:02 +01:00

test_blackoilstate.cpp

Replaced include math.h with cmath, and changed from fabs to abs. Fixed an error in the testfile, a filename was wrong

2013-11-04 13:51:32 +01:00

test_dgbasis.cpp

Update to follow previous moves and deletes.

2013-03-18 12:40:34 +01:00

test_linearsolver.cpp

Increase verbosity such that we see the actual solve

2014-03-20 22:24:33 +01:00

test_parallel_linearsolver.cpp

Added support for the parallel solvers of dune-istl.

2014-03-20 21:59:29 +01:00

test_shadow.cpp

Provide way of shadowing only some properties

2013-07-30 13:11:52 +02:00

test_wellcollection.cpp

Changed the WellCollection addChild functions to be more specific, and strict

2014-02-13 16:00:39 +01:00

test_wellcontrols.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

test_wells.cpp

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

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

test_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

test_wellsmanager.cpp

Removed WellsManager constructor which takes an ole Eclipsegridparser instance.

2014-03-25 18:57:58 +01:00

testBlackoilState1.DATA

Merged upstream/master

2014-02-04 21:42:07 +01:00

testBlackoilState2.DATA

Fix fallout from PR #474

2014-01-31 14:24:02 +01:00

testFluid.DATA

Mark deck as FIELD units.

2013-06-05 12:24:23 +02:00

wells_group.data

Changed the WellCollection addChild functions to be more specific, and strict

2014-02-13 16:00:39 +01:00

wells_manager_data_expanded.data

Removed WELOPEN from constructor, added throwing on non OPEN/SHUT statuses

2014-02-06 16:31:35 +01:00

wells_manager_data_wellSTOP.data

Removed WELOPEN from constructor, added throwing on non OPEN/SHUT statuses

2014-02-06 16:31:35 +01:00

wells_manager_data.data

Added building of WellsCollection group structure from new opm-parser objects

2014-02-14 13:43:25 +01:00

wetgas.DATA

Added pvt functionality for wetgas

2014-01-10 16:07:02 +01:00