Change places in trilinos tests

git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29041 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/tests/trilinos/sparse_matrix_03.cc b/tests/trilinos/sparse_matrix_03.cc
index f37d844bd3bd96827cdb7e8fe7dfc435abf196e5..5b8a936a4c401c22c797e661120b5b3d78dea2c1 100644 (file)
--- a/tests/trilinos/sparse_matrix_03.cc
+++ b/tests/trilinos/sparse_matrix_03.cc
@@ -50,7 +50,8 @@ int main (int argc,char **argv)
   matrix.print_formatted (deallog.get_file_stream());
 
   // now copy everything into a Trilinos matrix
-  Epetra_Map map(5,5,0,Utilities::Trilinos::comm_world());
+  Epetra_Map map(TrilinosWrappers::types::int_type(5),
+                5,0,Utilities::Trilinos::comm_world());
   TrilinosWrappers::SparseMatrix tmatrix;
   tmatrix.reinit (map, map, matrix, 4.);
 

diff --git a/tests/trilinos/sparse_matrix_04.cc b/tests/trilinos/sparse_matrix_04.cc
index 9b03e2da7a8744ce392e4e689b131939a4231988..5c70babb2a4eb0a21c812e15a3d0f2cf86c50a53 100644 (file)
--- a/tests/trilinos/sparse_matrix_04.cc
+++ b/tests/trilinos/sparse_matrix_04.cc
@@ -50,7 +50,9 @@ int main (int argc,char **argv)
   matrix.print_formatted (deallog.get_file_stream());
 
   // now copy everything into a Trilinos matrix
-  Epetra_Map map(5,5,0,Utilities::Trilinos::comm_world());
+  Epetra_Map map(TrilinosWrappers::types::int_type(5),
+                5,0,Utilities::Trilinos::comm_world());
+
   TrilinosWrappers::SparseMatrix tmatrix;
   tmatrix.reinit (map, map, matrix, 0, false);
 

diff --git a/tests/trilinos/sparse_matrix_05.cc b/tests/trilinos/sparse_matrix_05.cc
index eb3849910a61a9e9d7bc6bec59f396b56b22d75f..d7e7ad1e469909d968983bac9048c15f0d98b54a 100644 (file)
--- a/tests/trilinos/sparse_matrix_05.cc
+++ b/tests/trilinos/sparse_matrix_05.cc
@@ -57,7 +57,8 @@ int main (int argc,char **argv)
 
 
   // now copy everything into a Trilinos matrix
-  Epetra_Map map(5,5,0,Utilities::Trilinos::comm_world());
+  Epetra_Map map(TrilinosWrappers::types::int_type(5),
+                5,0,Utilities::Trilinos::comm_world());
   TrilinosWrappers::SparseMatrix tmatrix;
   tmatrix.reinit (map, map, matrix, 0, true, &xsparsity);
 

diff --git a/tests/trilinos/sparse_matrix_07.cc b/tests/trilinos/sparse_matrix_07.cc
index 6637f08708df31773ee9842299d5af424725e4f1..e8376a070a273116627ae4ef1527530495bff294 100644 (file)
--- a/tests/trilinos/sparse_matrix_07.cc
+++ b/tests/trilinos/sparse_matrix_07.cc
@@ -61,7 +61,8 @@ int main (int argc,char **argv)
 
 
   // now copy everything into a Trilinos matrix
-  Epetra_Map map(5,5,0,Utilities::Trilinos::comm_world());
+  Epetra_Map map(TrilinosWrappers::types::int_type(5),
+                5,0,Utilities::Trilinos::comm_world());
   TrilinosWrappers::SparseMatrix tmatrix;
   tmatrix.reinit (map, map, matrix, 0, true, &xsparsity);
 

diff --git a/tests/trilinos/sparse_matrix_07_rectangle.cc b/tests/trilinos/sparse_matrix_07_rectangle.cc
index a873b39c5b3e5a9a4b3f1f30737a3b8edd4d61f6..383ddf199a9b048a84aac21a7abfe53e0be3ba7b 100644 (file)
--- a/tests/trilinos/sparse_matrix_07_rectangle.cc
+++ b/tests/trilinos/sparse_matrix_07_rectangle.cc
@@ -59,8 +59,9 @@ int main (int argc,char **argv)
 
 
   // now copy everything into a Trilinos matrix
-  Epetra_Map rowmap(4,4,0,Utilities::Trilinos::comm_world());
-  Epetra_Map colmap(5,5,0,Utilities::Trilinos::comm_world());
+  Epetra_Map rowmap(TrilinosWrappers::types::int_type(4),4,0,Utilities::Trilinos::comm_world());
+  Epetra_Map colmap(TrilinosWrappers::types::int_type(5),5,0,Utilities::Trilinos::comm_world());
+
   TrilinosWrappers::SparseMatrix tmatrix;
   tmatrix.reinit (rowmap, colmap, matrix, 0, true, &xsparsity);