Atgeirr Flø Rasmussen 00bbfa06a8 Merge branch 'master' into ert ...

Conflicts:
	Makefile.am
	configure.ac
	examples/Makefile.am
	opm/core/GridManager.cpp
	opm/core/eclipse/EclipseGridParser.cpp
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am

2012-09-05 13:36:19 +02:00

..

bo_resprop_test.cpp

Merge branch 'master' into nonuniform_fluid_tables

2012-09-04 11:42:31 +02:00

extratestdata.xml

Now compiles parameter testcase, removed extraneous imported makefiles.

2011-12-19 16:02:51 +01:00

Makefile.am

Merge branch 'master' into ert

2012-09-05 13:36:19 +02:00

monotcubicinterpolator_test.cpp

Now detects boost and compiles some tests.

2011-12-19 15:26:26 +01:00

param_test.cpp

Use dynamic Boost.Test mode only if supported

2012-06-27 16:51:37 +02:00

pvt_test.cpp

Changed std::copy() statements to account for n != 1.

2012-09-04 13:00:51 +02:00

relperm_test.cpp

Fixed spontaneous grid structs, avoid variable-sized arrays.

2012-09-03 16:01:07 +02:00

sparsetable_test.cpp

Use dynamic Boost.Test mode only if supported

2012-06-27 16:51:37 +02:00

sparsevector_test.cpp

Use dynamic Boost.Test mode only if supported

2012-06-27 16:51:37 +02:00

test_agmg.cpp

Assert copyright.

2012-06-06 12:39:29 +02:00

test_cartgrid.cpp

Renamed all grid construction functions to create_grid_<something>().

2012-04-11 12:35:19 +02:00

test_cfs_tpfa.c

Adjust to new semantics of "struct FlowBoundaryCondtions".

2012-03-06 20:08:34 +01:00

test_column_extract.cpp

Use dynamic Boost.Test mode only if supported

2012-06-27 16:51:37 +02:00

test_ert.cpp

Added configure.ac + Makefile.am support for including ert

2012-06-27 08:06:22 +02:00

test_jacsys.cpp

Changed code to use new include path: <opm/core/...>

2011-12-12 11:28:09 +01:00

test_lapack.cpp

Added general linear lapack solver. Updated test for band matrices.

2012-03-23 15:44:32 +01:00

test_read_vag.cpp

Started on adding generation of other maps

2012-06-11 15:52:10 +02:00

test_readpolymer.cpp

Changed a print statement

2012-02-29 11:46:01 +01:00

test_sf2p.cpp

Changed code to use new include path: <opm/core/...>

2011-12-12 11:28:09 +01:00

test_writeVtkData.cpp

Moved writeVtkData() functions to utility/, added a test program.

2012-02-19 21:24:59 +01:00

testdata.xml

Now compiles parameter testcase, removed extraneous imported makefiles.

2011-12-19 16:02:51 +01:00

unit_test.cpp

Changed namespace Dune -> namespace Opm.

2012-01-19 13:50:57 +01:00