From: bangerth Date: Mon, 7 Jan 2013 01:13:37 +0000 (+0000) Subject: More avoidance of deprecated things. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=141cfbb1e534eab43cd10c0f8bc40a471561b446;p=dealii-svn.git More avoidance of deprecated things. git-svn-id: https://svn.dealii.org/trunk@27951 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/source/distributed/tria.cc b/deal.II/source/distributed/tria.cc index 1061c5a2d3..a933e79b34 100644 --- a/deal.II/source/distributed/tria.cc +++ b/deal.II/source/distributed/tria.cc @@ -988,7 +988,7 @@ namespace const typename Triangulation::cell_iterator &dealii_cell, const typename internal::p4est::types::quadrant &p4est_cell, typename internal::p4est::types::forest &forest, - const types::subdomain_id_t my_subdomain, + const types::subdomain_id my_subdomain, const std::vector > &marked_vertices) { if (dealii_cell->level_subdomain_id()==numbers::artificial_subdomain_id) @@ -2762,7 +2762,7 @@ namespace parallel { if (cell->child(c)->level_subdomain_id()==this->locally_owned_subdomain()) { - types::subdomain_id_t mark = numbers::artificial_subdomain_id; + types::subdomain_id mark = numbers::artificial_subdomain_id; mark = cell->child(0)->level_subdomain_id(); Assert(mark != numbers::artificial_subdomain_id, ExcInternalError()); //we should know the child(0) cell->set_level_subdomain_id(mark); diff --git a/deal.II/source/dofs/dof_handler_policy.cc b/deal.II/source/dofs/dof_handler_policy.cc index 0f272aaa1f..fa280fadb2 100644 --- a/deal.II/source/dofs/dof_handler_policy.cc +++ b/deal.II/source/dofs/dof_handler_policy.cc @@ -1130,8 +1130,8 @@ namespace internal const unsigned int tree_index, const typename DoFHandler::level_cell_iterator &dealii_cell, const typename dealii::internal::p4est::types::quadrant &p4est_cell, - const std::map > &vertices_with_ghost_neighbors, - std::map::cellinfo> &needs_to_get_cell, + const std::map > &vertices_with_ghost_neighbors, + std::map::cellinfo> &needs_to_get_cell, const unsigned int level) { if (dealii_cell->level()>(int)level) @@ -1171,10 +1171,10 @@ namespace internal // check each vertex if // it is interesting and // push dofindices if yes - std::set send_to; + std::set send_to; for (unsigned int v=0; v::vertices_per_cell; ++v) { - const std::map >::const_iterator + const std::map >::const_iterator neighbor_subdomains_of_vertex = vertices_with_ghost_neighbors.find (dealii_cell->vertex_index(v)); @@ -1195,8 +1195,8 @@ namespace internal for (unsigned int c=0; c::max_children_per_cell; ++c) { //TODO: we don't know about our children if proc 0 owns all coarse cells! - dealii::types::subdomain_id_t dest = dealii_cell->child(c)->level_subdomain_id(); - Assert(dest!=dealii::numbers::artificial_subdomain_id && dest!=dealii::types::invalid_subdomain_id, ExcInternalError()); + dealii::types::subdomain_id dest = dealii_cell->child(c)->level_subdomain_id(); + Assert(dest!=dealii::numbers::artificial_subdomain_id && dest!=dealii::numbers::invalid_subdomain_id, ExcInternalError()); if (dest != tria.locally_owned_subdomain()) send_to.insert(dest); } @@ -1211,10 +1211,10 @@ namespace internal local_dof_indices (dealii_cell->get_fe().dofs_per_cell); dealii_cell->get_mg_dof_indices (local_dof_indices); - for (std::set::iterator it=send_to.begin(); + for (std::set::iterator it=send_to.begin(); it!=send_to.end(); ++it) { - const dealii::types::subdomain_id_t subdomain = *it; + const dealii::types::subdomain_id subdomain = *it; // get an iterator // to what needs to @@ -1223,7 +1223,7 @@ namespace internal // already exists), // or create such // an object - typename std::map::cellinfo>::iterator + typename std::map::cellinfo>::iterator p = needs_to_get_cell.insert (std::make_pair(subdomain, typename types::cellinfo())) @@ -1650,7 +1650,7 @@ namespace internal void communicate_mg_dof_indices_on_marked_cells (const DoFHandler<1,spacedim> &dof_handler, - const std::map > &vertices_with_ghost_neighbors, + const std::map > &vertices_with_ghost_neighbors, const std::vector &coarse_cell_to_p4est_tree_permutation, const std::vector &p4est_tree_to_coarse_cell_permutation, const unsigned int level) @@ -1664,7 +1664,7 @@ namespace internal void communicate_mg_dof_indices_on_marked_cells (const DoFHandler &dof_handler, - const std::map > &vertices_with_ghost_neighbors, + const std::map > &vertices_with_ghost_neighbors, const std::vector &coarse_cell_to_p4est_tree_permutation, const std::vector &p4est_tree_to_coarse_cell_permutation, const unsigned int level) @@ -1683,7 +1683,7 @@ namespace internal // dof_indices for the // interested neighbors typedef - std::map::cellinfo> + std::map::cellinfo> cellmap_t; cellmap_t needs_to_get_cells; @@ -1742,7 +1742,7 @@ namespace internal // mark all own cells, that miss some // dof_data and collect the neighbors // that are going to send stuff to us - std::set senders; + std::set senders; if (level < tr->n_levels()) { std::vector local_dof_indices; @@ -2298,7 +2298,7 @@ namespace internal // subdomain to the vertex and // keep track of interesting // neighbors - std::map > + std::map > vertices_with_ghost_neighbors; if (level < tr->n_levels()) for (typename DoFHandler::level_cell_iterator