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

Browse Source

Manually resolved conflicts:
	opm/core/io/eclipse/EclipseWriter.cpp
	opm/core/io/eclipse/EclipseWriter.hpp
	opm/core/props/BlackoilPropertiesFromDeck.cpp
	opm/core/simulator/initState_impl.hpp
	opm/core/wells/WellsManager.cpp
	opm/core/wells/WellsManager.hpp

...

This commit is contained in:

Markus Blatt

2014-03-27 15:27:11 +01:00

parent 847f48aa78 62a0cf16c5

commit 8668ce7b71

32 changed files with 1367 additions and 1107 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1002

opm/core/io/eclipse/EclipseWriter.cpp

File diff suppressed because it is too large Load Diff