Markus Blatt ebc86bc624 Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support ...

Manually resolved conflicts in:
	opm/core/io/eclipse/EclipseWriter.cpp
	opm/core/io/eclipse/EclipseWriter.hpp
	opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp

2014-04-08 21:50:00 +02:00

..

CornerpointChopper.hpp

Added support of SWCR and SOWCR in CornerpointChopper

2014-03-11 14:51:23 +01:00

EclipseGridInspector.cpp

convert THROW to OPM_THROW

2013-09-05 13:04:37 +02:00

EclipseGridInspector.hpp

replace boost::array by std::array

2013-07-30 17:46:32 +02:00

EclipseGridParser.cpp

Read keyword PLYSHEAR.

2014-03-14 15:34:38 +08:00

EclipseGridParser.hpp

Read keyword PLYSHEAR.

2014-03-14 15:34:38 +08:00

EclipseGridParserHelpers.hpp

convert users of the ASSERT and the ASSERT2 macros to standard assert()

2013-09-05 13:04:37 +02:00

EclipseUnits.hpp

Moved opm/core/eclipse/* to opm/core/io/eclipse/*.

2013-03-07 22:59:06 +01:00

EclipseWriter.cpp

Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support

2014-04-08 21:50:00 +02:00

EclipseWriter.hpp

Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support

2014-04-08 21:50:00 +02:00

SpecialEclipseFields.hpp

Read keyword PLYSHEAR.

2014-03-14 15:34:38 +08:00

writeECLData.cpp

convert THROW to OPM_THROW

2013-09-05 13:04:37 +02:00

writeECLData.hpp

Remove trailing whitespaces

2013-07-28 08:34:13 -03:00