From: Bruno Turcksin Date: Fri, 22 Mar 2013 16:40:31 +0000 (+0000) Subject: Revert tests/mpi/compute_mean_value.cc to the correct version. X-Git-Tag: v8.0.0~316^2~108 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d04ee866fe6ad459bf18713d0156511186ca1a2;p=dealii.git Revert tests/mpi/compute_mean_value.cc to the correct version. git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28993 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/source/base/index_set.cc b/deal.II/source/base/index_set.cc index 2e194f2a7f..367966a744 100644 --- a/deal.II/source/base/index_set.cc +++ b/deal.II/source/base/index_set.cc @@ -72,7 +72,7 @@ IndexSet::do_compress () const // now compute indices within set and the // range with most elements - unsigned int next_index = 0, largest_range_size = 0; + types::global_dof_index next_index = 0, largest_range_size = 0; for (std::vector::iterator i = ranges.begin(); i != ranges.end(); diff --git a/tests/mpi/compute_mean_value.cc b/tests/mpi/compute_mean_value.cc index 7fe5620907..dd9d65c3e8 100644 --- a/tests/mpi/compute_mean_value.cc +++ b/tests/mpi/compute_mean_value.cc @@ -64,25 +64,25 @@ void test() DoFHandler dofh(tr); dofh.distribute_dofs (fe); -// TrilinosWrappers::MPI::Vector interpolated(dofh.locally_owned_dofs(), -// MPI_COMM_WORLD); -// VectorTools::interpolate (dofh, -// LinearFunction(), -// interpolated); -// -// IndexSet relevant_set; -// DoFTools::extract_locally_relevant_dofs (dofh, relevant_set); -// TrilinosWrappers::MPI::Vector x_rel(relevant_set, MPI_COMM_WORLD); -// x_rel = interpolated; -// -// const double mean -// = VectorTools::compute_mean_value (dofh, QGauss(2), x_rel, 0); -// -// if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) -// deallog << "mean=" << mean -// << std::endl; -// -// Assert (std::fabs(mean - 2) < 1e-3, ExcInternalError()); + TrilinosWrappers::MPI::Vector interpolated(dofh.locally_owned_dofs(), + MPI_COMM_WORLD); + VectorTools::interpolate (dofh, + LinearFunction(), + interpolated); + + IndexSet relevant_set; + DoFTools::extract_locally_relevant_dofs (dofh, relevant_set); + TrilinosWrappers::MPI::Vector x_rel(relevant_set, MPI_COMM_WORLD); + x_rel = interpolated; + + const double mean + = VectorTools::compute_mean_value (dofh, QGauss(2), x_rel, 0); + + if (Utilities::MPI::this_mpi_process (MPI_COMM_WORLD) == 0) + deallog << "mean=" << mean + << std::endl; + + Assert (std::fabs(mean - 2) < 1e-3, ExcInternalError()); }