assert having Triangulation in DoFHandler

If you forget to initialize a DoFHandler with a Triangulation,
distribute_dofs() gives an unhelpful Assert() somewhere deep in the
code. Fix this.

diff --git a/source/dofs/dof_handler.cc b/source/dofs/dof_handler.cc
index 5013af979d45faad29b0f83fc32cc6f21009e1a5..1c1756a3c98bdae7631309dd8407a218d95d0af1 100644 (file)
--- a/source/dofs/dof_handler.cc
+++ b/source/dofs/dof_handler.cc
@@ -991,6 +991,12 @@ DoFHandler<dim,spacedim>::memory_consumption () const
 template <int dim, int spacedim>
 void DoFHandler<dim,spacedim>::distribute_dofs (const FiniteElement<dim,spacedim> &ff)
 {
+  Assert(tria!=nullptr,
+         ExcMessage("You need to set the Triangulation in the DoFHandler using initialize() or "
+                    "in the constructor before you can distribute DoFs."));
+  Assert (tria->n_levels() > 0,
+          ExcMessage("The Triangulation you are using is empty!"));
+
   fe_collection = std_cxx14::make_unique<hp::FECollection<dim, spacedim>>(ff);
 
   // delete all levels and set them

diff --git a/source/hp/dof_handler.cc b/source/hp/dof_handler.cc
index 067f8c87fe7896c0b749741cde963a2147e9d6a9..d6d9b57e15dfbd5b67dcfe529c2e477481eb4c57 100644 (file)
--- a/source/hp/dof_handler.cc
+++ b/source/hp/dof_handler.cc
@@ -1281,7 +1281,11 @@ namespace hp
   template <int dim, int spacedim>
   void DoFHandler<dim,spacedim>::distribute_dofs (const hp::FECollection<dim,spacedim> &ff)
   {
-    Assert (tria->n_levels() > 0, ExcInvalidTriangulation());
+    Assert(tria!=nullptr,
+           ExcMessage("You need to set the Triangulation in the DoFHandler using initialize() or "
+                      "in the constructor before you can distribute DoFs."));
+    Assert (tria->n_levels() > 0,
+            ExcMessage("The Triangulation you are using is empty!"));
 
     finite_elements = &ff;