From 91c624432845d45912a72fa2a63769e05d649945 Mon Sep 17 00:00:00 2001 From: bangerth Date: Fri, 24 Jun 2011 01:16:42 +0000 Subject: [PATCH] Remove static_casts that are now no longer necessary since parallel::distributed::DoFHandler has been merged into the global ::DoFHandler. git-svn-id: https://svn.dealii.org/trunk@23856 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/mpi/constraint_matrix_trilinos_bug.cc | 4 ++-- tests/mpi/p4est_2d_constraintmatrix_01.cc | 4 ++-- tests/mpi/p4est_2d_constraintmatrix_02.cc | 4 ++-- tests/mpi/p4est_2d_constraintmatrix_03.cc | 6 +++--- tests/mpi/p4est_2d_constraintmatrix_04.cc | 8 ++++---- tests/mpi/p4est_2d_constraintmatrix_05.cc | 4 ++-- tests/mpi/p4est_3d_constraintmatrix_01.cc | 4 ++-- tests/mpi/p4est_3d_constraintmatrix_02.cc | 2 +- tests/mpi/p4est_3d_constraintmatrix_03.cc | 8 ++++---- tests/mpi/p4est_3d_constraintmatrix_04.cc | 4 ++-- tests/mpi/p4est_get_subdomain_association.cc | 2 +- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/mpi/constraint_matrix_trilinos_bug.cc b/tests/mpi/constraint_matrix_trilinos_bug.cc index cf2f20b41a..7116fc1135 100644 --- a/tests/mpi/constraint_matrix_trilinos_bug.cc +++ b/tests/mpi/constraint_matrix_trilinos_bug.cc @@ -140,12 +140,12 @@ void test() x_rel.compress(); ConstraintMatrix cm(relevant_set); - DoFTools::make_hanging_node_constraints (* static_cast* >(&dofh), cm); + DoFTools::make_hanging_node_constraints (dofh, cm); std::vector velocity_mask (dim+1, true); velocity_mask[dim] = false; - VectorTools::interpolate_boundary_values (static_cast&>(dofh), + VectorTools::interpolate_boundary_values (dofh, 0, ZeroFunction(dim+1), cm, diff --git a/tests/mpi/p4est_2d_constraintmatrix_01.cc b/tests/mpi/p4est_2d_constraintmatrix_01.cc index 2cc3c28ff2..8ae11ba1a0 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_01.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_01.cc @@ -61,9 +61,9 @@ void test() DoFTools::extract_locally_active_dofs (dofh, dof_set); ConstraintMatrix cm; - DoFTools::make_hanging_node_constraints (* static_cast* >(&dofh), cm); + DoFTools::make_hanging_node_constraints (dofh, cm); ConstraintMatrix cm2(dof_set); - DoFTools::make_hanging_node_constraints (* static_cast* >(&dofh), cm2); + DoFTools::make_hanging_node_constraints (dofh, cm2); { std::ofstream file((std::string("p4est_2d_constraintmatrix_01/dat.") + Utilities::int_to_string(myid)).c_str()); diff --git a/tests/mpi/p4est_2d_constraintmatrix_02.cc b/tests/mpi/p4est_2d_constraintmatrix_02.cc index b4e2758a89..6d2631582f 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_02.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_02.cc @@ -64,9 +64,9 @@ void test() DoFTools::extract_locally_active_dofs (dofh, dof_set); ConstraintMatrix cm; - DoFTools::make_hanging_node_constraints (* static_cast* >(&dofh), cm); + DoFTools::make_hanging_node_constraints (dofh, cm); ConstraintMatrix cm2(dof_set); - DoFTools::make_hanging_node_constraints (* static_cast* >(&dofh), cm2); + DoFTools::make_hanging_node_constraints (dofh, cm2); if (myid==0) { diff --git a/tests/mpi/p4est_2d_constraintmatrix_03.cc b/tests/mpi/p4est_2d_constraintmatrix_03.cc index 4b79f3f60b..4e0d9c9de3 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_03.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_03.cc @@ -152,12 +152,12 @@ void test() x_rel.compress(); ConstraintMatrix cm(relevant_set); - DoFTools::make_hanging_node_constraints (* static_cast* >(&dofh), cm); + DoFTools::make_hanging_node_constraints (dofh, cm); std::vector velocity_mask (dim+1, true); velocity_mask[dim] = false; - VectorTools::interpolate_boundary_values (static_cast&>(dofh), + VectorTools::interpolate_boundary_values (dofh, 0, ZeroFunction(dim+1), cm, @@ -167,7 +167,7 @@ void test() no_normal_flux_boundaries.insert (1); - VectorTools::compute_no_normal_flux_constraints (static_cast&>(dofh), 0, + VectorTools::compute_no_normal_flux_constraints (dofh, 0, no_normal_flux_boundaries, cm); diff --git a/tests/mpi/p4est_2d_constraintmatrix_04.cc b/tests/mpi/p4est_2d_constraintmatrix_04.cc index 039ec5827f..b0388ea578 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_04.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_04.cc @@ -197,7 +197,7 @@ void test() TrilinosWrappers::MPI::Vector x; x.reinit(owned_set, MPI_COMM_WORLD); - VectorTools::interpolate(* static_cast* >(&dofh), + VectorTools::interpolate(dofh, TemperatureInitialValues(), x); x.compress(); @@ -286,12 +286,12 @@ void test() x_rel.compress(); ConstraintMatrix cm(relevant_set); - DoFTools::make_hanging_node_constraints (* static_cast* >(&dofh), cm); + DoFTools::make_hanging_node_constraints (dofh, cm); /* std::vector velocity_mask (dim+1, true); velocity_mask[dim] = false; - VectorTools::interpolate_boundary_values (static_cast&>(dofh), + VectorTools::interpolate_boundary_values (dofh, 0, ZeroFunction(1), cm, @@ -307,7 +307,7 @@ void test() TrilinosWrappers::MPI::Vector x_ref; x_ref.reinit(owned_set, MPI_COMM_WORLD); - VectorTools::interpolate(* static_cast* >(&dofh), + VectorTools::interpolate(dofh, TemperatureInitialValues(), x_ref); x_ref.compress(); diff --git a/tests/mpi/p4est_2d_constraintmatrix_05.cc b/tests/mpi/p4est_2d_constraintmatrix_05.cc index c8ebbaf31d..1a2c3a443d 100644 --- a/tests/mpi/p4est_2d_constraintmatrix_05.cc +++ b/tests/mpi/p4est_2d_constraintmatrix_05.cc @@ -57,7 +57,7 @@ void test() TrilinosWrappers::MPI::Vector x_ref; x_ref.reinit(owned_set, MPI_COMM_WORLD); - VectorTools::interpolate(* static_cast* >(&dofh), + VectorTools::interpolate(dofh, ConstantFunction (1.), x_ref); x_ref.compress(); @@ -69,7 +69,7 @@ void test() // anything x1 = x_ref; ConstraintMatrix cm(relevant_set); - DoFTools::make_hanging_node_constraints (* static_cast* >(&dofh), cm); + DoFTools::make_hanging_node_constraints (dofh, cm); cm.distribute(x1); x1 -= x_ref; diff --git a/tests/mpi/p4est_3d_constraintmatrix_01.cc b/tests/mpi/p4est_3d_constraintmatrix_01.cc index 271593821b..4ecb625df2 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_01.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_01.cc @@ -71,9 +71,9 @@ void test() DoFTools::extract_locally_relevant_dofs (dofh, dof_set); ConstraintMatrix cm; - DoFTools::make_hanging_node_constraints (* static_cast* >(&dofh), cm); + DoFTools::make_hanging_node_constraints (dofh, cm); ConstraintMatrix cm2(dof_set); - DoFTools::make_hanging_node_constraints (* static_cast* >(&dofh), cm2); + DoFTools::make_hanging_node_constraints (dofh, cm2); { std::ofstream file((std::string("p4est_3d_constraintmatrix_01/dat.") + Utilities::int_to_string(myid)).c_str()); diff --git a/tests/mpi/p4est_3d_constraintmatrix_02.cc b/tests/mpi/p4est_3d_constraintmatrix_02.cc index 576c05360d..84c358bfea 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_02.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_02.cc @@ -86,7 +86,7 @@ void test() x_rel.compress(); ConstraintMatrix cm(relevant_set); - DoFTools::make_hanging_node_constraints (* static_cast* >(&dofh), cm); + DoFTools::make_hanging_node_constraints (dofh, cm); //x.print(std::cout); cm.distribute(x); diff --git a/tests/mpi/p4est_3d_constraintmatrix_03.cc b/tests/mpi/p4est_3d_constraintmatrix_03.cc index 2802fb85a9..1255376e6f 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_03.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_03.cc @@ -196,7 +196,7 @@ void test() TrilinosWrappers::MPI::Vector x; x.reinit(owned_set, MPI_COMM_WORLD); - VectorTools::interpolate(* static_cast* >(&dofh), + VectorTools::interpolate(dofh, TemperatureInitialValues(), x); x.compress(); @@ -282,12 +282,12 @@ void test() x_rel.compress(); ConstraintMatrix cm(relevant_set); - DoFTools::make_hanging_node_constraints (* static_cast* >(&dofh), cm); + DoFTools::make_hanging_node_constraints (dofh, cm); /* std::vector velocity_mask (dim+1, true); velocity_mask[dim] = false; - VectorTools::interpolate_boundary_values (static_cast&>(dofh), + VectorTools::interpolate_boundary_values (dofh, 0, ZeroFunction(1), cm, @@ -303,7 +303,7 @@ void test() TrilinosWrappers::MPI::Vector x_ref; x_ref.reinit(owned_set, MPI_COMM_WORLD); - VectorTools::interpolate(* static_cast* >(&dofh), + VectorTools::interpolate(dofh, TemperatureInitialValues(), x_ref); x_ref.compress(); diff --git a/tests/mpi/p4est_3d_constraintmatrix_04.cc b/tests/mpi/p4est_3d_constraintmatrix_04.cc index 52aa676dd5..d03e903b2a 100644 --- a/tests/mpi/p4est_3d_constraintmatrix_04.cc +++ b/tests/mpi/p4est_3d_constraintmatrix_04.cc @@ -2,7 +2,7 @@ // $Id$ // Version: $Name$ // -// Copyright (C) 2009, 2010 by the deal.II authors +// Copyright (C) 2009, 2010, 2011 by the deal.II authors // // This file is subject to QPL and may not be distributed // without copyright and license information. Please refer @@ -59,7 +59,7 @@ void test () IndexSet locally_relevant (dof.n_dofs()); DoFTools::extract_locally_relevant_dofs (dof, locally_relevant); ConstraintMatrix constraints (locally_relevant); - DoFTools::make_hanging_node_constraints (static_cast&>(dof), constraints); + DoFTools::make_hanging_node_constraints (dof, constraints); constraints.close(); // print out constraints for each diff --git a/tests/mpi/p4est_get_subdomain_association.cc b/tests/mpi/p4est_get_subdomain_association.cc index 6394ab3f91..8f717f23e6 100644 --- a/tests/mpi/p4est_get_subdomain_association.cc +++ b/tests/mpi/p4est_get_subdomain_association.cc @@ -62,7 +62,7 @@ void test() const IndexSet set = DoFTools::dof_indices_with_subdomain_association - (static_cast&>(dofh), + (dofh, tr.locally_owned_subdomain()); deallog << set.n_elements() << std::endl; -- 2.39.5