From eb9578c51aac920fc11fe2f8bb8d67583305552a Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Tue, 25 Jun 2013 06:44:20 +0000 Subject: [PATCH] fix more parallel multigrid issues git-svn-id: https://svn.dealii.org/trunk@29887 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/multigrid/mg_tools.cc | 34 ++++++++++++++-------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/deal.II/source/multigrid/mg_tools.cc b/deal.II/source/multigrid/mg_tools.cc index 6aa349f79e..1fe985a341 100644 --- a/deal.II/source/multigrid/mg_tools.cc +++ b/deal.II/source/multigrid/mg_tools.cc @@ -958,7 +958,7 @@ namespace MGTools { const FiniteElement &fe = dof_handler.get_fe(); const unsigned int n_components = fe.n_components(); - const unsigned int nlevels = dof_handler.get_tria().n_levels(); + const unsigned int nlevels = dof_handler.get_tria().n_global_levels(); Assert (result.size() == nlevels, ExcDimensionMismatch(result.size(), nlevels)); @@ -1072,7 +1072,7 @@ namespace MGTools { const FiniteElement &fe = dof_handler.get_fe(); const unsigned int n_blocks = fe.n_blocks(); - const unsigned int n_levels = dof_handler.get_tria().n_levels(); + const unsigned int n_levels = dof_handler.get_tria().n_global_levels(); AssertDimension (dofs_per_block.size(), n_levels); @@ -1185,7 +1185,7 @@ namespace MGTools if (function_map.size() == 0) return; - const unsigned int n_levels = dof.get_tria().n_levels(); + const unsigned int n_levels = dof.get_tria().n_global_levels(); @@ -1393,14 +1393,14 @@ namespace MGTools std::vector &boundary_indices, const ComponentMask &component_mask) { - Assert (boundary_indices.size() == dof.get_tria().n_levels(), + Assert (boundary_indices.size() == dof.get_tria().n_global_levels(), ExcDimensionMismatch (boundary_indices.size(), - dof.get_tria().n_levels())); + dof.get_tria().n_global_levels())); std::vector > - my_boundary_indices (dof.get_tria().n_levels()); + my_boundary_indices (dof.get_tria().n_global_levels()); make_boundary_list (dof, function_map, my_boundary_indices, component_mask); - for (unsigned int i=0; i &mg_dof_handler, std::vector > &interface_dofs) { - Assert (interface_dofs.size() == mg_dof_handler.get_tria().n_levels(), + Assert (interface_dofs.size() == mg_dof_handler.get_tria().n_global_levels(), ExcDimensionMismatch (interface_dofs.size(), - mg_dof_handler.get_tria().n_levels())); + mg_dof_handler.get_tria().n_global_levels())); - for (unsigned int l=0; l &mg_dof_handler, std::vector > &non_interface_dofs) { - Assert (non_interface_dofs.size() == mg_dof_handler.get_tria().n_levels(), + Assert (non_interface_dofs.size() == mg_dof_handler.get_tria().n_global_levels(), ExcDimensionMismatch (non_interface_dofs.size(), - mg_dof_handler.get_tria().n_levels())); + mg_dof_handler.get_tria().n_global_levels())); const FiniteElement &fe = mg_dof_handler.get_fe(); @@ -1553,14 +1553,14 @@ namespace MGTools std::vector > &interface_dofs, std::vector > &boundary_interface_dofs) { - Assert (interface_dofs.size() == mg_dof_handler.get_tria().n_levels(), + Assert (interface_dofs.size() == mg_dof_handler.get_tria().n_global_levels(), ExcDimensionMismatch (interface_dofs.size(), - mg_dof_handler.get_tria().n_levels())); - Assert (boundary_interface_dofs.size() == mg_dof_handler.get_tria().n_levels(), + mg_dof_handler.get_tria().n_global_levels())); + Assert (boundary_interface_dofs.size() == mg_dof_handler.get_tria().n_global_levels(), ExcDimensionMismatch (boundary_interface_dofs.size(), - mg_dof_handler.get_tria().n_levels())); + mg_dof_handler.get_tria().n_global_levels())); - for (unsigned int l=0; l