Joakim Hove 3e2df33a65 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

..

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_shadow.cpp

Provide way of shadowing only some properties

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

test_wellcontrols.cpp

Added functions to get type, target and distr of *current* control.

2014-01-06 14:40:03 +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_wellsmanager.cpp

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

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

testBlackoilState1.DATA

Added very simple parser test to check a parser can be instantiated and a simple file parsed

2013-11-14 12:52:12 +01:00

testBlackoilState2.DATA

Added test with accompanying data for Blackoilstate::equals()

2013-10-28 17:43:29 +01:00

testFluid.DATA

Mark deck as FIELD units.

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

wells_manager_data_expanded.data

Changed data file not not have same perforation multiple times, as the old system doesn't support this

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

wells_manager_data.data

Added test_wellmanager which loads wellmanager from deck and tests many values.

2014-01-03 16:00:57 +01:00

wetgas.DATA

Added pvt functionality for wetgas

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