update test

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

diff --git a/tests/gla/block_vec_02.cc b/tests/gla/block_vec_02.cc
index f0940188e5d726fc519e35d3859f8c50b5169404..abaa1884dd53b0e3cfe10784abf1bcaca8d8935b 100644 (file)
--- a/tests/gla/block_vec_02.cc
+++ b/tests/gla/block_vec_02.cc
@@ -59,8 +59,6 @@ void test ()
   typename LA::MPI::BlockVector v(partitioning, MPI_COMM_WORLD);
   v = 0.1;
 
-  deallog << v.l2_norm() << std::endl;
-
   v(myid) = myid;
   v.compress(VectorOperation::insert);
 
@@ -72,15 +70,15 @@ void test ()
 
 
   ConstraintMatrix cm;
-  cm.add_line(1);
-  cm.add_entry(1 ,2, 3.0);
+  cm.add_line(0);
+  cm.add_entry(0, 1, 3.0);
   cm.close();
   
   if (myid==0)
-    deallog << "before: " << v(1) << std::endl;
-  cm.distribute(v); // this should set x(1)= 3.0 * x(2) = 12.0
+    deallog << "before: " << v(0) << std::endl;
+  cm.distribute(v); // this should set x(0)= 3.0 * x(1) = 3.0
   if (myid==0)
-    deallog << "after: " << v(1) << std::endl;
+    deallog << "after: " << v(0) << std::endl;
   
                                   // done
   if (myid==0)

diff --git a/tests/gla/block_vec_02/ncpu_2/cmp/generic b/tests/gla/block_vec_02/ncpu_2/cmp/generic
index eb8100b379f2b095c8b28d6a4e68fbfeb0edbeba..9fd510b0e9cee4041e0c474626b6c1892f1f7ae7 100644 (file)
--- a/tests/gla/block_vec_02/ncpu_2/cmp/generic
+++ b/tests/gla/block_vec_02/ncpu_2/cmp/generic
@@ -1,11 +1,27 @@
 
-DEAL:0:PETSc::numproc=10
-DEAL:0:PETSc::0:0.000
-DEAL:0:PETSc::1:2.000
-DEAL:0:PETSc::ghost: 2.000
+DEAL:0:PETSc::numproc=2
+DEAL:0:PETSc::size: 16
+DEAL:0:PETSc::block(0).size: 10
+DEAL:0:PETSc::block(1).size: 6
+DEAL:0:PETSc::my first entry: 0.00000
+DEAL:0:PETSc::before: 0.00000
+DEAL:0:PETSc::after: 3.00000
 DEAL:0:PETSc::OK
-DEAL:0:Trilinos::numproc=10
-DEAL:0:Trilinos::0:0.000
-DEAL:0:Trilinos::1:2.000
-DEAL:0:Trilinos::ghost: 2.000
+DEAL:0:Trilinos::numproc=2
+DEAL:0:Trilinos::size: 16
+DEAL:0:Trilinos::block(0).size: 10
+DEAL:0:Trilinos::block(1).size: 6
+DEAL:0:Trilinos::my first entry: 0.00000
+DEAL:0:Trilinos::before: 0.00000
+DEAL:0:Trilinos::after: 3.00000
 DEAL:0:Trilinos::OK
+
+DEAL:1:PETSc::size: 16
+DEAL:1:PETSc::block(0).size: 10
+DEAL:1:PETSc::block(1).size: 6
+DEAL:1:PETSc::my first entry: 0.100000
+DEAL:1:Trilinos::size: 16
+DEAL:1:Trilinos::block(0).size: 10
+DEAL:1:Trilinos::block(1).size: 6
+DEAL:1:Trilinos::my first entry: 0.100000
+

diff --git a/tests/gla/block_vec_02/ncpu_4/cmp/generic b/tests/gla/block_vec_02/ncpu_4/cmp/generic
index 17a7739b76b7ff72ad0dc8c9db2056cbfe1ca45c..69232e6e52ce3fb664449ba01dd1f9c96ea35de6 100644 (file)
--- a/tests/gla/block_vec_02/ncpu_4/cmp/generic
+++ b/tests/gla/block_vec_02/ncpu_4/cmp/generic
@@ -1,31 +1,43 @@
 
 DEAL:0:PETSc::numproc=4
-DEAL:0:PETSc::0: 0.00000
-DEAL:0:PETSc::1: 2.00000
-DEAL:0:PETSc::before: 2.00000
-DEAL:0:PETSc::after: 12.0000
+DEAL:0:PETSc::size: 16
+DEAL:0:PETSc::block(0).size: 10
+DEAL:0:PETSc::block(1).size: 6
+DEAL:0:PETSc::my first entry: 0.00000
+DEAL:0:PETSc::before: 0.00000
+DEAL:0:PETSc::after: 3.00000
 DEAL:0:PETSc::OK
 DEAL:0:Trilinos::numproc=4
-DEAL:0:Trilinos::0: 0.00000
-DEAL:0:Trilinos::1: 2.00000
-DEAL:0:Trilinos::before: 2.00000
-DEAL:0:Trilinos::after: 12.0000
+DEAL:0:Trilinos::size: 16
+DEAL:0:Trilinos::block(0).size: 10
+DEAL:0:Trilinos::block(1).size: 6
+DEAL:0:Trilinos::my first entry: 0.00000
+DEAL:0:Trilinos::before: 0.00000
+DEAL:0:Trilinos::after: 3.00000
 DEAL:0:Trilinos::OK
 
-DEAL:1:PETSc::2: 4.00000
-DEAL:1:PETSc::3: 6.00000
-DEAL:1:Trilinos::2: 4.00000
-DEAL:1:Trilinos::3: 6.00000
+DEAL:1:PETSc::size: 16
+DEAL:1:PETSc::block(0).size: 10
+DEAL:1:PETSc::block(1).size: 6
+DEAL:1:PETSc::my first entry: 0.100000
+DEAL:1:Trilinos::size: 16
+DEAL:1:Trilinos::block(0).size: 10
+DEAL:1:Trilinos::block(1).size: 6
+DEAL:1:Trilinos::my first entry: 0.100000
 
 
-DEAL:2:PETSc::4: 8.00000
-DEAL:2:PETSc::5: 10.0000
-DEAL:2:Trilinos::4: 8.00000
-DEAL:2:Trilinos::5: 10.0000
+DEAL:2:PETSc::size: 16
+DEAL:2:PETSc::block(0).size: 10
+DEAL:2:PETSc::block(1).size: 6
+DEAL:2:Trilinos::size: 16
+DEAL:2:Trilinos::block(0).size: 10
+DEAL:2:Trilinos::block(1).size: 6
 
 
-DEAL:3:PETSc::6: 12.0000
-DEAL:3:PETSc::7: 14.0000
-DEAL:3:Trilinos::6: 12.0000
-DEAL:3:Trilinos::7: 14.0000
+DEAL:3:PETSc::size: 16
+DEAL:3:PETSc::block(0).size: 10
+DEAL:3:PETSc::block(1).size: 6
+DEAL:3:Trilinos::size: 16
+DEAL:3:Trilinos::block(0).size: 10
+DEAL:3:Trilinos::block(1).size: 6