From: Timo Heister Date: Thu, 6 Jun 2013 22:08:07 +0000 (+0000) Subject: update test X-Git-Tag: v8.0.0~120^2~26 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a168e83f91c2a92a1b0a86781aa1d7c6ee8987f5;p=dealii.git 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 f0940188e5..abaa1884dd 100644 --- 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 eb8100b379..9fd510b0e9 100644 --- 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 17a7739b76..69232e6e52 100644 --- 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