OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-07-07 04:53:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into frankenstein_merge_master_v9

Browse Source 
* origin/master:
  dune.module: change version to 2017.04-pre
  FlowMain: make sure to always print exception messages to the terminal
This commit is contained in:
Andreas Lauser 2016-11-04 13:56:44 +01:00
commit 414dda420a
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dune.module
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

9
opm/autodiff/FlowMain.hpp
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;