Not a bug, but a feature of unsigned int. Let remaining (commented) tests on petsc...

git-svn-id: https://svn.dealii.org/branches/branch_petscscalar_complex@31342 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/petsc_scalar_complex/13.cc b/tests/petsc_scalar_complex/13.cc
index 0335f2e04bda9a041abfa2de2ee69b91f799b7fa..d9c7ff0236765f7843005448870fb2727eec30a5 100644 (file)
--- a/tests/petsc_scalar_complex/13.cc
+++ b/tests/petsc_scalar_complex/13.cc
@@ -32,17 +32,17 @@ void test (PETScWrappers::Vector &v)
   std::vector<bool> pattern (v.size(), false);
   for (unsigned int i=0; i<v.size(); i+=1+i)
     {
-      v(i) += 1.;//PetscScalar (i,i);
+      v(i) += PetscScalar (i,i);
       pattern[i] = true;
     }
 
   v.compress (VectorOperation::add);
 
-  // check that they are ok, and this time
-  // all of them
+  // 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)==std::complex<double> (1.,1.)) ) ||
-            ( (pattern[i]==false) ), 
+    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());
 
   deallog << "OK" << std::endl;

diff --git a/tests/petsc_scalar_complex/13/cmp/generic b/tests/petsc_scalar_complex/13/cmp/generic
new file mode 100644 (file)
index 0000000..0fd8fc1
--- /dev/null
+++ b/tests/petsc_scalar_complex/13/cmp/generic
@@ -0,0 +1,2 @@
+
+DEAL::OK

diff --git a/tests/petsc_scalar_complex/element_access_02.cc b/tests/petsc_scalar_complex/element_access_02.cc
index 62d79cd28b84c93d8e4030806d727fdb7b523288..89e1210aff0eed8c41208f5c76758b20242d3581 100644 (file)
--- a/tests/petsc_scalar_complex/element_access_02.cc
+++ b/tests/petsc_scalar_complex/element_access_02.cc
@@ -1,6 +1,6 @@
 
 // ---------------------------------------------------------------------
-// $Id: 
+// $Id: element_access_02.cc
 //
 // Copyright (C) 2013 by the deal.II authors
 //
@@ -24,32 +24,25 @@
 #include <iostream>
 #include <cassert>
 
-#include <complex>
-
-// test read/write access to matrices AS IS (no cast).
-//
-
-// Note: this test fails where an -1.*(unsigned integer) is used as
-// the input value to a matrix element. This needs to be fixed.
-
 // sparse matrix elements
-void test_matrix (PETScWrappers::SparseMatrix &m)
+void test (PETScWrappers::SparseMatrix &m)
 {
   deallog << "Check matrix access" << std::endl;
 
   // fill up a matrix with some numbers
   for (unsigned int k=0; k<m.m(); ++k)
     for (unsigned int l=0; l<m.n(); ++l)
-      m.set (k,l, PetscScalar (+k+l,-k-l));
-
+      if (k>l)
+       m.set (k,l, PetscScalar (k+l,-1.*(k+l)));
+ 
   m.compress (VectorOperation::add);
 
-  // This fails, because the write above fails - see output file
+  // 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 (), 
+      Assert (m(k,l).real () == -1.*(m(k,l).imag ()), 
              ExcInternalError());
-
+  
   deallog << "OK" << std::endl;
 }
 
