From: bangerth Date: Wed, 3 Mar 2010 20:47:36 +0000 (+0000) Subject: Avoid strange temporary variable that only obscures what's going on. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46a47a95f1f699d66f0cee475ed7e2d9d62ccfe4;p=dealii-svn.git Avoid strange temporary variable that only obscures what's going on. git-svn-id: https://svn.dealii.org/trunk@20732 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/multigrid/mg_transfer_component.cc b/deal.II/deal.II/source/multigrid/mg_transfer_component.cc index 8ec9dedbb9..516abe1957 100644 --- a/deal.II/deal.II/source/multigrid/mg_transfer_component.cc +++ b/deal.II/deal.II/source/multigrid/mg_transfer_component.cc @@ -196,7 +196,7 @@ namespace for (unsigned int i=0; i > @@ -247,18 +247,17 @@ MGTransferSelect::do_copy_to_mg ( for (unsigned int level=mg_dof_handler.get_tria().n_levels(); level!=0;) { --level; - Vector &dst_level = dst[level]; typedef std::vector >::const_iterator IT; for (IT i=copy_to_and_from_indices[level].begin(); i != copy_to_and_from_indices[level].end(); ++i) - dst_level(i->second) = src(i->first); + dst[level](i->second) = src(i->first); // for that part of the level // which is further refined: // get the defect by // restriction of the defect on // one level higher - if(!first) + if (!first) restrict_and_add (level+1, dst[level], dst[level+1]); first = false; } @@ -504,10 +503,10 @@ void MGTransferComponentBase::build_matrices ( // but only in the column of // the prolongation matrix //TODO: this way is not very efficient - + if(boundary_indices.size() != 0) { - std::vector > + std::vector > dofs_per_component(mg_dof.get_tria().n_levels(), std::vector(n_components)); @@ -534,7 +533,7 @@ void MGTransferComponentBase::build_matrices ( const BlockIndices block_indices_coarse (dofs_per_component[level]); const unsigned int global_j = block_indices_coarse.local_to_global(iblock, column_number); - std::set::const_iterator found_dof = + std::set::const_iterator found_dof = boundary_indices[level].find(global_j); const bool is_boundary_index = @@ -643,14 +642,14 @@ void MGTransferSelect::build_matrices ( { const unsigned int component = fe.system_to_component_index(i).first; - if (selected[component] && + if (selected[component] && !interface_dofs[level][level_dof_indices[i]]) { const unsigned int level_start = mg_component_start[level][mg_target_component[component]]; const unsigned int global_start = component_start[target_component[component]]; - temp_copy_indices[level_dof_indices[i]-level_start] = + temp_copy_indices[level_dof_indices[i]-level_start] = global_dof_indices[i];//-global_start; } }