From 512670734b7fa39fd8f9d9223f59f01a8b9c6fba Mon Sep 17 00:00:00 2001 From: heister Date: Sat, 25 May 2013 08:22:36 +0000 Subject: [PATCH] fix stuff I broke yesterday git-svn-id: https://svn.dealii.org/trunk@29584 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/multigrid/mg_tools.cc | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/deal.II/source/multigrid/mg_tools.cc b/deal.II/source/multigrid/mg_tools.cc index 0ec23e20e7..f92d2caa2d 100644 --- a/deal.II/source/multigrid/mg_tools.cc +++ b/deal.II/source/multigrid/mg_tools.cc @@ -554,7 +554,8 @@ namespace MGTools typename DH::cell_iterator cell = dof.begin(level), endc = dof.end(level); for (; cell!=endc; ++cell) - if (dof.get_tria().locally_owned_subdomain()==numbers::invalid_subdomain_id || cell->level_subdomain_id()==dof.get_tria().locally_owned_subdomain()) + if (dof.get_tria().locally_owned_subdomain()==numbers::invalid_subdomain_id + || cell->level_subdomain_id()==dof.get_tria().locally_owned_subdomain()) { cell->get_mg_dof_indices (dofs_on_this_cell); // make sparsity pattern for this cell @@ -1201,7 +1202,8 @@ namespace MGTools endc = dof.end(); for (; cell!=endc; ++cell) { - if (cell->level_subdomain_id()!=dof.get_tria().locally_owned_subdomain()) + if (cell->level_subdomain_id()!=dof.get_tria().locally_owned_subdomain() + && dof.get_tria().locally_owned_subdomain()!=numbers::invalid_subdomain_id) continue; const FiniteElement &fe = cell->get_fe(); const unsigned int level = cell->level(); @@ -1234,6 +1236,8 @@ namespace MGTools cell = dof.begin(), endc = dof.end(); for (; cell!=endc; ++cell) + if (cell->level_subdomain_id()==dof.get_tria().locally_owned_subdomain() + || dof.get_tria().locally_owned_subdomain()==numbers::invalid_subdomain_id) for (unsigned int face_no = 0; face_no < GeometryInfo::faces_per_cell; ++face_no) { @@ -1432,7 +1436,8 @@ namespace MGTools for (; cell!=endc; ++cell) { - if (cell->level_subdomain_id()!=mg_dof_handler.get_tria().locally_owned_subdomain()) + if (cell->level_subdomain_id()!=mg_dof_handler.get_tria().locally_owned_subdomain() + && mg_dof_handler.get_tria().locally_owned_subdomain()!=numbers::invalid_subdomain_id) continue; std::fill (cell_dofs.begin(), cell_dofs.end(), false); @@ -1489,7 +1494,8 @@ namespace MGTools for (; cell!=endc; ++cell) { - if (cell->level_subdomain_id()!=mg_dof_handler.get_tria().locally_owned_subdomain()) + if (cell->level_subdomain_id()!=mg_dof_handler.get_tria().locally_owned_subdomain() + && mg_dof_handler.get_tria().locally_owned_subdomain()!=numbers::invalid_subdomain_id) continue; std::fill (cell_dofs.begin(), cell_dofs.end(), false); @@ -1579,7 +1585,8 @@ namespace MGTools for (; cell!=endc; ++cell) { - if (cell->level_subdomain_id()!=mg_dof_handler.get_tria().locally_owned_subdomain()) + if (cell->level_subdomain_id()!=mg_dof_handler.get_tria().locally_owned_subdomain() + && mg_dof_handler.get_tria().locally_owned_subdomain()!=numbers::invalid_subdomain_id) continue; bool has_coarser_neighbor = false; -- 2.39.5