]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
fix Trilinos tests for Trilinos 11.
authorheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 22 Oct 2012 21:31:01 +0000 (21:31 +0000)
committerheister <heister@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 22 Oct 2012 21:31:01 +0000 (21:31 +0000)
git-svn-id: https://svn.dealii.org/trunk@27172 0785d39b-7218-0410-832d-ea1e28bc413d

tests/trilinos/64.cc
tests/trilinos/slowness_03.cc
tests/trilinos/slowness_04.cc

index 1b7b9addb048f95dd736b65747ed014a46169a17..b57ea9cf80d5f713f289101da2d3edf9454fb393 100644 (file)
@@ -68,7 +68,7 @@ int main (int argc,char **argv)
          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(n_dofs, n_local_dofs, Utilities::Trilinos::comm_world());
+       Epetra_Map map(static_cast<int>(n_dofs), static_cast<int>(n_local_dofs), Utilities::Trilinos::comm_world());
         TrilinosWrappers::SparseMatrix v2 (map, 5);
         test (v2);
       }
index 86aaf7c955bf408ce226f538acfb93dd544d6532..19fcbf64b6f491b6a0274154be0b216756f8741c 100644 (file)
@@ -33,7 +33,7 @@ void test ()
   const unsigned int N = 200;
 
                                    // build the sparse matrix 
-  Epetra_Map map (N*N, 0, Utilities::Trilinos::comm_world());
+  Epetra_Map map (static_cast<int>(N*N), 0, Utilities::Trilinos::comm_world());
   TrilinosWrappers::SparseMatrix matrix (map, 5);
   for(unsigned int i=0; i<N; i++)
     for(unsigned int j=0; j<N; j++)
index 963dc75a8215b300e27f5bcef8f4cf50dddb222d..c1369bb4bda0c124588af1c40bec249a3eebd6c0 100644 (file)
@@ -61,7 +61,7 @@ void test ()
   }
   
                                    // build the sparse matrix 
-  Epetra_Map map (N*N, 0, Utilities::Trilinos::comm_world());
+  Epetra_Map map (static_cast<int>(N*N), 0, Utilities::Trilinos::comm_world());
   TrilinosWrappers::SparseMatrix matrix (map, 5);
   for(unsigned int i_=0; i_<N; i_++)
     for(unsigned int j_=0; j_<N; j_++)

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.