From 84786128378b27e77319cbd2bf1790b0842c8034 Mon Sep 17 00:00:00 2001 From: turcksin Date: Fri, 31 May 2013 15:43:28 +0000 Subject: [PATCH] Fix some tests. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@29684 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/bits/fe_tools_common.h | 2 +- tests/mpi/petsc_distribute_01.cc | 2 +- tests/mpi/petsc_distribute_01_block.cc | 4 ++-- tests/mpi/petsc_distribute_01_inhomogenous.cc | 2 +- tests/mpi/trilinos_distribute_01.cc | 2 +- tests/mpi/trilinos_distribute_01_block.cc | 4 ++-- tests/mpi/trilinos_distribute_01_inhomogenous.cc | 2 +- tests/trilinos/precondition_q_iso_q1.cc | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/bits/fe_tools_common.h b/tests/bits/fe_tools_common.h index 3cdf6c191d..66051b8a01 100644 --- 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(1), - v.size()/20)) + static_cast(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 aba4f8ce9a..79a25e8490 100644 --- 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 (100*myid-50, 0), - std::min (100*myid+150, vec.size())); + std::min (static_cast(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 996d6ae2bf..7b8d14f59c 100644 --- 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 (100*myid-50, 0), - std::min (100*myid+150, vec.block(0).size())); + std::min (static_cast(100*myid+150), vec.block(0).size())); locally_relevant_range.add_range (vec.block(0).size()+std::max (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(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 d1f623311a..1dd01bae8d 100644 --- 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 (100*myid-50, 0), - std::min (100*myid+150, vec.size())); + std::min (static_cast(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 79675d3e6c..6c6f77a2ea 100644 --- 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 (100*myid-50, 0), - std::min (100*myid+150, vec.size())); + std::min (static_cast(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 f2e19ae9a8..cf4de849e7 100644 --- 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 (100*myid-50, 0), - std::min (100*myid+150, vec.block(0).size())); + std::min (static_cast(100*myid+150), vec.block(0).size())); locally_relevant_range.add_range (vec.block(0).size()+std::max (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(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 61f17fdc49..956f0e26c9 100644 --- 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 (100*myid-50, 0), - std::min (100*myid+150, vec.size())); + std::min (static_cast(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 bc0f5dbbec..3656f3f93d 100644 --- a/tests/trilinos/precondition_q_iso_q1.cc +++ b/tests/trilinos/precondition_q_iso_q1.cc @@ -174,7 +174,7 @@ void Step4::assemble_system () FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); typename DoFHandler::active_cell_iterator cell = dof_handler.begin_active(), @@ -227,7 +227,7 @@ void Step4::assemble_preconditioner () FullMatrix cell_matrix (dofs_per_cell, dofs_per_cell); Vector cell_rhs (dofs_per_cell); - std::vector local_dof_indices (dofs_per_cell); + std::vector local_dof_indices (dofs_per_cell); typename DoFHandler::active_cell_iterator cell = dof_handler_precondition.begin_active(), -- 2.39.5