use AssertThrow instead of Assert in petsc_complex tests

diff --git a/tests/petsc_complex/00.cc b/tests/petsc_complex/00.cc
index 17781e5d09d368141bb42ccdcef2507b8bae2fe3..106afb2c89271bae20d24f191353a19de7cb52a8 100644 (file)
--- a/tests/petsc_complex/00.cc
+++ b/tests/petsc_complex/00.cc
@@ -42,11 +42,11 @@ void multiply_petsc_complex_by_a_number ()
   const PetscScalar gamma = alpha * beta;
 
   // Check real access
-  Assert (PetscRealPart (gamma)==0., ExcInternalError());
-  Assert (PetscImaginaryPart (gamma) ==5., ExcInternalError());
+  AssertThrow (PetscRealPart (gamma)==0., ExcInternalError());
+  AssertThrow (PetscImaginaryPart (gamma) ==5., ExcInternalError());
 
   // This is legal too!
-  Assert (gamma==std::complex<double> (0.,5), ExcInternalError());
+  AssertThrow (gamma==std::complex<double> (0.,5), ExcInternalError());
 
   deallog << "OK" << std::endl;
 }
@@ -63,18 +63,18 @@ void divide_petsc_complex_by_a_number ()
   const PetscScalar beta = alpha/2.;
 
   // Check real access
-  Assert (PetscRealPart (alpha)==1.,  ExcInternalError());
-  Assert (PetscRealPart (beta) ==0.5, ExcInternalError());
+  AssertThrow (PetscRealPart (alpha)==1.,  ExcInternalError());
+  AssertThrow (PetscRealPart (beta) ==0.5, ExcInternalError());
 
   // operate on alpha (now alpha==beta)
   alpha /= 2.;
 
   // Check complex access
-  Assert (PetscImaginaryPart (alpha)==1., ExcInternalError());
-  Assert (PetscImaginaryPart (beta) ==1., ExcInternalError());
+  AssertThrow (PetscImaginaryPart (alpha)==1., ExcInternalError());
+  AssertThrow (PetscImaginaryPart (beta) ==1., ExcInternalError());
 
   // This is legal too!
-  Assert (alpha==beta, ExcInternalError());
+  AssertThrow (alpha==beta, ExcInternalError());
 
   deallog << "OK" << std::endl;
 }
@@ -87,7 +87,7 @@ void make_std_complex_from_petsc_complex ()
   const std::complex<double> beta = alpha;
 
   // These should be the same of course
-  Assert (alpha==beta, ExcInternalError());
+  AssertThrow (alpha==beta, ExcInternalError());
 
   deallog << "OK" << std::endl;
 }
@@ -100,7 +100,7 @@ void make_petsc_complex_from_std_complex ()
   const PetscScalar alpha = beta;
 
   // These should be the same of course
-  Assert (alpha==beta, ExcInternalError());
+  AssertThrow (alpha==beta, ExcInternalError());
 
   deallog << "OK" << std::endl;
 }
@@ -114,7 +114,7 @@ void make_petsc_complex ()
   const PetscScalar alpha = 1.0 + 2.0*PETSC_i;
 
   // Test if PetscScalar is an std::complex.
-  Assert (alpha==std::complex<double> (1.,2.), ExcInternalError());
+  AssertThrow (alpha==std::complex<double> (1.,2.), ExcInternalError());
 
   deallog << "OK" << std::endl;
 }
@@ -127,18 +127,18 @@ void init_petsc_complex ()
 
   // Initialise (no argument) to zero.
   const PetscScalar alpha;
-  Assert (alpha==std::complex<double> (0.,0.), ExcInternalError());
+  AssertThrow (alpha==std::complex<double> (0.,0.), ExcInternalError());
 
   // Initialise (real argument) to zero.
   const PetscScalar beta = 0.;
-  Assert (beta==alpha, ExcInternalError());
+  AssertThrow (beta==alpha, ExcInternalError());
 
   // Initialise (real+complex argument) to zero.
   const PetscScalar gamma = 0. + 0.*PETSC_i;
-  Assert (gamma==beta, ExcInternalError());
+  AssertThrow (gamma==beta, ExcInternalError());
 
   // If alpha==beta==gamma, then:
-  Assert (alpha==gamma, ExcInternalError());
+  AssertThrow (alpha==gamma, ExcInternalError());
 
   deallog << "OK" << std::endl;
 }

