]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Update include/deal.II/trilinos/nox.templates.h
authorMatthias Maier <tamiko@43-1.org>
Fri, 23 Jun 2023 12:58:55 +0000 (12:58 +0000)
committerMatthias Maier <tamiko@43-1.org>
Fri, 23 Jun 2023 13:00:43 +0000 (08:00 -0500)
Co-authored-by: Martin Kronbichler <martin.kronbichler@uni-a.de>
include/deal.II/trilinos/nox.templates.h

index b3e4bee8fef99bdb2cf73ae975116401545cc4b2..64470a2da03b156e9c85a6b3c67f266cadc5ccc3 100644 (file)
@@ -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),

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.