Fix some tests.

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

diff --git a/tests/bits/fe_tools_common.h b/tests/bits/fe_tools_common.h
index 3cdf6c191d9d6e2d7811d2b3ae998e42463a24dd..66051b8a0103ccf9f0a63d40cea60ad46d347d49 100644 (file)
--- a/tests/bits/fe_tools_common.h
+++ b/tests/bits/fe_tools_common.h
@@ -84,7 +84,7 @@ output_vector (const VECTOR &v)
                                    // write out at most 20 equispaced
                                    // elements of the vector
   for (unsigned int i=0; i<v.size(); i+=std::max(static_cast<typename VECTOR::size_type>(1),
-        v.size()/20))
+        static_cast<typename VECTOR::size_type>(v.size()/20)))
     deallog << v(i) << ' ';
   deallog << std::endl;
 }

diff --git a/tests/mpi/petsc_distribute_01.cc b/tests/mpi/petsc_distribute_01.cc
index aba4f8ce9af622fd426032e27821614c490784e1..79a25e8490abaf9afcd24b6d5ec64af16b9a2398 100644 (file)
--- a/tests/mpi/petsc_distribute_01.cc
+++ b/tests/mpi/petsc_distribute_01.cc
@@ -61,7 +61,7 @@ void test()
   // owned range by 50 on each side
   IndexSet locally_relevant_range (vec.size());
   locally_relevant_range.add_range (std::max<int> (100*myid-50, 0),
-                                   std::min (100*myid+150, vec.size()));
+                                   std::min (static_cast<types::global_dof_index>(100*myid+150), vec.size()));
   ConstraintMatrix cm (locally_relevant_range);
 
   // add constraints that constrain an element in the middle of the

diff --git a/tests/mpi/petsc_distribute_01_block.cc b/tests/mpi/petsc_distribute_01_block.cc
index 996d6ae2bf3de2da32c44fb2a5ced20687aa35b1..7b8d14f59c5d88a46b47b0f695392af46fc062c4 100644 (file)
--- a/tests/mpi/petsc_distribute_01_block.cc
+++ b/tests/mpi/petsc_distribute_01_block.cc
@@ -64,9 +64,9 @@ void test()
   // owned range by 50 on each side
   IndexSet locally_relevant_range (vec.size());
   locally_relevant_range.add_range (std::max<int> (100*myid-50, 0),
-                                   std::min (100*myid+150, vec.block(0).size()));
+                                   std::min (static_cast<types::global_dof_index>(100*myid+150), vec.block(0).size()));
   locally_relevant_range.add_range (vec.block(0).size()+std::max<int> (100*myid-50, 0),
-                                   vec.block(0).size()+std::min (100*myid+150, vec.block(0).size()));
+                                   vec.block(0).size()+std::min (static_cast<types::global_dof_index>(100*myid+150), vec.block(0).size()));
   ConstraintMatrix cm (locally_relevant_range);
 
   // add constraints that constrain an element in the middle of the

diff --git a/tests/mpi/petsc_distribute_01_inhomogenous.cc b/tests/mpi/petsc_distribute_01_inhomogenous.cc
index d1f623311a43275e475fbea8cf1c566b806c4dd5..1dd01bae8dc80248ccc82765c59e973f4968e99f 100644 (file)
--- a/tests/mpi/petsc_distribute_01_inhomogenous.cc
+++ b/tests/mpi/petsc_distribute_01_inhomogenous.cc
@@ -53,7 +53,7 @@ void test()
   // owned range by 50 on each side
   IndexSet locally_relevant_range (vec.size());
   locally_relevant_range.add_range (std::max<int> (100*myid-50, 0),
-                                   std::min (100*myid+150, vec.size()));
+                                   std::min (static_cast<types::global_dof_index>(100*myid+150), vec.size()));
   ConstraintMatrix cm (locally_relevant_range);
 
   // add constraints that constrain an element in the middle of the