diff --git a/tests/petsc_complex/01.cc b/tests/petsc_complex/01.cc
index 61a78e9054ea0ff173b8cb587a230d0c6c31b7a9..6a7bbf3443323130aaeebd8896243b9f6367e33b 100644 (file)
--- a/tests/petsc_complex/01.cc
+++ b/tests/petsc_complex/01.cc
@@ -37,13 +37,13 @@ void test (PETScWrappers::SparseMatrix &m)
     for (unsigned int j=0; j<m.m(); ++j)
       if ((i+2*j+1) % 3 == 0)
         {
-          Assert (m(i,j)    == std::complex<double> (0.,i*j*.5+.5), ExcInternalError());
-          Assert (m.el(i,j) == std::complex<double> (0.,i*j*.5+.5), ExcInternalError());
+          AssertThrow (m(i,j)    == std::complex<double> (0.,i*j*.5+.5), ExcInternalError());
+          AssertThrow (m.el(i,j) == std::complex<double> (0.,i*j*.5+.5), ExcInternalError());
         }
       else
         {
-          Assert (m(i,j)    == std::complex<double> (0.,0.), ExcInternalError());
-          Assert (m.el(i,j) == std::complex<double> (0.,0.), ExcInternalError());
+          AssertThrow (m(i,j)    == std::complex<double> (0.,0.), ExcInternalError());
+          AssertThrow (m.el(i,j) == std::complex<double> (0.,0.), ExcInternalError());
         }
 
   deallog << "OK" << std::endl;

diff --git a/tests/petsc_complex/02.cc b/tests/petsc_complex/02.cc
index ff4e8c87ab883e63195006ec5162f6d050be71e2..255155da5e32d738efb8d4b515e732670044d33a 100644 (file)
--- a/tests/petsc_complex/02.cc
+++ b/tests/petsc_complex/02.cc
@@ -39,13 +39,13 @@ void test (PETScWrappers::SparseMatrix &m)
     for (unsigned int j=0; j<m.m(); ++j)
       if ((i+2*j+1) % 3 == 0)
         {
-          Assert (m(i,j)    == std::complex<double> (0.,i*j*.5+.5), ExcInternalError());
-          Assert (m.el(i,j) == std::complex<double> (0.,i*j*.5+.5), ExcInternalError());
+          AssertThrow (m(i,j)    == std::complex<double> (0.,i*j*.5+.5), ExcInternalError());
+          AssertThrow (m.el(i,j) == std::complex<double> (0.,i*j*.5+.5), ExcInternalError());
         }
       else
         {
-          Assert (m(i,j)    == std::complex<double> (0.,0.), ExcInternalError());
-          Assert (m.el(i,j) == std::complex<double> (0.,0.), ExcInternalError());
+          AssertThrow (m(i,j)    == std::complex<double> (0.,0.), ExcInternalError());
+          AssertThrow (m.el(i,j) == std::complex<double> (0.,0.), ExcInternalError());
         }
 
   deallog << "OK" << std::endl;

diff --git a/tests/petsc_complex/04.cc b/tests/petsc_complex/04.cc
index 6312b33fbcb921b332ecdc2483e838363c36ec12..b15489e5a516fc78899f3275f5b5398744724267 100644 (file)
--- a/tests/petsc_complex/04.cc
+++ b/tests/petsc_complex/04.cc
@@ -24,8 +24,8 @@
 
 void test (PETScWrappers::SparseMatrix &m)
 {
-  Assert (m.m() == 5, ExcInternalError());
-  Assert (m.n() == 5, ExcInternalError());
+  AssertThrow (m.m() == 5, ExcInternalError());
+  AssertThrow (m.n() == 5, ExcInternalError());
 
   deallog << "OK" << std::endl;
 }

diff --git a/tests/petsc_complex/05.cc b/tests/petsc_complex/05.cc
index f6e6422c1039613ee47310e34df877d651ff2abf..83ab07773823529fa2c90b34a955a15d5272e113 100644 (file)
--- a/tests/petsc_complex/05.cc
+++ b/tests/petsc_complex/05.cc
@@ -38,8 +38,8 @@ void test (PETScWrappers::SparseMatrix &m)
   m.compress (VectorOperation::insert);
 
   deallog << m.n_nonzero_elements() << std::endl;
