From 7ab040895fccb88550bd371f3271583b39fafc49 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Wed, 5 Jun 2013 22:59:02 +0000 Subject: [PATCH] update test git-svn-id: https://svn.dealii.org/branches/branch_unify_linear_algebra@29774 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/gla/mat_01.cc | 44 +++++++--------------------- tests/gla/mat_01/ncpu_10/cmp/generic | 30 +++++++++++++++---- tests/gla/mat_01/ncpu_4/cmp/generic | 18 ++++++++---- 3 files changed, 47 insertions(+), 45 deletions(-) diff --git a/tests/gla/mat_01.cc b/tests/gla/mat_01.cc index 46d48c2bd4..a396557e1f 100644 --- a/tests/gla/mat_01.cc +++ b/tests/gla/mat_01.cc @@ -84,39 +84,17 @@ void test () int main (int argc, char **argv) { - Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv); - unsigned int myid = Utilities::MPI::this_mpi_process (MPI_COMM_WORLD); - - deallog.push(Utilities::int_to_string(myid)); - - if (myid == 0) - { - std::ofstream logfile(output_file_for_mpi("mat_01").c_str()); - deallog.attach(logfile); - deallog << std::setprecision(4); - deallog.depth_console(0); - deallog.threshold_double(1.e-10); - - { - deallog.push("PETSc"); - test(); - deallog.pop(); - deallog.push("Trilinos"); - test(); - deallog.pop(); - } - - } - else - { - deallog.push("PETSc"); - test(); - deallog.pop(); - deallog.push("Trilinos"); - test(); - deallog.pop(); - } - + Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1); + MPILogInitAll log(__FILE__); + { + deallog.push("PETSc"); + test(); + deallog.pop(); + deallog.push("Trilinos"); + test(); + deallog.pop(); + } + // compile, don't run //if (myid==9999) // test(); diff --git a/tests/gla/mat_01/ncpu_10/cmp/generic b/tests/gla/mat_01/ncpu_10/cmp/generic index a748da52cc..e48aed9e6b 100644 --- a/tests/gla/mat_01/ncpu_10/cmp/generic +++ b/tests/gla/mat_01/ncpu_10/cmp/generic @@ -1,11 +1,29 @@ DEAL:0:PETSc::numproc=10 -DEAL:0:PETSc::0: 0 -DEAL:0:PETSc::1: 1.000 -DEAL:0:PETSc::0,1 : 10.00 +DEAL:0:PETSc::0: 0.00000 +DEAL:0:PETSc::1: 1.00000 +DEAL:0:PETSc::0,1 : 10.0000 DEAL:0:PETSc::OK DEAL:0:Trilinos::numproc=10 -DEAL:0:Trilinos::0: 0 -DEAL:0:Trilinos::1: 1.000 -DEAL:0:Trilinos::0,1 : 10.00 +DEAL:0:Trilinos::0: 0.00000 +DEAL:0:Trilinos::1: 1.00000 +DEAL:0:Trilinos::0,1 : 10.0000 DEAL:0:Trilinos::OK + + + + + + + + + + + + + + + + + + diff --git a/tests/gla/mat_01/ncpu_4/cmp/generic b/tests/gla/mat_01/ncpu_4/cmp/generic index 88d363c606..1d7a69e6a5 100644 --- a/tests/gla/mat_01/ncpu_4/cmp/generic +++ b/tests/gla/mat_01/ncpu_4/cmp/generic @@ -1,11 +1,17 @@ DEAL:0:PETSc::numproc=4 -DEAL:0:PETSc::0: 0 -DEAL:0:PETSc::1: 1.000 -DEAL:0:PETSc::0,1 : 4.000 +DEAL:0:PETSc::0: 0.00000 +DEAL:0:PETSc::1: 1.00000 +DEAL:0:PETSc::0,1 : 4.00000 DEAL:0:PETSc::OK DEAL:0:Trilinos::numproc=4 -DEAL:0:Trilinos::0: 0 -DEAL:0:Trilinos::1: 1.000 -DEAL:0:Trilinos::0,1 : 4.000 +DEAL:0:Trilinos::0: 0.00000 +DEAL:0:Trilinos::1: 1.00000 +DEAL:0:Trilinos::0,1 : 4.00000 DEAL:0:Trilinos::OK + + + + + + -- 2.39.5