Move implementation of CellData to the correct file

diff --git a/source/grid/tria.cc b/source/grid/tria.cc
index ff02597068832d41d735674368da31f9546cb9e7..fcd430def4f6760f14b4a15baa4c50ab3a7ac842 100644 (file)
--- a/source/grid/tria.cc
+++ b/source/grid/tria.cc
@@ -44,54 +44,6 @@
 DEAL_II_NAMESPACE_OPEN
 
 
-template <int structdim>
-CellData<structdim>::CellData()
-  : material_id(0)
-  , manifold_id(numbers::flat_manifold_id)
-{
-  std::fill(std::begin(vertices),
-            std::end(vertices),
-            numbers::invalid_unsigned_int);
-}
-
-
-
-template <int structdim>
-bool
-CellData<structdim>::operator==(const CellData<structdim> &other) const
-{
-  for (const unsigned int i : GeometryInfo<structdim>::vertex_indices())
-    if (vertices[i] != other.vertices[i])
-      return false;
-
-  if (material_id != other.material_id)
-    return false;
-
-  if (boundary_id != other.boundary_id)
-    return false;
-
-  if (manifold_id != other.manifold_id)
-    return false;
-
-  return true;
-}
-
-
-
-bool
-SubCellData::check_consistency(const unsigned int dim) const
-{
-  switch (dim)
-    {
-      case 1:
-        return ((boundary_lines.size() == 0) && (boundary_quads.size() == 0));
-      case 2:
-        return (boundary_quads.size() == 0);
-    }
-  return true;
-}
-
-
 namespace internal
 {
   namespace TriangulationImplementation

diff --git a/source/grid/tria.inst.in b/source/grid/tria.inst.in
index 24b2fc08f3170b041c7a2ca4da98bd0e0d772063..9b2ca1349e9b20afd7dfcc685025eb516f1dcfcc 100644 (file)
--- a/source/grid/tria.inst.in
+++ b/source/grid/tria.inst.in
@@ -19,8 +19,5 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
   {
 #if deal_II_dimension <= deal_II_space_dimension
     template class Triangulation<deal_II_dimension, deal_II_space_dimension>;
-#endif
-#if deal_II_dimension == deal_II_space_dimension
-    template struct CellData<deal_II_dimension>;
 #endif
   }

diff --git a/source/grid/tria_description.cc b/source/grid/tria_description.cc
index b4c6f5d713dbb3dda79bb6c41bac5b725a2608f7..9e015a8027cadfca72d9413e8018658ad8bbea38 100644 (file)
--- a/source/grid/tria_description.cc
+++ b/source/grid/tria_description.cc
@@ -27,6 +27,54 @@
 
 DEAL_II_NAMESPACE_OPEN
 
+
+template <int structdim>
+CellData<structdim>::CellData()
+  : material_id(0)
+  , manifold_id(numbers::flat_manifold_id)
+{
+  std::fill(std::begin(vertices),
+            std::end(vertices),
+            numbers::invalid_unsigned_int);
+}
+
+
+
+template <int structdim>
+bool
+CellData<structdim>::operator==(const CellData<structdim> &other) const
+{
+  for (const unsigned int i : GeometryInfo<structdim>::vertex_indices())
+    if (vertices[i] != other.vertices[i])
+      return false;
+
+  if (material_id != other.material_id)
+    return false;
+
+  if (boundary_id != other.boundary_id)
+    return false;
+
+  if (manifold_id != other.manifold_id)
+    return false;
+
+  return true;
+}
+
+
+
+bool
+SubCellData::check_consistency(const unsigned int dim) const
+{
+  switch (dim)
+    {
+      case 1:
+        return ((boundary_lines.size() == 0) && (boundary_quads.size() == 0));
+      case 2:
+        return (boundary_quads.size() == 0);
+    }
+  return true;
+}
+
 namespace TriangulationDescription
 {
   namespace Utilities

diff --git a/source/grid/tria_description.inst.in b/source/grid/tria_description.inst.in
index edbe39372f8b94e933e893e4f84b0863eed6e69f..1bc17dcf55ca93884d4fa6d64fe026e4acb7b0ff 100644 (file)
--- a/source/grid/tria_description.inst.in
+++ b/source/grid/tria_description.inst.in
@@ -49,3 +49,8 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : DIMENSIONS)
       \}
     \}
   }
+
+for (deal_II_dimension : DIMENSIONS)
+  {
+    template struct CellData<deal_II_dimension>;
+  }