-  Assert (m.n_nonzero_elements() == counter,
-          ExcInternalError());
+  AssertThrow (m.n_nonzero_elements() == counter,
+               ExcInternalError());
 
   deallog << "OK" << std::endl;
 }

diff --git a/tests/petsc_complex/06.cc b/tests/petsc_complex/06.cc
index 37904745358a175675d8020d716dcd2ae751ae80..6a58a3227b0e1e15e86dc904cf6bbe280269efa8 100644 (file)
--- a/tests/petsc_complex/06.cc
+++ b/tests/petsc_complex/06.cc
@@ -34,7 +34,7 @@ void test (PETScWrappers::SparseMatrix &m)
 
   // compare against the exact value of the l1-norm (max col-sum)
   deallog << m.l1_norm() << std::endl;
-  Assert (m.l1_norm() == 7, ExcInternalError());
+  AssertThrow (m.l1_norm() == 7, ExcInternalError());
 
   deallog << "OK" << std::endl;
 }

diff --git a/tests/petsc_complex/07.cc b/tests/petsc_complex/07.cc
index 75b106ebd4969a9f5c8fc3da42a27cdf1874bd27..cc2265bea595cfdae7eca8b71aa1cea92fad66f0 100644 (file)
--- a/tests/petsc_complex/07.cc
+++ b/tests/petsc_complex/07.cc
@@ -35,7 +35,7 @@ void test (PETScWrappers::SparseMatrix &m)
 
   // compare against the exact value of the linfty-norm (max row-sum).
   deallog << m.linfty_norm() << std::endl;
-  Assert (m.linfty_norm() == 8.5, ExcInternalError());
+  AssertThrow (m.linfty_norm() == 8.5, ExcInternalError());
 
   deallog << "OK" << std::endl;
 }

diff --git a/tests/petsc_complex/08.cc b/tests/petsc_complex/08.cc
index 3ab73e9b46da3310a75f3834e518c1536b401891..bcfdb4f884de5b03342aa8a9a9e19c421c3724aa 100644 (file)
--- a/tests/petsc_complex/08.cc
+++ b/tests/petsc_complex/08.cc
@@ -40,7 +40,7 @@ void test (PETScWrappers::SparseMatrix &m)
 
   // compare against the exact value of the l2-norm (max row-sum)
   deallog << m.frobenius_norm() << std::endl;
-  Assert (m.frobenius_norm() == norm, ExcInternalError());
+  AssertThrow (m.frobenius_norm() == norm, ExcInternalError());
 
   deallog << "OK" << std::endl;
 }

diff --git a/tests/petsc_complex/09.cc b/tests/petsc_complex/09.cc
index b4fb084a661f2d4801ce3af654f1aabe04b4688b..6756f1d4ef7380df0fd4ea74afd61a917c13fb9a 100644 (file)
--- a/tests/petsc_complex/09.cc
+++ b/tests/petsc_complex/09.cc
@@ -41,13 +41,13 @@ void test (PETScWrappers::SparseMatrix &m)
     for (unsigned int j=0; j<m.m(); ++j)
       if ((i+2*j+1) % 3 == 0)
         {
-          Assert (m(i,j)    == std::complex<double> ((i*j*.5+.5)*1.25,i*j*.5*1.25), ExcInternalError());
-          Assert (m.el(i,j) == std::complex<double> ((i*j*.5+.5)*1.25,i*j*.5*1.25), ExcInternalError());
+          AssertThrow (m(i,j)    == std::complex<double> ((i*j*.5+.5)*1.25,i*j*.5*1.25), ExcInternalError());
+          AssertThrow (m.el(i,j) == std::complex<double> ((i*j*.5+.5)*1.25,i*j*.5*1.25), ExcInternalError());
         }
       else
         {
-          Assert (m(i,j)    == std::complex<double> (0.,0.), ExcInternalError());
-          Assert (m.el(i,j) == std::complex<double> (0.,0.), ExcInternalError());
+          AssertThrow (m(i,j)    == std::complex<double> (0.,0.), ExcInternalError());
+          AssertThrow (m.el(i,j) == std::complex<double> (0.,0.), ExcInternalError());
         }
 
   deallog << "OK" << std::endl;

