Also fix test output.

geodynamics · Jul 13, 2023 · f09932f · f09932f
1 parent cfe2e51
commit f09932f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/tests/stokes_solver_fail_A/screen-output b/tests/stokes_solver_fail_A/screen-output
@@ -1,4 +1,8 @@
+-----------------------------------------------------------------------------
+-----------------------------------------------------------------------------
 
+-----------------------------------------------------------------------------
+-----------------------------------------------------------------------------
 Number of active cells: 192 (on 4 levels)
 Number of degrees of freedom: 2,724 (1,666+225+833)
 
@@ -11,11 +15,14 @@ screen by communicating over MPI in their destructors.
 Since an exception is currently uncaught, this
 synchronization (and subsequent output) will be skipped
 to avoid a possible deadlock.
+---------------------------------------------------------
 
 
+----------------------------------------------------
 Exception 'ExcMessage (exception_message.str())' on rank 0 on processing: 
 
-An error occurred in file <utilities.cc> in function
+--------------------------------------------------------
+An error occurred in line <2946> of file </home/bangerth/p/deal.II/1/projects/aspect/source/utilities.cc> in function
 (line in output replaced by default.sh script)
 The violated condition was: 
     false
@@ -34,9 +41,10 @@ Additional information:
     --------------------------------------------------------
 (line in output replaced by default.sh script)
 (line in output replaced by default.sh script)
-    void aspect::Utilities::linear_solver_failed(const string&, const
-    string&, const std::vector<dealii::SolverControl>&, const
-    std::exception&, ompi_communicator_t* const&, const string&)
+    function
+    void aspect::Utilities::throw_linear_solver_failure_exception(const
+    string&, const string&, const std::vector<dealii::SolverControl>&,
+    const std::exception&, ompi_communicator_t* const&, const string&)
     The violated condition was:
     false
     Additional information:

diff --git a/tests/stokes_solver_fail_S/screen-output b/tests/stokes_solver_fail_S/screen-output
@@ -1,4 +1,8 @@
+-----------------------------------------------------------------------------
+-----------------------------------------------------------------------------
 
+-----------------------------------------------------------------------------
+-----------------------------------------------------------------------------
 Number of active cells: 192 (on 4 levels)
 Number of degrees of freedom: 2,724 (1,666+225+833)
 
@@ -11,11 +15,14 @@ screen by communicating over MPI in their destructors.
 Since an exception is currently uncaught, this
 synchronization (and subsequent output) will be skipped
 to avoid a possible deadlock.
+---------------------------------------------------------
 
 
+----------------------------------------------------
 Exception 'ExcMessage (exception_message.str())' on rank 0 on processing: 
 
-An error occurred in file <utilities.cc> in function
+--------------------------------------------------------
+An error occurred in line <2946> of file </home/bangerth/p/deal.II/1/projects/aspect/source/utilities.cc> in function
 (line in output replaced by default.sh script)
 The violated condition was: 
     false
@@ -34,9 +41,10 @@ Additional information:
     --------------------------------------------------------
 (line in output replaced by default.sh script)
 (line in output replaced by default.sh script)
-    void aspect::Utilities::linear_solver_failed(const string&, const
-    string&, const std::vector<dealii::SolverControl>&, const
-    std::exception&, ompi_communicator_t* const&, const string&)
+    function
+    void aspect::Utilities::throw_linear_solver_failure_exception(const
+    string&, const string&, const std::vector<dealii::SolverControl>&,
+    const std::exception&, ompi_communicator_t* const&, const string&)
     The violated condition was:
     false
     Additional information: