Merge pull request #894 from andlaus/frankenstein_merge_master_v9

Frankenstein merge master v9
This commit is contained in:
Andreas Lauser
2016-11-04 13:58:12 +01:00
committed by GitHub
2 changed files with 10 additions and 3 deletions
+2 -2
View File
@@ -5,8 +5,8 @@
Module: opm-simulators
Description: Simulators and utilities for automatic differentiation
Version: 2016.10-pre
Label: 2016.10-pre
Version: 2017.04-pre
Label: 2017.04-pre
Maintainer: atgeirr@sintef.no
MaintainerName: Atgeirr F. Rasmussen
Url: http://opm-project.org
+8 -1
View File
@@ -166,7 +166,14 @@ namespace Opm
if( output_cout_ )
{
OpmLog::error(message.str());
// in some cases exceptions are thrown before the logging system is set
// up.
if (OpmLog::hasBackend("STREAMLOG")) {
OpmLog::error(message.str());
}
else {
std::cout << message.str() << "\n";
}
}
return EXIT_FAILURE;