diff --git a/tests/petsc_complex/10.cc b/tests/petsc_complex/10.cc
index 2e22c87c119f73ece9ec96454061eaa137b6d67c..9ab7150cc221727ba625ffabdf4049b9a8e521f3 100644 (file)
--- a/tests/petsc_complex/10.cc
+++ b/tests/petsc_complex/10.cc
@@ -40,13 +40,13 @@ void test (PETScWrappers::SparseMatrix &m)
     for (unsigned int j=0; j<m.m(); ++j)
       if ((i+2*j+1) % 3 == 0)
         {
-          Assert (m(i,j)    == std::complex<double> (0.,(i*j*.5+.5)/4*3), ExcInternalError());
-          Assert (m.el(i,j) == std::complex<double> (0.,(i*j*.5+.5)/4*3), ExcInternalError());
+          AssertThrow (m(i,j)    == std::complex<double> (0.,(i*j*.5+.5)/4*3), ExcInternalError());
+          AssertThrow (m.el(i,j) == std::complex<double> (0.,(i*j*.5+.5)/4*3), ExcInternalError());
         }
       else
         {
-          Assert (m(i,j)    == std::complex<double> (0.,0.), ExcInternalError());
-          Assert (m.el(i,j) == std::complex<double> (0.,0.), ExcInternalError());
+          AssertThrow (m(i,j)    == std::complex<double> (0.,0.), ExcInternalError());
+          AssertThrow (m.el(i,j) == std::complex<double> (0.,0.), ExcInternalError());
         }
 
   deallog << "OK" << std::endl;

diff --git a/tests/petsc_complex/11.cc b/tests/petsc_complex/11.cc
index 07181f7bbe752e9b3250d45a67e688ec11f8364f..10dd0c889612e362164414d20614403ae4cdab08 100644 (file)
--- a/tests/petsc_complex/11.cc
+++ b/tests/petsc_complex/11.cc
@@ -31,7 +31,7 @@ void test (PETScWrappers::Vector &v)
 
   v.compress (VectorOperation::insert);
 
-  Assert (v.size() == 100, ExcInternalError());
+  AssertThrow (v.size() == 100, ExcInternalError());
 
   deallog << "OK" << std::endl;
 }

diff --git a/tests/petsc_complex/12.cc b/tests/petsc_complex/12.cc
index d2ab3d5f4d44e85fc545d8982ce19ef0f152e45d..98e3ac348a3f4ea3dc1cca9c32e99b40293d4491 100644 (file)
--- a/tests/petsc_complex/12.cc
+++ b/tests/petsc_complex/12.cc
@@ -44,10 +44,10 @@ void test (PETScWrappers::Vector &v)
   for (unsigned int k=0; k<v.size(); ++k)
     {
       const PetscScalar el = v(k);
-      Assert ( ( (pattern[k] == true) && (PetscRealPart(el) == 0.) && (PetscImaginaryPart(el) == k) )
-               ||
-               ( (pattern[k] == false) && (PetscRealPart(el) == 0.) && (PetscImaginaryPart(el) == 0.)),
-               ExcInternalError());
+      AssertThrow ( ( (pattern[k] == true) && (PetscRealPart(el) == 0.) && (PetscImaginaryPart(el) == k) )
+                    ||
+                    ( (pattern[k] == false) && (PetscRealPart(el) == 0.) && (PetscImaginaryPart(el) == 0.)),
+                    ExcInternalError());
     }
 
   deallog << "OK" << std::endl;

diff --git a/tests/petsc_complex/13.cc b/tests/petsc_complex/13.cc
index 0d68cdf3135664394cc698350e66be8c5bf12b55..514a3c624afd0f732a0c66997f852d6ffd8fffd4 100644 (file)
--- a/tests/petsc_complex/13.cc
+++ b/tests/petsc_complex/13.cc
@@ -39,10 +39,10 @@ void test (PETScWrappers::Vector &v)
 
   // check that they are ok, and this time all of them
   for (unsigned int i=0; i<v.size(); ++i)
-    Assert ( ( (pattern[i]==true) && (v(i).real()==i) && (v(i).imag()==i) ) ||
-             //&& (v(i)==std::complex<double> (1.,1.)) ) ||
-             ( (pattern[i]==false) && (v(i).real()==0.) && (v(i).imag()==0.) ),
-             ExcInternalError());
+    AssertThrow ( ( (pattern[i]==true) && (v(i).real()==i) && (v(i).imag()==i) ) ||
+                  //&& (v(i)==std::complex<double> (1.,1.)) ) ||
+                  ( (pattern[i]==false) && (v(i).real()==0.) && (v(i).imag()==0.) ),
+                  ExcInternalError());
 
   deallog << "OK" << std::endl;
 }

