[cig-commits] [commit] master: Adjust a few more places where we can produce better error messages. (9739ec6)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/aspect

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/2c1b4902b4b72e87b59f2456b9861b5102beca3c...3f763d389177ff99232a1c757ea52153b3f81be0

>---------------------------------------------------------------

commit 9739ec63c3cc23e0fc8acf8d8bd0d96cd8a9bdce
Author: Wolfgang Bangerth <bangerth at math.tamu.edu>
Date:   Fri Jan 16 09:43:11 2015 -0600

    Adjust a few more places where we can produce better error messages.
    
    These places were written with ExcNoConvergence in mind, but if the underlying
    Trilinos solver fails, we get an ExcMessage that was not printed.


>---------------------------------------------------------------

9739ec63c3cc23e0fc8acf8d8bd0d96cd8a9bdce
 source/simulator/solver.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/simulator/solver.cc b/source/simulator/solver.cc
index 4d29133..fe76c5b 100644
--- a/source/simulator/solver.cc
+++ b/source/simulator/solver.cc
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2011 - 2014 by the authors of the ASPECT code.
+  Copyright (C) 2011 - 2015 by the authors of the ASPECT code.
 
   This file is part of ASPECT.
 
@@ -335,7 +335,7 @@ namespace aspect
           // if the solver fails, report the error from processor 0 with some additional
           // information about its location, and throw a quiet exception on all other
           // processors
-          catch (const SolverControl::NoConvergence &exc)
+          catch (const std::exception &exc)
             {
               if (Utilities::MPI::this_mpi_process(src.block(0).get_mpi_communicator()) == 0)
                 AssertThrow (false,
@@ -421,7 +421,7 @@ namespace aspect
     // if the solver fails, report the error from processor 0 with some additional
     // information about its location, and throw a quiet exception on all other
     // processors
-    catch (const SolverControl::NoConvergence &exc)
+    catch (const std::exception &exc)
       {
         if (Utilities::MPI::this_mpi_process(mpi_communicator) == 0)
           AssertThrow (false,
@@ -690,7 +690,7 @@ namespace aspect
         // if the solver fails, report the error from processor 0 with some additional
         // information about its location, and throw a quiet exception on all other
         // processors
-        catch (const SolverControl::NoConvergence &exc)
+        catch (const std::exception &exc)
           {
             if (Utilities::MPI::this_mpi_process(mpi_communicator) == 0)
               AssertThrow (false,