From: bangerth Date: Sun, 13 Jul 2014 18:54:31 +0000 (+0000) Subject: Fix some fallout from changing the size of manifold_id. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd7f0d1a20f4a4fff61b1c70f03544a1f22f87eb;p=dealii-svn.git Fix some fallout from changing the size of manifold_id. git-svn-id: https://svn.dealii.org/branches/branch_manifold_id_intermediate@33153 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/include/deal.II/grid/tria_accessor.templates.h b/deal.II/include/deal.II/grid/tria_accessor.templates.h index c9251f111f..b208e361eb 100644 --- a/deal.II/include/deal.II/grid/tria_accessor.templates.h +++ b/deal.II/include/deal.II/grid/tria_accessor.templates.h @@ -2362,7 +2362,7 @@ types::manifold_id TriaAccessor<0, 1, spacedim>::manifold_id () const { if( tria->vertex_to_manifold_id_map_1d->find (this->vertex_index()) - != tria->vertex_to_boundary_id_map_1d->end()) + != tria->vertex_to_manifold_id_map_1d->end()) return (*tria->vertex_to_manifold_id_map_1d)[this->vertex_index()]; else return numbers::invalid_manifold_id; diff --git a/deal.II/source/grid/tria.cc b/deal.II/source/grid/tria.cc index 22a5b0cad1..5636edcd48 100644 --- a/deal.II/source/grid/tria.cc +++ b/deal.II/source/grid/tria.cc @@ -1,7 +1,7 @@ // --------------------------------------------------------------------- // $Id$ // -// Copyright (C) 1998 - 2013 by the deal.II authors +// Copyright (C) 1998 - 2014 by the deal.II authors // // This file is part of the deal.II library. // @@ -9592,7 +9592,7 @@ Triangulation::set_mesh_smoothing(const MeshSmoothing mesh_smooth template void -Triangulation::set_boundary (const types::boundary_id m_number, +Triangulation::set_boundary (const types::manifold_id m_number, const Boundary &boundary_object) { Assert(m_number < numbers::invalid_manifold_id, @@ -9713,7 +9713,7 @@ Triangulation::get_manifold_ids () const mi_exists[cell->manifold_id()] = true; if(dim>1) for (unsigned int face=0; face::faces_per_cell; ++face) - mi_exists[cell->face(face)->manifold_id()]=true; + mi_exists[cell->face(face)->manifold_id()] = true; } const unsigned int n_mi= @@ -9754,7 +9754,7 @@ copy_triangulation (const Triangulation &old_tria) faces = new internal::Triangulation::TriaFaces(*old_tria.faces); - typename std::map , Triangulation > >::const_iterator bdry_iterator = old_tria.manifold.begin(); for (; bdry_iterator != old_tria.manifold.end() ; bdry_iterator++)