Merged CellData() constructor with trunk version

git-svn-id: https://svn.dealii.org/branches/branch_manifold_id@31685 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/include/deal.II/grid/tria.h b/deal.II/include/deal.II/grid/tria.h
index a15b9b0e2695f178a69816e0e93b18e85e78ab20..aad2764a5794494230993e2a3c9436c33e482b55 100644 (file)
--- a/deal.II/include/deal.II/grid/tria.h
+++ b/deal.II/include/deal.II/grid/tria.h
@@ -100,11 +100,6 @@ template <int dim, int spacedim> class MGDoFHandler;
 template <int structdim>
 struct CellData
 {
-                                    /** Default constructor. Set
-                                        members to meaningful default
-                                        values. */
-    CellData();
-
   /**
    * Indices of the vertices of
    * this cell.
@@ -3334,6 +3329,10 @@ CellData<structdim>::CellData ()
     vertices[i] = numbers::invalid_unsigned_int;
 
   material_id = 0;
+  // Set the face to be interior
+  boundary_id = numbers::internal_face_boundary_id;
+  // And the manifold to be invalid
+  manifold_id = numbers::invalid_manifold_id;
 }
 
 

diff --git a/deal.II/source/grid/tria.cc b/deal.II/source/grid/tria.cc
index e964f71b9a92b5ccbb7d9cd525c3a6f2ff3261dc..4d944f8ee8e21d1b4bb30f6fba00da6efcfff59e 100644 (file)
--- a/deal.II/source/grid/tria.cc
+++ b/deal.II/source/grid/tria.cc
@@ -131,14 +131,14 @@ namespace {
 }
 
 
-template<int dim>
-CellData<dim>::CellData()
-{
-                                  // Set the face to be interior
-  boundary_id = numbers::internal_face_boundary_id;
-                                  // And the manifold to be invalid
-  manifold_id = numbers::invalid_manifold_id;
-}
+// template<int dim>
+// CellData<dim>::CellData()
+// {
+//                                // Set the face to be interior
+//   boundary_id = numbers::internal_face_boundary_id;
+//                                // And the manifold to be invalid
+//   manifold_id = numbers::invalid_manifold_id;
+// }
 
 
 bool