diff --git a/tests/petsc_complex/17.cc b/tests/petsc_complex/17.cc
index 637a8515faea71db00fae79b8b5cb474e2e15ded..d01b30e6f6e97395157120480a009dff08ec9f63 100644 (file)
--- a/tests/petsc_complex/17.cc
+++ b/tests/petsc_complex/17.cc
@@ -36,7 +36,7 @@ void test (PETScWrappers::Vector &v)
   v.compress (VectorOperation::insert);
 
   // then check the norm
-  Assert (v.l1_norm() == norm, ExcInternalError());
+  AssertThrow (v.l1_norm() == norm, ExcInternalError());
 
   deallog << "OK" << std::endl;
 }

diff --git a/tests/petsc_complex/18.cc b/tests/petsc_complex/18.cc
index 37ef593f2d06c6b98ff155ebb99f1a495f932e62..a8388f34a1f294150b72566eb8b5de66053ae6f5 100644 (file)
--- a/tests/petsc_complex/18.cc
+++ b/tests/petsc_complex/18.cc
@@ -41,7 +41,7 @@ void test (PETScWrappers::Vector &v)
 
   // then check the l2-norm
   PetscReal l2_norm = v.l2_norm();
-  Assert (l2_norm==std::sqrt(norm), ExcInternalError());
+  AssertThrow (l2_norm==std::sqrt(norm), ExcInternalError());
 
   deallog << "OK" << std::endl;
 }

diff --git a/tests/petsc_complex/19.cc b/tests/petsc_complex/19.cc
index 169f90828100b2ddf50c468d90adba4e1306cfa5..dfa1a9487daa7f8db9d57c0832f9a9ef27f06fdb 100644 (file)
--- a/tests/petsc_complex/19.cc
+++ b/tests/petsc_complex/19.cc
@@ -39,7 +39,7 @@ void test (PETScWrappers::Vector &v)
   v.compress (VectorOperation::insert);
 
   // then check the norm
-  Assert (v.linfty_norm() == norm, ExcInternalError());
+  AssertThrow (v.linfty_norm() == norm, ExcInternalError());
 
   deallog << "OK" << std::endl;
 }

diff --git a/tests/petsc_complex/20.cc b/tests/petsc_complex/20.cc
index c0bc9db93b11a8d96f0bc4612470ecd3eb575396..697194861cab6b931ec90468c676e2e428cf6556 100644 (file)
--- a/tests/petsc_complex/20.cc
+++ b/tests/petsc_complex/20.cc
@@ -48,7 +48,7 @@ void test (PETScWrappers::Vector &v,
   w.compress (VectorOperation::insert);
 
   // make sure the scalar product is zero
-  Assert (v*w == product, ExcInternalError());
+  AssertThrow (v*w == product, ExcInternalError());
 
   deallog << "OK" << std::endl;
 }

diff --git a/tests/petsc_complex/element_access_00.cc b/tests/petsc_complex/element_access_00.cc
index 09fef7f132fb1bc07230b5cd7b44f5bdf39f54b0..738a1d37fe41677c3a71bba8164678c14bf138c7 100644 (file)
--- a/tests/petsc_complex/element_access_00.cc
+++ b/tests/petsc_complex/element_access_00.cc
@@ -42,16 +42,16 @@ void test_vector (PETScWrappers::Vector &v)
   // check that is what we get by casting PetscScalar to std::real()
   // and std::imag()
   for (unsigned int k=0; k<v.size(); ++k)
-    Assert ((static_cast<std::complex<double> > (v(k)).real ()==k) &&
-            (static_cast<std::complex<double> > (v(k)).imag ()==v.size()-k),
-            ExcInternalError());
+    AssertThrow ((static_cast<std::complex<double> > (v(k)).real ()==k) &&
+                 (static_cast<std::complex<double> > (v(k)).imag ()==v.size()-k),
+                 ExcInternalError());
 
   // check that is what we get by
   // dealii::internal::VectorReference::real() and
   // dealii::internal::VectorReference::imag()
   for (unsigned int k=0; k<v.size(); ++k)
