From: Wolfgang Bangerth Date: Wed, 25 Nov 1998 13:19:39 +0000 (+0000) Subject: Small fix for greater felxibility. X-Git-Tag: v8.0.0~22585 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15a003c00b101a0d6828552fbac3294f9e61d3c1;p=dealii.git Small fix for greater felxibility. git-svn-id: https://svn.dealii.org/trunk@672 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/numerics/base.cc b/deal.II/deal.II/source/numerics/base.cc index de0e78a65b..f286ffced1 100644 --- a/deal.II/deal.II/source/numerics/base.cc +++ b/deal.II/deal.II/source/numerics/base.cc @@ -40,8 +40,14 @@ void ProblemBase::set_tria_and_dof (Triangulation *t, tria = t; dof_handler = d; - Assert ((tria!=0) && (dof_handler!=0), ExcNoTriaSelected()); - Assert (tria == &dof_handler->get_tria(), ExcDofAndTriaDontMatch()); + // allow a user to reset both tria and + // dof to null pointers, but don't allow + // something other + if ((tria != 0) || (dof_handler != 0)) + { + Assert ((tria!=0) && (dof_handler!=0), ExcNoTriaSelected()); + Assert (tria == &dof_handler->get_tria(), ExcDofAndTriaDontMatch()); + }; };