Bård Skaflestad d3f85ea60c Merge remote-tracking branch 'upstream/master' into ert ...

Conflicts:
	Makefile.am
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am

This brings ert branch up-to-date with current Github master branch.

2012-10-12 00:43:51 +02:00

opm/core

Merge remote-tracking branch 'upstream/master' into ert

2012-10-12 00:43:51 +02:00

tests

New function clone_wells()

2012-10-05 10:14:44 +02:00

Description

Simulator programs and utilities for automatic differentiation.

70 MiB

Languages

C++ 78.3%

ECL 17.7%

CMake 1.8%

Cuda 1.2%

Shell 0.5%

Other 0.5%