From 6a39ae2928cb7b0f93d76081346831f7fffcd3cc Mon Sep 17 00:00:00 2001 From: heister Date: Fri, 14 Oct 2011 15:58:09 +0000 Subject: [PATCH] udpate test and make it pass git-svn-id: https://svn.dealii.org/trunk@24603 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/mpi/p4est_save_03.cc | 138 ++++++++++---------- tests/mpi/p4est_save_03/ncpu_10/cmp/generic | 2 +- tests/mpi/p4est_save_03/ncpu_4/cmp/generic | 2 +- 3 files changed, 71 insertions(+), 71 deletions(-) diff --git a/tests/mpi/p4est_save_03.cc b/tests/mpi/p4est_save_03.cc index 03fbbdcdde..c201e06016 100644 --- a/tests/mpi/p4est_save_03.cc +++ b/tests/mpi/p4est_save_03.cc @@ -49,46 +49,46 @@ void test() deallog << "hyper_cube" << std::endl; std::string filename = - (std::string("p4est_save_03/ncpu_") + Utilities::int_to_string(Utilities::System::get_n_mpi_processes (MPI_COMM_WORLD)) + "/dat"); + (std::string ("p4est_save_03/ncpu_") + Utilities::int_to_string (Utilities::System::get_n_mpi_processes (MPI_COMM_WORLD)) + "/dat"); { - parallel::distributed::Triangulation tr(MPI_COMM_WORLD); + parallel::distributed::Triangulation tr (MPI_COMM_WORLD); - GridGenerator::hyper_cube(tr); + GridGenerator::hyper_cube (tr); - tr.refine_global(2); + tr.refine_global (2); for (typename Triangulation::active_cell_iterator - cell = tr.begin_active(); - cell != tr.end(); ++cell) + cell = tr.begin_active(); + cell != tr.end(); ++cell) if (!cell->is_ghost() && !cell->is_artificial()) - if (cell->center().norm() < 0.3) - { - cell->set_refine_flag(); - } + if (cell->center().norm() < 0.3) + { + cell->set_refine_flag(); + } tr.execute_coarsening_and_refinement (); - FE_Q fe(1); - DoFHandler dh(tr); + FE_Q fe (1); + DoFHandler dh (tr); - dh.distribute_dofs(fe); + dh.distribute_dofs (fe); IndexSet locally_owned_dofs = dh.locally_owned_dofs (); IndexSet locally_relevant_dofs; - DoFTools::extract_locally_relevant_dofs (dh,locally_relevant_dofs); + DoFTools::extract_locally_relevant_dofs (dh, locally_relevant_dofs); - PETScWrappers::MPI::Vector solution(MPI_COMM_WORLD,locally_owned_dofs,locally_relevant_dofs); - PETScWrappers::MPI::Vector solution2(MPI_COMM_WORLD,locally_owned_dofs,locally_relevant_dofs); + PETScWrappers::MPI::Vector solution (MPI_COMM_WORLD, locally_owned_dofs, locally_relevant_dofs); + PETScWrappers::MPI::Vector solution2 (MPI_COMM_WORLD, locally_owned_dofs, locally_relevant_dofs); - parallel::distributed::SolutionTransfer soltrans(dh); - parallel::distributed::SolutionTransfer soltrans2(dh); + parallel::distributed::SolutionTransfer soltrans (dh); + parallel::distributed::SolutionTransfer soltrans2 (dh); - for (unsigned int i=0;i tr(MPI_COMM_WORLD); + parallel::distributed::Triangulation tr (MPI_COMM_WORLD); - GridGenerator::hyper_cube(tr); - tr.load(filename.c_str()); - FE_Q fe(1); - DoFHandler dh(tr); + GridGenerator::hyper_cube (tr); + tr.load (filename.c_str()); + FE_Q fe (1); + DoFHandler dh (tr); - dh.distribute_dofs(fe); + dh.distribute_dofs (fe); IndexSet locally_owned_dofs = dh.locally_owned_dofs (); IndexSet locally_relevant_dofs; - DoFTools::extract_locally_relevant_dofs (dh,locally_relevant_dofs); + DoFTools::extract_locally_relevant_dofs (dh, locally_relevant_dofs); - PETScWrappers::MPI::Vector solution(MPI_COMM_WORLD,locally_owned_dofs); - PETScWrappers::MPI::Vector solution2(MPI_COMM_WORLD,locally_owned_dofs); - parallel::distributed::SolutionTransfer soltrans(dh); - parallel::distributed::SolutionTransfer soltrans2(dh); + PETScWrappers::MPI::Vector solution (MPI_COMM_WORLD, locally_owned_dofs); + PETScWrappers::MPI::Vector solution2 (MPI_COMM_WORLD, locally_owned_dofs); + parallel::distributed::SolutionTransfer soltrans (dh); + parallel::distributed::SolutionTransfer soltrans2 (dh); solution = 2; - soltrans.deserialize(solution); - soltrans2.deserialize(solution2); - - for (unsigned int i=0;i(); deallog.pop(); } @@ -198,7 +198,7 @@ int main(int argc, char *argv[]) #ifdef DEAL_II_COMPILER_SUPPORTS_MPI - //MPI_Finalize(); + //MPI_Finalize(); PetscFinalize(); #endif diff --git a/tests/mpi/p4est_save_03/ncpu_10/cmp/generic b/tests/mpi/p4est_save_03/ncpu_10/cmp/generic index 8b71035d8d..68c7fbdf19 100644 --- a/tests/mpi/p4est_save_03/ncpu_10/cmp/generic +++ b/tests/mpi/p4est_save_03/ncpu_10/cmp/generic @@ -6,5 +6,5 @@ DEAL:0:2d::Checksum: 136119115 DEAL:0:2d::#cells = 19 DEAL:0:2d::cells(0) = 1 DEAL:0:2d::Checksum: 136119115 -DEAL:0:2d::sum: 435.000 +DEAL:0:2d::sum: 435.000 870.000 DEAL:0:2d::OK diff --git a/tests/mpi/p4est_save_03/ncpu_4/cmp/generic b/tests/mpi/p4est_save_03/ncpu_4/cmp/generic index d6287bcc89..bf97dfd8ef 100644 --- a/tests/mpi/p4est_save_03/ncpu_4/cmp/generic +++ b/tests/mpi/p4est_save_03/ncpu_4/cmp/generic @@ -6,5 +6,5 @@ DEAL:0:2d::Checksum: 136119115 DEAL:0:2d::#cells = 19 DEAL:0:2d::cells(0) = 10 DEAL:0:2d::Checksum: 136119115 -DEAL:0:2d::sum: 435.000 +DEAL:0:2d::sum: 435.000 870.000 DEAL:0:2d::OK -- 2.39.5