From 9601029a65b0c6712d655c114961a1894de5aa34 Mon Sep 17 00:00:00 2001 From: David Wells Date: Tue, 7 Mar 2017 20:10:38 -0500 Subject: [PATCH] Simplify a geometrical check. Both branches currently throw an exception, but the second message is more descriptive. --- source/grid/tria.cc | 48 +++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 26 deletions(-) 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 -- 2.39.5