-    Assert ((v(k).real ()==k) && (v(k).imag ()==v.size()-k),
-            ExcInternalError());
+    AssertThrow ((v(k).real ()==k) && (v(k).imag ()==v.size()-k),
+                 ExcInternalError());
 
   deallog << "OK" << std::endl;
 }

diff --git a/tests/petsc_complex/element_access_01.cc b/tests/petsc_complex/element_access_01.cc
index 69c28b990b6bd90d22e1043a61d5bb2895ecbefa..f7d1a3e59c00db738903388e760ff3cf464534b6 100644 (file)
--- a/tests/petsc_complex/element_access_01.cc
+++ b/tests/petsc_complex/element_access_01.cc
@@ -48,8 +48,8 @@ void test_matrix (PETScWrappers::SparseMatrix &m)
         PetscReal el_r = static_cast<double> (k+l);
         PetscReal el_i = static_cast<double> (-1.*(k+l));
 
-        Assert ((m(k,l).real ()==el_r) && (m(k,l).imag ()==el_i),
-                ExcInternalError());
+        AssertThrow ((m(k,l).real ()==el_r) && (m(k,l).imag ()==el_i),
+                     ExcInternalError());
       }
 
   deallog << "OK" << std::endl;

diff --git a/tests/petsc_complex/element_access_02.cc b/tests/petsc_complex/element_access_02.cc
index 02b4d04edafe6040de37619296abbbc96f22ff05..49dc8b0398b12ee0e82ce3259c33143d39a4d896 100644 (file)
--- a/tests/petsc_complex/element_access_02.cc
+++ b/tests/petsc_complex/element_access_02.cc
@@ -38,8 +38,8 @@ void test (PETScWrappers::SparseMatrix &m)
   // check the matrix is correctly filled
   for (unsigned int k=0; k<m.m(); ++k)
     for (unsigned int l=0; l<m.n(); ++l)
-      Assert (m(k,l).real () == -1.*(m(k,l).imag ()),
-              ExcInternalError());
+      AssertThrow (m(k,l).real () == -1.*(m(k,l).imag ()),
+                   ExcInternalError());
 
   deallog << "OK" << std::endl;
 }

diff --git a/tests/petsc_complex/element_access_03.cc b/tests/petsc_complex/element_access_03.cc
index 9d525755aecd9c4d7d9cb6e2ac24da80c06c1950..f41b8084b40edd4bc3a1cf15700553589f6e553d 100644 (file)
--- a/tests/petsc_complex/element_access_03.cc
+++ b/tests/petsc_complex/element_access_03.cc
@@ -46,9 +46,9 @@ void test_matrix (PETScWrappers::SparseMatrix &m)
   // Check elements have the correct value
   for (unsigned int k=0; k<m.m(); ++k)
     for (unsigned int l=0; l<m.n(); ++l)
-      Assert ((m(k,l).real () ==     (k+l)*dealii::numbers::PI) &&
-              (m(k,l).imag () == -1.*(k+l)*dealii::numbers::PI),
-              ExcInternalError());
+      AssertThrow ((m(k,l).real () ==     (k+l)*dealii::numbers::PI) &&
+                   (m(k,l).imag () == -1.*(k+l)*dealii::numbers::PI),
+                   ExcInternalError());
 
   // Use the conjugate to check elements have equal (and opposite)
   // values.
@@ -57,8 +57,8 @@ void test_matrix (PETScWrappers::SparseMatrix &m)
       {
         PetscScalar m_conjugate = PetscConj (m(k,l));
 
-        Assert (m_conjugate.real () == m_conjugate.imag (),
-                ExcInternalError());
+        AssertThrow (m_conjugate.real () == m_conjugate.imag (),
+                     ExcInternalError());
       }
 
   deallog << "OK" << std::endl;

