[cig-commits] [commit] master: report convergence failures in release mode (c90f588)

[cig_noreply at geodynamics.org]

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

On branch  : master
Link       : https://github.com/geodynamics/aspect/compare/5398a51f559a7e08461675a5206f94812693bd24...adfdfa24b7a254a65c16f922a393868e179889b1

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

commit c90f588088d5ee87c218b45eccb4970d4a388775
Author: Timo Heister <timo.heister at gmail.com>
Date:   Sun Jun 8 18:59:00 2014 -0400

    report convergence failures in release mode
    
    A recent change causes the linear solvers to hang in release mode (with
    more than one process) if we don't reach convergence.


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

c90f588088d5ee87c218b45eccb4970d4a388775
 source/simulator/solver.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/source/simulator/solver.cc b/source/simulator/solver.cc
index 08ed3da..133d099 100644
--- a/source/simulator/solver.cc
+++ b/source/simulator/solver.cc
@@ -293,7 +293,7 @@ namespace aspect
 	    catch (const SolverControl::NoConvergence &exc)
 	      {
 		if (Utilities::MPI::this_mpi_process(src.block(0).get_mpi_communicator()) == 0)
-		  Assert (false,
+		  AssertThrow (false,
 			  ExcMessage (std::string("The iterative solver in BlockSchurPreconditioner::vmult "
 						  "did not converge. It reported the following error:\n\n")
 				      +
@@ -332,7 +332,7 @@ namespace aspect
 	    catch (const SolverControl::NoConvergence &exc)
 	      {
 		if (Utilities::MPI::this_mpi_process(src.block(0).get_mpi_communicator()) == 0)
-		  Assert (false,
+		  AssertThrow (false,
 			  ExcMessage (std::string("The iterative solver in BlockSchurPreconditioner::vmult "
 						  "did not converge. It reported the following error:\n\n")
 				      +
@@ -417,7 +417,7 @@ namespace aspect
     catch (const SolverControl::NoConvergence &exc)
       {
 	if (Utilities::MPI::this_mpi_process(mpi_communicator) == 0)
-	  Assert (false,
+	  AssertThrow (false,
 		  ExcMessage (std::string("The iterative advection solver "
 					  "did not converge. It reported the following error:\n\n")
 			      +
@@ -485,7 +485,7 @@ namespace aspect
 	catch (const std::exception &exc)
 	  {
 	    if (Utilities::MPI::this_mpi_process(mpi_communicator) == 0)
-	      Assert (false,
+	      AssertThrow (false,
 		      ExcMessage (std::string("The direct Stokes solver "
 					      "did not succeed. It reported the following error:\n\n")
 				  +
@@ -656,7 +656,7 @@ namespace aspect
 	catch (const SolverControl::NoConvergence &exc)
 	  {
 	    if (Utilities::MPI::this_mpi_process(mpi_communicator) == 0)
-	      Assert (false,
+	      AssertThrow (false,
 		      ExcMessage (std::string("The iterative Stokes solver "
 					      "did not converge. It reported the following error:\n\n")
 				  +