From: wolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Date: Tue, 3 Apr 2001 15:44:38 +0000 (+0000)
Subject: Better diagnostics in case someone enters a line twice.
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b446cdb320719261228abd654549cf4eec5de1b1;p=dealii-svn.git

Better diagnostics in case someone enters a line twice.


git-svn-id: https://svn.dealii.org/branches/Branch-3-1@4365 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/deal.II/include/grid/tria.h b/deal.II/deal.II/include/grid/tria.h
index 1769b4a9b0..33013365ed 100644
--- a/deal.II/deal.II/include/grid/tria.h
+++ b/deal.II/deal.II/include/grid/tria.h
@@ -2992,6 +2992,13 @@ class Triangulation : public TriaDimensionInfo<dim>,
 				      * Exception
 				      */
     DeclException0 (ExcInteriorQuadCantBeBoundary);
+    				     /**
+				      * Exception
+				      */
+    DeclException2 (ExcMultiplySetLineInfoOfLine,
+		    int, int,
+		    << "In SubCellData the line info of the line with vertex indices "
+		    << arg1 << " and " << arg2 << " is multiply set.");
 				     /**
 				      * Exception
 				      */
diff --git a/deal.II/deal.II/source/grid/tria.cc b/deal.II/deal.II/source/grid/tria.cc
index d6e4040b6a..c08fa1f366 100644
--- a/deal.II/deal.II/source/grid/tria.cc
+++ b/deal.II/deal.II/source/grid/tria.cc
@@ -729,9 +729,10 @@ void Triangulation<2>::create_triangulation (const std::vector<Point<2> >    &v,
 	    };
 	};
 
-				       // Assert that only exterior lines
-				       // are given a boundary indicator
-      if (! (line->boundary_indicator() == 0))
+				       // assert that we only set
+				       // boundary info once
+      if (line->boundary_indicator() != 0 &&
+	  line->boundary_indicator() != 255)
 	{
 					   // clear will only work if
 					   // there are no
@@ -750,6 +751,22 @@ void Triangulation<2>::create_triangulation (const std::vector<Point<2> >    &v,
 	  for (unsigned int i=0; i<n; ++i)
 	    subscribe();
 	  
+	  AssertThrow (false, ExcMultiplySetLineInfoOfLine(
+	    line_vertices.first, line_vertices.second));
+	};
+      
+				       // Assert that only exterior lines
+				       // are given a boundary indicator
+      if (line->boundary_indicator() == 255)
+	{
+					   // same as above
+	  const unsigned int n=n_subscriptions();
+	  for (unsigned int i=0; i<n; ++i)
+	    unsubscribe();
+	  clear ();
+	  for (unsigned int i=0; i<n; ++i)
+	    subscribe();
+	  
 	  AssertThrow (false, ExcInteriorLineCantBeBoundary());
 	};