diff --git a/tests/petsc_complex/fe_get_function_values.cc b/tests/petsc_complex/fe_get_function_values.cc
index f0ba8f0d8aec844d01b4dfc84146ebcf74f5b762..bdd58ede8cc870bf548b40a63167afb31ed27550 100644 (file)
--- a/tests/petsc_complex/fe_get_function_values.cc
+++ b/tests/petsc_complex/fe_get_function_values.cc
@@ -152,8 +152,8 @@ void test ()
 
           for (unsigned int q=0; q<n_q_points; ++q)
             {
-              Assert ( PetscRealPart(values[q])      == values_Re[q], ExcInternalError() );
-              Assert ( PetscImaginaryPart(values[q]) == values_Im[q], ExcInternalError() );
+              AssertThrow ( PetscRealPart(values[q])      == values_Re[q], ExcInternalError() );
+              AssertThrow ( PetscImaginaryPart(values[q]) == values_Im[q], ExcInternalError() );
             }
         }
   }

diff --git a/tests/petsc_complex/vector_assign_01.cc b/tests/petsc_complex/vector_assign_01.cc
index c952cf35690dd57f4603562068b26d55c86d5ece..7ad9d1b47b4eeee877a945d3a866cb2c18531b19 100644 (file)
--- a/tests/petsc_complex/vector_assign_01.cc
+++ b/tests/petsc_complex/vector_assign_01.cc
@@ -35,7 +35,7 @@ void test (PETScWrappers::Vector &v,
     w(k) = v(k);
 
   // check that they're equal
-  Assert (v==w, ExcInternalError());
+  AssertThrow (v==w, ExcInternalError());
 
   deallog << "OK" << std::endl;
 }

diff --git a/tests/petsc_complex/vector_assign_02.cc b/tests/petsc_complex/vector_assign_02.cc
index ffc09239342f529fa77bbcacfd89c7369e4c434b..411e9bc3a8c61a14e1cad9fb71913e8b595a64b4 100644 (file)
--- a/tests/petsc_complex/vector_assign_02.cc
+++ b/tests/petsc_complex/vector_assign_02.cc
@@ -37,7 +37,7 @@ void test (PETScWrappers::Vector &v,
     w(k) += v(k);
 
   // check that they're equal
-  Assert (v==w, ExcInternalError());
+  AssertThrow (v==w, ExcInternalError());
 
   deallog << "OK" << std::endl;
 }

diff --git a/tests/petsc_complex/vector_equality_1.cc b/tests/petsc_complex/vector_equality_1.cc
index ff9953e85e0e4390a0c0d6d445558c4095b49280..52d69eac94288188268e07322f2af2938544733e 100644 (file)
--- a/tests/petsc_complex/vector_equality_1.cc
+++ b/tests/petsc_complex/vector_equality_1.cc
@@ -36,7 +36,7 @@ void test (PETScWrappers::Vector &v,
         w(k) = std::complex<double> (k+1.,k+1.);
     }
 
-  Assert (!(v==w), ExcInternalError());
+  AssertThrow (!(v==w), ExcInternalError());
 
   deallog << "OK" << std::endl;
 }

diff --git a/tests/petsc_complex/vector_equality_2.cc b/tests/petsc_complex/vector_equality_2.cc
index 814f8043bbde85a8df6d5bb51b8eff6eeac23aaf..7d7f78feaec614c9aca0758ab8fd8af26feb10a9 100644 (file)
--- a/tests/petsc_complex/vector_equality_2.cc
+++ b/tests/petsc_complex/vector_equality_2.cc
@@ -38,7 +38,7 @@ void test (PETScWrappers::Vector &v,
 
   // then copy elements and make sure the vectors are actually equal
   v = w;
-  Assert (v==w, ExcInternalError());
+  AssertThrow (v==w, ExcInternalError());
 
   deallog << "OK" << std::endl;
 }

diff --git a/tests/petsc_complex/vector_wrap_01.cc b/tests/petsc_complex/vector_wrap_01.cc
index d9c1f4c5e1adf4a7fdfa3f81c946a10fe7662b39..eed237c52df19e2e80d324175134943b0251363e 100644 (file)
--- a/tests/petsc_complex/vector_wrap_01.cc
+++ b/tests/petsc_complex/vector_wrap_01.cc
@@ -36,12 +36,12 @@ void test (PETScWrappers::Vector &v,
     w(k) = v(k);
 
   // check that they're equal
-  Assert (v==w, ExcInternalError());
+  AssertThrow (v==w, ExcInternalError());
 
   v=w;
 
   // check that they're still equal
-  Assert (v==w, ExcInternalError());
+  AssertThrow (v==w, ExcInternalError());
 
   deallog << "OK" << std::endl;
 }