From: Guido Kanschat Date: Mon, 13 Feb 2006 16:29:53 +0000 (+0000) Subject: more bugs removed X-Git-Tag: v8.0.0~12319 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3be6426ffc32443c32904770d47e4232afd2340b;p=dealii.git more bugs removed git-svn-id: https://svn.dealii.org/trunk@12363 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/grid/tria.cc b/deal.II/deal.II/source/grid/tria.cc index b905d30af7..24d48440b2 100644 --- a/deal.II/deal.II/source/grid/tria.cc +++ b/deal.II/deal.II/source/grid/tria.cc @@ -4060,7 +4060,7 @@ unsigned int Triangulation::n_lines () const { template unsigned int Triangulation::n_raw_lines (const unsigned int level) const { - Assert(levelslines.lines.size(); } @@ -4105,15 +4105,15 @@ unsigned int Triangulation<1>::n_quads (const unsigned int) const } -template -unsigned int Triangulation::n_raw_quads (const unsigned int level) const +template <> +unsigned int Triangulation<1>::n_raw_quads (const unsigned int) const { return 0; } -template -unsigned int Triangulation::n_raw_hexs (const unsigned int level) const +template <> +unsigned int Triangulation<1>::n_raw_hexs (const unsigned int) const { return 0; } @@ -4154,18 +4154,11 @@ unsigned int Triangulation::n_quads (const unsigned int level) const { template unsigned int Triangulation::n_raw_quads (const unsigned int level) const { - Assert(levelsquads.quads.size(); } -template -unsigned int Triangulation::n_raw_hexs (const unsigned int level) const -{ - return 0; -} - - template unsigned int Triangulation::n_active_quads () const { return number_cache.n_active_quads; @@ -4199,6 +4192,13 @@ unsigned int Triangulation::n_hexs (const unsigned int) const +template +unsigned int Triangulation::n_raw_hexs (const unsigned int) const +{ + return 0; +} + + template unsigned int Triangulation::n_active_hexs () const { @@ -4236,19 +4236,11 @@ unsigned int Triangulation::n_hexs (const unsigned int level) const -template -unsigned int Triangulation::n_raw_quads (const unsigned int level) const -{ - Assert(levelsquads.quads.size(); -} - - template unsigned int Triangulation::n_raw_hexs (const unsigned int level) const { - Assert(levelshexs.hexs.size(); + Assert(level < n_levels(), ExcIndexRange(level,0,n_levels())); + return levels[level]->hexes.hexes.size(); }