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 c9251f111f6a7d18b67028a4db37e56f3d1bf72b..b208e361eb8f094bef124bb7470b957e0c5528f7 100644 (file)
--- 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 22a5b0cad1621113f091a4e0dd0e12e2253a7e0f..5636edcd4805737bd85df37c8a59f9af019700cf 100644 (file)
--- 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<dim, spacedim>::set_mesh_smoothing(const MeshSmoothing mesh_smooth
 
 template <int dim, int spacedim>
 void
-Triangulation<dim, spacedim>::set_boundary (const types::boundary_id m_number,
+Triangulation<dim, spacedim>::set_boundary (const types::manifold_id m_number,
                                             const Boundary<dim, spacedim> &boundary_object)
 {
   Assert(m_number < numbers::invalid_manifold_id,
@@ -9713,7 +9713,7 @@ Triangulation<dim, spacedim>::get_manifold_ids () const
       mi_exists[cell->manifold_id()] = true;
       if(dim>1)
        for (unsigned int face=0; face<GeometryInfo<dim>::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<dim, spacedim> &old_tria)
 
   faces         = new internal::Triangulation::TriaFaces<dim>(*old_tria.faces);
 
-  typename std::map<types::boundary_id,
+  typename std::map<types::manifold_id,
     SmartPointer<const Boundary<dim,spacedim> , Triangulation<dim, spacedim> > >::const_iterator
   bdry_iterator = old_tria.manifold.begin();
   for (; bdry_iterator != old_tria.manifold.end() ; bdry_iterator++)