From: David Wells <wellsd2@rpi.edu>
Date: Wed, 8 Mar 2017 01:10:38 +0000 (-0500)
Subject: Simplify a geometrical check.
X-Git-Tag: v8.5.0-rc1~54^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9601029a65b0c6712d655c114961a1894de5aa34;p=dealii.git

Simplify a geometrical check.

Both branches currently throw an exception, but the second message is more
descriptive.
---

diff --git a/source/grid/tria.cc b/source/grid/tria.cc
index 6a5ac44105..284169ef7a 100644
--- a/source/grid/tria.cc
+++ b/source/grid/tria.cc
@@ -1687,32 +1687,28 @@ namespace internal
               case 2:
                 break;
               default:
-                // in 1d, a node must have one or two adjacent lines
-                if (spacedim==1)
-                  Assert (false, ExcInternalError())
-                  else
-                    AssertThrow (false,
-                                 ExcMessage ("You have a vertex in your triangulation "
-                                             "at which more than two cells come together. "
-                                             "(For one dimensional triangulation, cells are "
-                                             "line segments.)"
-                                             "\n\n"
-                                             "This is not currently supported because the "
-                                             "Triangulation class makes the assumption that "
-                                             "every cell has zero or one neighbors behind "
-                                             "each face (here, behind each vertex), but in your "
-                                             "situation there would be more than one."
-                                             "\n\n"
-                                             "Support for this is not currently implemented. "
-                                             "If you need to work with triangulations where "
-                                             "more than two cells come together at a vertex, "
-                                             "duplicate the vertices once per cell (i.e., put "
-                                             "multiple vertices at the same physical location, "
-                                             "but using different vertex indices for each) "
-                                             "and then ensure continuity of the solution by "
-                                             "explicitly creating constraints that the degrees "
-                                             "of freedom at these vertices have the same "
-                                             "value, using the ConstraintMatrix class."));
+                AssertThrow (false,
+                             ExcMessage ("You have a vertex in your triangulation "
+                                         "at which more than two cells come together. "
+                                         "(For one dimensional triangulation, cells are "
+                                         "line segments.)"
+                                         "\n\n"
+                                         "This is not currently supported because the "
+                                         "Triangulation class makes the assumption that "
+                                         "every cell has zero or one neighbors behind "
+                                         "each face (here, behind each vertex), but in your "
+                                         "situation there would be more than one."
+                                         "\n\n"
+                                         "Support for this is not currently implemented. "
+                                         "If you need to work with triangulations where "
+                                         "more than two cells come together at a vertex, "
+                                         "duplicate the vertices once per cell (i.e., put "
+                                         "multiple vertices at the same physical location, "
+                                         "but using different vertex indices for each) "
+                                         "and then ensure continuity of the solution by "
+                                         "explicitly creating constraints that the degrees "
+                                         "of freedom at these vertices have the same "
+                                         "value, using the ConstraintMatrix class."));
               }
 
           // assert there are no more