From: Peter Munch <peterrmuench@gmail.com>
Date: Mon, 22 Jun 2020 09:52:25 +0000 (+0200)
Subject: Remove specialization of Tria::n_raw_lines()
X-Git-Tag: v9.3.0-rc1~1403^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=073bb688c445ddf3cc8f79c4b826d45e94470b5e;p=dealii.git

Remove specialization of Tria::n_raw_lines()
---

diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h
index 453c104c93..ba6d59837a 100644
--- a/include/deal.II/grid/tria.h
+++ b/include/deal.II/grid/tria.h
@@ -4157,9 +4157,6 @@ Triangulation<dim, spacedim>::coarse_cell_index_to_coarse_cell_id(
 
 /* -------------- declaration of explicit specializations ------------- */
 
-template <>
-unsigned int
-Triangulation<1, 1>::n_raw_lines(const unsigned int level) const;
 template <>
 unsigned int
 Triangulation<1, 1>::n_quads() const;
@@ -4190,9 +4187,6 @@ Triangulation<1, 1>::max_adjacent_cells() const;
 // -- Explicit specializations for codimension one grids
 
 
-template <>
-unsigned int
-Triangulation<1, 2>::n_raw_lines(const unsigned int level) const;
 template <>
 unsigned int
 Triangulation<1, 2>::n_quads() const;
@@ -4222,9 +4216,6 @@ Triangulation<1, 2>::max_adjacent_cells() const;
 // -- Explicit specializations for codimension two grids
 
 
-template <>
-unsigned int
-Triangulation<1, 3>::n_raw_lines(const unsigned int level) const;
 template <>
 unsigned int
 Triangulation<1, 3>::n_quads() const;
diff --git a/source/grid/tria.cc b/source/grid/tria.cc
index cd56522dbd..ce6d23b38f 100644
--- a/source/grid/tria.cc
+++ b/source/grid/tria.cc
@@ -13041,66 +13041,17 @@ Triangulation<dim, spacedim>::n_lines() const
 }
 
 
-// TODO: Merge the following 6 functions somehow
-template <>
-unsigned int
-Triangulation<1, 1>::n_raw_lines(const unsigned int level) const
-{
-  AssertIndexRange(level, n_levels());
-  return levels[level]->cells.n_objects();
-}
-
-
-template <>
-unsigned int
-Triangulation<1, 1>::n_raw_lines() const
-{
-  Assert(false, ExcNotImplemented());
-  return 0;
-}
-
-
-
-template <>
-unsigned int
-Triangulation<1, 2>::n_raw_lines(const unsigned int level) const
-{
-  AssertIndexRange(level, n_levels());
-  return levels[level]->cells.n_objects();
-}
-
-
-template <>
-unsigned int
-Triangulation<1, 2>::n_raw_lines() const
-{
-  Assert(false, ExcNotImplemented());
-  return 0;
-}
-
-
-template <>
-unsigned int
-Triangulation<1, 3>::n_raw_lines(const unsigned int level) const
-{
-  AssertIndexRange(level, n_levels());
-  return levels[level]->cells.n_objects();
-}
-
-template <>
-unsigned int
-Triangulation<1, 3>::n_raw_lines() const
-{
-  Assert(false, ExcNotImplemented());
-  return 0;
-}
-
-
 
 template <int dim, int spacedim>
 unsigned int
-Triangulation<dim, spacedim>::n_raw_lines(const unsigned int) const
+Triangulation<dim, spacedim>::n_raw_lines(const unsigned int level) const
 {
+  if (dim == 1)
+    {
+      AssertIndexRange(level, n_levels());
+      return levels[level]->cells.n_objects();
+    }
+
   Assert(false, ExcFacesHaveNoLevel());
   return 0;
 }
@@ -13110,6 +13061,12 @@ template <int dim, int spacedim>
 unsigned int
 Triangulation<dim, spacedim>::n_raw_lines() const
 {
+  if (dim == 1)
+    {
+      Assert(false, ExcNotImplemented());
+      return 0;
+    }
+
   return faces->lines.n_objects();
 }