From: Wolfgang Bangerth Date: Fri, 24 Apr 1998 08:11:35 +0000 (+0000) Subject: Dont use internal error detection mode, since we run into some problems using gcc2... X-Git-Tag: v8.0.0~23067 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e604370667b1e505e2a42be9cfb5ad340be6b4ec;p=dealii.git Dont use internal error detection mode, since we run into some problems using gcc2.8 (?). Enable this again at the next possible time\! git-svn-id: https://svn.dealii.org/trunk@187 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 890248469f..cadf461289 100644 --- a/deal.II/deal.II/source/grid/tria.cc +++ b/deal.II/deal.II/source/grid/tria.cc @@ -2523,14 +2523,14 @@ void TriangulationLevel<0>::reserve_space (const unsigned int total_cells, void TriangulationLevel<0>::monitor_memory (const unsigned int true_dimension) const { - Assert (refine_flags.size() == refine_flags.capacity() || - refine_flags.size()<256, - ExcMemoryWasted ("refine_flags", - refine_flags.size(), refine_flags.capacity())); - Assert (neighbors.size() == neighbors.capacity() || - neighbors.size()<256, - ExcMemoryWasted ("neighbors", - neighbors.size(), neighbors.capacity())); +// Assert (refine_flags.size() == refine_flags.capacity() || +// refine_flags.size()<256, +// ExcMemoryWasted ("refine_flags", +// refine_flags.size(), refine_flags.capacity())); +// Assert (neighbors.size() == neighbors.capacity() || +// neighbors.size()<256, +// ExcMemoryWasted ("neighbors", +// neighbors.size(), neighbors.capacity())); Assert (2*true_dimension*refine_flags.size() == neighbors.size(), ExcMemoryInexact (refine_flags.size(), neighbors.size())); }; @@ -2546,12 +2546,20 @@ void TriangulationLevel<1>::reserve_space (const unsigned int new_lines) { ++used_lines; unsigned int new_size = used_lines + new_lines; - + +// cout << " lines: pre: siz=" << lines.lines.size() << ", cap=" << lines.lines.capacity(); lines.lines.reserve (new_size); +// cout << " inter: siz=" << lines.lines.size() << ", cap=" << lines.lines.capacity() +// << " (newsize=" << new_size << ")"; lines.lines.insert (lines.lines.end(), new_size-lines.lines.size(), Line()); +// cout << " post: siz=" << lines.lines.size() << ", cap=" << lines.lines.capacity() << endl; +// cout << " used : pre: siz=" << lines.used.size() << ", cap=" << lines.used.capacity(); lines.used.reserve (new_size); +// cout << " inter: siz=" << lines.used.size() << ", cap=" << lines.used.capacity() +// << " (newsize=" << new_size << ")"; lines.used.insert (lines.used.end(), new_size-lines.used.size(), false); +// cout << " post: siz=" << lines.used.size() << ", cap=" << lines.used.capacity() << endl; lines.user_flags.reserve (new_size); lines.user_flags.insert (lines.user_flags.end(), @@ -2572,22 +2580,22 @@ void TriangulationLevel<1>::reserve_space (const unsigned int new_lines) { void TriangulationLevel<1>::monitor_memory (const unsigned int true_dimension) const { - Assert (lines.lines.size() == lines.lines.capacity() || - lines.lines.size()<256, - ExcMemoryWasted ("lines", - lines.lines.size(), lines.lines.capacity())); - Assert (lines.children.size() == lines.children.capacity() || - lines.children.size()<256, - ExcMemoryWasted ("children", - lines.children.size(), lines.children.capacity())); - Assert (lines.used.size() == lines.used.capacity() || - lines.used.size()<256, - ExcMemoryWasted ("used", - lines.used.size(), lines.used.capacity())); - Assert (lines.user_flags.size() == lines.user_flags.capacity() || - lines.user_flags.size()<256, - ExcMemoryWasted ("user_flags", - lines.user_flags.size(), lines.user_flags.capacity())); +// Assert (lines.lines.size() == lines.lines.capacity() || +// lines.lines.size()<256, +// ExcMemoryWasted ("lines", +// lines.lines.size(), lines.lines.capacity())); +// Assert (lines.children.size() == lines.children.capacity() || +// lines.children.size()<256, +// ExcMemoryWasted ("children", +// lines.children.size(), lines.children.capacity())); +// Assert (lines.used.size() == lines.used.capacity() || +// lines.used.size()<256, +// ExcMemoryWasted ("used", +// lines.used.size(), lines.used.capacity())); +// Assert (lines.user_flags.size() == lines.user_flags.capacity() || +// lines.user_flags.size()<256, +// ExcMemoryWasted ("user_flags", +// lines.user_flags.size(), lines.user_flags.capacity())); Assert (lines.lines.size() == lines.used.size(), ExcMemoryInexact (lines.lines.size(), lines.used.size())); Assert (lines.lines.size() == lines.user_flags.size(), @@ -2637,22 +2645,22 @@ void TriangulationLevel<2>::reserve_space (const unsigned int new_quads) { void TriangulationLevel<2>::monitor_memory (const unsigned int true_dimension) const { - Assert (quads.quads.size() == quads.quads.capacity() || - quads.quads.size()<256, - ExcMemoryWasted ("quads", - quads.quads.size(), quads.quads.capacity())); - Assert (quads.children.size() == quads.children.capacity() || - quads.children.size()<256, - ExcMemoryWasted ("children", - quads.children.size(), quads.children.capacity())); - Assert (quads.used.size() == quads.used.capacity() || - quads.used.size()<256, - ExcMemoryWasted ("used", - quads.used.size(), quads.used.capacity())); - Assert (quads.user_flags.size() == quads.user_flags.capacity() || - quads.user_flags.size()<256, - ExcMemoryWasted ("user_flags", - quads.user_flags.size(), quads.user_flags.capacity())); +// Assert (quads.quads.size() == quads.quads.capacity() || +// quads.quads.size()<256, +// ExcMemoryWasted ("quads", +// quads.quads.size(), quads.quads.capacity())); +// Assert (quads.children.size() == quads.children.capacity() || +// quads.children.size()<256, +// ExcMemoryWasted ("children", +// quads.children.size(), quads.children.capacity())); +// Assert (quads.used.size() == quads.used.capacity() || +// quads.used.size()<256, +// ExcMemoryWasted ("used", +// quads.used.size(), quads.used.capacity())); +// Assert (quads.user_flags.size() == quads.user_flags.capacity() || +// quads.user_flags.size()<256, +// ExcMemoryWasted ("user_flags", +// quads.user_flags.size(), quads.user_flags.capacity())); Assert (quads.quads.size() == quads.used.size(), ExcMemoryInexact (quads.quads.size(), quads.used.size())); Assert (quads.quads.size() == quads.user_flags.size(),