diff --git a/tests/mpi/trilinos_distribute_01.cc b/tests/mpi/trilinos_distribute_01.cc
index 79675d3e6c7b849cad26784e6e3b091a2c70fa3c..6c6f77a2eaa53caa8b6398cf00d9afa7fd47ff77 100644 (file)
--- a/tests/mpi/trilinos_distribute_01.cc
+++ b/tests/mpi/trilinos_distribute_01.cc
@@ -66,7 +66,7 @@ void test()
   // owned range by 50 on each side
   IndexSet locally_relevant_range (vec.size());
   locally_relevant_range.add_range (std::max<int> (100*myid-50, 0),
-                                   std::min (100*myid+150, vec.size()));
+                                   std::min (static_cast<types::global_dof_index>(100*myid+150), vec.size()));
   ConstraintMatrix cm (locally_relevant_range);
 
   // add constraints that constrain an element in the middle of the

diff --git a/tests/mpi/trilinos_distribute_01_block.cc b/tests/mpi/trilinos_distribute_01_block.cc
index f2e19ae9a87f34debbed7e3584c07ec302abd272..cf4de849e7cd9d9dc729f1b59ce78d256f54f5eb 100644 (file)
--- a/tests/mpi/trilinos_distribute_01_block.cc
+++ b/tests/mpi/trilinos_distribute_01_block.cc
@@ -68,9 +68,9 @@ void test()
   // owned range by 50 on each side
   IndexSet locally_relevant_range (vec.size());
   locally_relevant_range.add_range (std::max<int> (100*myid-50, 0),
-                                   std::min (100*myid+150, vec.block(0).size()));
+                                   std::min (static_cast<types::global_dof_index>(100*myid+150), vec.block(0).size()));
   locally_relevant_range.add_range (vec.block(0).size()+std::max<int> (100*myid-50, 0),
-                                   vec.block(0).size()+std::min (100*myid+150, vec.block(0).size()));
+                                   vec.block(0).size()+std::min (static_cast<types::global_dof_index>(100*myid+150), vec.block(0).size()));
   ConstraintMatrix cm (locally_relevant_range);
 
   // add constraints that constrain an element in the middle of the

diff --git a/tests/mpi/trilinos_distribute_01_inhomogenous.cc b/tests/mpi/trilinos_distribute_01_inhomogenous.cc
index 61f17fdc492daae8a2f749745c9b0e26470586df..956f0e26c9637faba50870e5d02bbf4935fb4ebd 100644 (file)
--- a/tests/mpi/trilinos_distribute_01_inhomogenous.cc
+++ b/tests/mpi/trilinos_distribute_01_inhomogenous.cc
@@ -58,7 +58,7 @@ void test()
   // owned range by 50 on each side
   IndexSet locally_relevant_range (vec.size());
   locally_relevant_range.add_range (std::max<int> (100*myid-50, 0),
-                                   std::min (100*myid+150, vec.size()));
+                                   std::min (static_cast<types::global_dof_index>(100*myid+150), vec.size()));
   ConstraintMatrix cm (locally_relevant_range);
 
   // add constraints that constrain an element in the middle of the

diff --git a/tests/trilinos/precondition_q_iso_q1.cc b/tests/trilinos/precondition_q_iso_q1.cc
index bc0f5dbbec0020b2564bcb94eca48423ce5a06a3..3656f3f93d78443f02f85915c924844f0ac9b1c7 100644 (file)
--- a/tests/trilinos/precondition_q_iso_q1.cc
+++ b/tests/trilinos/precondition_q_iso_q1.cc
@@ -174,7 +174,7 @@ void Step4<dim>::assemble_system ()
   FullMatrix<double>   cell_matrix (dofs_per_cell, dofs_per_cell);
   Vector<double>       cell_rhs (dofs_per_cell);
 
-  std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+  std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
   typename DoFHandler<dim>::active_cell_iterator
   cell = dof_handler.begin_active(),
@@ -227,7 +227,7 @@ void Step4<dim>::assemble_preconditioner ()
   FullMatrix<double>   cell_matrix (dofs_per_cell, dofs_per_cell);
   Vector<double>       cell_rhs (dofs_per_cell);
 
-  std::vector<unsigned int> local_dof_indices (dofs_per_cell);
+  std::vector<types::global_dof_index> local_dof_indices (dofs_per_cell);
 
   typename DoFHandler<dim>::active_cell_iterator
   cell = dof_handler_precondition.begin_active(),