@@ -57,15 +50,15 @@ int main (int argc, char **argv)
 {
   std::ofstream logfile ("element_access_02/output");
   dealii::deallog.attach (logfile);
-  dealii::deallog.depth_console (0);
+   dealii::deallog.depth_console (0);
   deallog.threshold_double(1.e-10);
   
   try
     {
       PetscInitialize (&argc, &argv, (char*) 0, (char*) 0);
       {
-       PETScWrappers::SparseMatrix m (5,5,5);
-       test_matrix (m);
+       PETScWrappers::SparseMatrix m (10,10,10);
+       test (m);
 
        deallog << "matrix:" << std::endl;
        m.print (logfile);

diff --git a/tests/petsc_scalar_complex/element_access_02/cmp/generic b/tests/petsc_scalar_complex/element_access_02/cmp/generic
new file mode 100644 (file)
index 0000000..8681f04
--- /dev/null
+++ b/tests/petsc_scalar_complex/element_access_02/cmp/generic
@@ -0,0 +1,50 @@
+
+DEAL::Check matrix access
+DEAL::OK
+DEAL::matrix:
+(1,0) (1.00000,-1.00000)
+(2,0) (2.00000,-2.00000)
+(2,1) (3.00000,-3.00000)
+(3,0) (3.00000,-3.00000)
+(3,1) (4.00000,-4.00000)
+(3,2) (5.00000,-5.00000)
+(4,0) (4.00000,-4.00000)
+(4,1) (5.00000,-5.00000)
+(4,2) (6.00000,-6.00000)
+(4,3) (7.00000,-7.00000)
+(5,0) (5.00000,-5.00000)
+(5,1) (6.00000,-6.00000)
+(5,2) (7.00000,-7.00000)
+(5,3) (8.00000,-8.00000)
+(5,4) (9.00000,-9.00000)
+(6,0) (6.00000,-6.00000)
+(6,1) (7.00000,-7.00000)
+(6,2) (8.00000,-8.00000)
+(6,3) (9.00000,-9.00000)
+(6,4) (10.0000,-10.0000)
+(6,5) (11.0000,-11.0000)
+(7,0) (7.00000,-7.00000)
+(7,1) (8.00000,-8.00000)
+(7,2) (9.00000,-9.00000)
+(7,3) (10.0000,-10.0000)
+(7,4) (11.0000,-11.0000)
+(7,5) (12.0000,-12.0000)
+(7,6) (13.0000,-13.0000)
+(8,0) (8.00000,-8.00000)
+(8,1) (9.00000,-9.00000)
+(8,2) (10.0000,-10.0000)
+(8,3) (11.0000,-11.0000)
+(8,4) (12.0000,-12.0000)
+(8,5) (13.0000,-13.0000)
+(8,6) (14.0000,-14.0000)
+(8,7) (15.0000,-15.0000)
+(9,0) (9.00000,-9.00000)
+(9,1) (10.0000,-10.0000)
+(9,2) (11.0000,-11.0000)
+(9,3) (12.0000,-12.0000)
+(9,4) (13.0000,-13.0000)
+(9,5) (14.0000,-14.0000)
+(9,6) (15.0000,-15.0000)
+(9,7) (16.0000,-16.0000)
+(9,8) (17.0000,-17.0000)
+

diff --git a/tests/petsc_scalar_complex/sparse_matrix_02.cc b/tests/petsc_scalar_complex/sparse_matrix_02.cc
index 9b7c83db582d91d6c2b5139088e9577fa73f9e37..1efa9745ccbd96df30dfd3abdd8cfdbf9c40069b 100644 (file)
--- a/tests/petsc_scalar_complex/sparse_matrix_02.cc
+++ b/tests/petsc_scalar_complex/sparse_matrix_02.cc
@@ -18,11 +18,9 @@
 
 // check SparseMatrix::add(other, factor)
 
-// This is the same as sparse_matrix_02.cc, but uses integer input to
-// complex numbers. AT the time of writing, this documents the element
-// access problem for matrices.
-//
-// TODO: Fix this before going further with petsc-scalar=complex.
+// This is in general the same as sparse_matrix_02.cc, but uses
+// integer input to complex numbers. Since it was done, make a note of
+// a generic failure / annoyance
 
 #include "../tests.h"
 #include <deal.II/lac/petsc_vector.h>
@@ -47,9 +45,9 @@ void test ()
   for (unsigned int k=0; k<m2.m(); ++k)
     {
       // This fails
-      m2.set(k,k,PetscScalar(k,-k));
+      // m2.set(k,k,PetscScalar(k,-k));
       // This is ok
-      // m2.set(k,k,PetscScalar(k,-1.0*k));
+      m2.set(k,k,PetscScalar(k,-1.0*k));
     }
   m2.compress(VectorOperation::add);
       

diff --git a/tests/petsc_scalar_complex/vector_02.cc b/tests/petsc_scalar_complex/vector_02.cc
index c602a659e62be5862dcde1fb78df1907478a2a06..474a58f5b292779eb853f55f4685ddbd185b5758 100644 (file)
--- a/tests/petsc_scalar_complex/vector_02.cc
+++ b/tests/petsc_scalar_complex/vector_02.cc
@@ -16,14 +16,11 @@
 
 
 
-// check Vector
-
-// This is the similar to sparse_matrix_02.cc as it uses integer input
-// to complex numbers. This purposefully illustrates that this
-// assignment DOES NOT works for PETScWrappers::Vector.
+// check Vector, make a note of a generic failure / annoyance
 
 #include "../tests.h"
 #include <deal.II/lac/petsc_vector.h>
+#include <deal.II/lac/vector.h>
 #include <fstream>
 #include <iostream>
 #include <vector>
@@ -42,9 +39,9 @@ void test ()
   for (unsigned int k=0; k<v2.size(); ++k)
     {
       // This fails
-      v2(k) = PetscScalar (k,-k);
+      // v2(k) = PetscScalar (k,-k);
       // This is ok
-      // v2(k) = PetscScalar (k,-1.0*k);
+      v2(k) = PetscScalar (k,-1.0*k);
     }
 
   v2.compress(VectorOperation::add);
@@ -75,8 +72,6 @@ void test ()
   deallog << "OK" << std::endl;
 }
 
-
-
 int main (int argc, char **argv)
 {
   std::ofstream logfile("vector_02/output");