]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Make run again.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 26 Mar 2013 00:21:13 +0000 (00:21 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 26 Mar 2013 00:21:13 +0000 (00:21 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29033 0785d39b-7218-0410-832d-ea1e28bc413d

tests/trilinos/64.cc

index b57ea9cf80d5f713f289101da2d3edf9454fb393..0921321b51c6a90d4054a959ca7ade995a440d9e 100644 (file)
@@ -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 <deal.II/base/utilities.h>
 #include <deal.II/lac/trilinos_sparse_matrix.h>
 #include <Epetra_Map.h>
@@ -30,7 +30,7 @@
 template<typename MatrixType>
 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<int>(n_dofs), static_cast<int>(n_local_dofs), Utilities::Trilinos::comm_world());
+       Epetra_Map map(static_cast<TrilinosWrappers::types::int_type>(n_dofs),
+                      static_cast<TrilinosWrappers::types::int_type>(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
                << "----------------------------------------------------"

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.