From c3e00d0edbf8632d44f2d179346c3bf9d18906f3 Mon Sep 17 00:00:00 2001 From: wolf Date: Sat, 4 Dec 1999 15:07:18 +0000 Subject: [PATCH] Reinsert Assertions. git-svn-id: https://svn.dealii.org/trunk@1977 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/dofs/dof_tools.cc | 27 ++++++++++++------------ 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc index a6f4d88662..7d9fb336d6 100644 --- a/deal.II/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/deal.II/source/dofs/dof_tools.cc @@ -11,6 +11,7 @@ #include #include +#include template @@ -112,7 +113,7 @@ DoFTools::make_boundary_sparsity_pattern (const DoFHandler<1>&, #endif -//TODO: Reinsert the last assertion: could not find max_element (G->W) + template void @@ -127,9 +128,9 @@ DoFTools::make_boundary_sparsity_pattern (const DoFHandler& dof, ExcDimensionMismatch (sparsity.n_rows(), dof.n_boundary_dofs())); Assert (sparsity.n_cols() == dof.n_boundary_dofs(), ExcDimensionMismatch (sparsity.n_cols(), dof.n_boundary_dofs())); -// Assert (*max_element(dof_to_boundary_mapping.begin(), -// dof_to_boundary_mapping.end()) == (signed int)sparsity.n_rows()-1, -// ExcInternalError()); + Assert (*max_element(dof_to_boundary_mapping.begin(), + dof_to_boundary_mapping.end()) == (signed int)sparsity.n_rows()-1, + ExcInternalError()); const unsigned int dofs_per_face = dof.get_fe().dofs_per_face; vector dofs_on_this_face(dofs_per_face); @@ -142,9 +143,9 @@ DoFTools::make_boundary_sparsity_pattern (const DoFHandler& dof, // make sure all dof indices have a // boundary index -// Assert (*min_element(dofs_on_this_face.begin(), -// dofs_on_this_face.end()) >=0, -// ExcInternalError()); + Assert (*min_element(dofs_on_this_face.begin(), + dofs_on_this_face.end()) >=0, + ExcInternalError()); // make sparsity pattern for this cell for (unsigned int i=0; i& dof, ExcDimensionMismatch (sparsity.n_rows(), dof.n_boundary_dofs(boundary_indicators))); Assert (sparsity.n_cols() == dof.n_boundary_dofs(boundary_indicators), ExcDimensionMismatch (sparsity.n_cols(), dof.n_boundary_dofs(boundary_indicators))); -// Assert (*max_element(dof_to_boundary_mapping.begin(), -// dof_to_boundary_mapping.end()) == (signed int)sparsity.n_rows()-1, -// ExcInternalError()); + Assert (*max_element(dof_to_boundary_mapping.begin(), + dof_to_boundary_mapping.end()) == (signed int)sparsity.n_rows()-1, + ExcInternalError()); const unsigned int dofs_per_face = dof.get_fe().dofs_per_face; vector dofs_on_this_face(dofs_per_face); @@ -187,9 +188,9 @@ void DoFTools::make_boundary_sparsity_pattern (const DoFHandler& dof, // make sure all dof indices have a // boundary index -// Assert (*min_element(dofs_on_this_face.begin(), -// dofs_on_this_face.end()) >=0, -// ExcInternalError()); + Assert (*min_element(dofs_on_this_face.begin(), + dofs_on_this_face.end()) >=0, + ExcInternalError()); // make sparsity pattern for this cell for (unsigned int i=0; i