From: bangerth Date: Tue, 26 Mar 2013 00:21:13 +0000 (+0000) Subject: Make run again. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17163cd17ad37b2320ee4ae8c98f3f407a316a5e;p=dealii-svn.git Make run again. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29033 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/tests/trilinos/64.cc b/tests/trilinos/64.cc index b57ea9cf80..0921321b51 100644 --- a/tests/trilinos/64.cc +++ b/tests/trilinos/64.cc @@ -1,8 +1,8 @@ //---------------------------- trilinos_64.cc --------------------------- // $Id$ -// Version: $Name$ +// Version: $Name$ // -// Copyright (C) 2004, 2005, 2008 by the deal.II authors +// Copyright (C) 2004, 2005, 2008, 2013 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -15,7 +15,7 @@ // This test should be run on multiple processors. -#include "../tests.h" +#include "../tests.h" #include #include #include @@ -30,7 +30,7 @@ template void test (MatrixType &m) { - m.set(0,0,1.); + m.set(0,0,1.); m.compress(); m = 0; m.compress(); @@ -42,12 +42,12 @@ void test (MatrixType &m) -int main (int argc,char **argv) +int main (int argc,char **argv) { std::ofstream logfile("64/output"); deallog.attach(logfile); deallog.depth_console(0); - deallog.threshold_double(1.e-10); + deallog.threshold_double(1.e-10); Utilities::MPI::MPI_InitFinalize mpi_initialization (argc, argv); @@ -64,11 +64,13 @@ int main (int argc,char **argv) // check // TrilinosWrappers::SparseMatrix - const unsigned int n_jobs = + const unsigned int n_jobs = Utilities::Trilinos::get_n_mpi_processes(Utilities::Trilinos::comm_world()); Assert(n_dofs%n_jobs==0, ExcInternalError()); const unsigned int n_local_dofs=n_dofs/n_jobs; - Epetra_Map map(static_cast(n_dofs), static_cast(n_local_dofs), Utilities::Trilinos::comm_world()); + Epetra_Map map(static_cast(n_dofs), + static_cast(n_local_dofs), + Utilities::Trilinos::comm_world()); TrilinosWrappers::SparseMatrix v2 (map, 5); test (v2); } @@ -83,10 +85,10 @@ int main (int argc,char **argv) << "Aborting!" << std::endl << "----------------------------------------------------" << std::endl; - + return 1; } - catch (...) + catch (...) { std::cerr << std::endl << std::endl << "----------------------------------------------------"