Skip to content

Commit

Permalink
Update include/deal.II/trilinos/nox.templates.h
Browse files Browse the repository at this point in the history
Co-authored-by: Martin Kronbichler <martin.kronbichler@uni-a.de>
  • Loading branch information
tamiko and kronbichler committed Jun 23, 2023
1 parent 2a64a1e commit 8897fb6
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions include/deal.II/trilinos/nox.templates.h
Original file line number Diff line number Diff line change
Expand Up @@ -1161,21 +1161,21 @@ namespace TrilinosWrappers
ExcNOXNoConvergence());
}
}
// See if NOX returned by triggering an exception.
#if DEAL_II_TRILINOS_VERSION_GTE(4, 2, 0)
// Starting with Trilinos version 4.2.0 NOX started to throw a
// See if NOX returned by triggering an exception.
# if DEAL_II_TRILINOS_VERSION_GTE(14, 2, 0)
// Starting with Trilinos version 14.2.0 NOX started to throw a
// std::runtime_error instead of a plain char*.
catch (const std::runtime_error &exc)
{
const char *s = exc.what();
#else
# else
// In a sign of generally poor software design, NOX prior to Trilinos
// version 4.2.0 throws an exception that is not of a class derived
// from std::exception, but just a char*. That's a nuisance -- you just
// have to know :-(
catch (const char *s)
{
#endif
# endif
// Like above, see if NOX aborted because there was an exception
// in a user callback. In that case, collate the errors if we can
// (namely, if the user exception was derived from std::exception),
Expand Down

0 comments on commit 8897fb6

Please sign in to comment.