From: kainan.wang <kainan.wang@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Tue, 26 Mar 2013 18:39:23 +0000 (+0000)
Subject: Change places in trilinos tests
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=460e5ab7deb1ab45eecc0691c830ef0bd2450266;p=dealii-svn.git

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 f37d844bd3..5b8a936a4c 100644
--- 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 9b03e2da7a..5c70babb2a 100644
--- 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 eb3849910a..d7e7ad1e46 100644
--- 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 6637f08708..e8376a070a 100644
--- 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 a873b39c5b..383ddf199a 100644
--- 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);