From: Wolfgang Bangerth Date: Mon, 6 Apr 1998 09:05:57 +0000 (+0000) Subject: Use new unsigned ints of /lac and fix some smaller problems. X-Git-Tag: v8.0.0~23112 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc9586276dc83d64b65f3b15a3987b2b7576da98;p=dealii.git Use new unsigned ints of /lac and fix some smaller problems. git-svn-id: https://svn.dealii.org/trunk@142 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/dofs/dof_accessor.cc b/deal.II/deal.II/source/dofs/dof_accessor.cc index 8de61c1d6e..5de0800d3d 100644 --- a/deal.II/deal.II/source/dofs/dof_accessor.cc +++ b/deal.II/deal.II/source/dofs/dof_accessor.cc @@ -316,7 +316,7 @@ DoFCellAccessor<1>::get_dof_values (const dVector &values, Assert (dof_handler != 0, ExcInvalidObject()); Assert (&dof_handler->get_selected_fe() != 0, ExcInvalidObject()); Assert (dof_values.size() == 0, ExcVectorNotEmpty()); - Assert ((unsigned int)values.n() == dof_handler->n_dofs(), + Assert (values.n() == dof_handler->n_dofs(), ExcVectorDoesNotMatch()); dof_values.reserve (dof_handler->get_selected_fe().total_dofs); @@ -336,7 +336,7 @@ DoFCellAccessor<2>::get_dof_values (const dVector &values, Assert (dof_handler != 0, ExcInvalidObject()); Assert (&dof_handler->get_selected_fe() != 0, ExcInvalidObject()); Assert (dof_values.size() == 0, ExcVectorNotEmpty()); - Assert ((unsigned int)values.n() == dof_handler->n_dofs(), + Assert (values.n() == dof_handler->n_dofs(), ExcVectorDoesNotMatch()); dof_values.reserve (dof_handler->get_selected_fe().total_dofs); diff --git a/deal.II/deal.II/source/dofs/dof_constraints.cc b/deal.II/deal.II/source/dofs/dof_constraints.cc index 3beb0fa479..efdc76e568 100644 --- a/deal.II/deal.II/source/dofs/dof_constraints.cc +++ b/deal.II/deal.II/source/dofs/dof_constraints.cc @@ -102,7 +102,7 @@ void ConstraintMatrix::condense (const dSMatrixStruct &uncondensed, vector::const_iterator next_constraint = lines.begin(); unsigned int shift = 0; - unsigned int n_rows = (unsigned int)uncondensed.n_rows(); + unsigned int n_rows = uncondensed.n_rows(); if (next_constraint == lines.end()) // if no constraint is to be handled @@ -137,13 +137,13 @@ void ConstraintMatrix::condense (const dSMatrixStruct &uncondensed, // only evaluated so often as there are // entries in new_line[*] which tells us // which constraints exist - for (int row=0; row distribute; - distribute.reserve (sparsity.n_rows()); - // replace the following line, since - // gcc2.8 chokes over it. -// distribute.insert (distribute.end(), sparsity.n_rows(), -1); - for (unsigned int i=0; i<(unsigned int)sparsity.n_rows(); ++i) - distribute.push_back (-1); + distribute.resize (sparsity.n_rows(), -1); - for (int c=0; c<(signed int)lines.size(); ++c) - distribute[lines[c].line] = c; + for (unsigned int c=0; c::const_iterator next_constraint = lines.begin(); unsigned int shift = 0; - unsigned int n_rows = (unsigned int)uncondensed_struct.n_rows(); + unsigned int n_rows = uncondensed_struct.n_rows(); if (next_constraint == lines.end()) // if no constraint is to be handled @@ -334,13 +329,13 @@ void ConstraintMatrix::condense (const dSMatrix &uncondensed, // only evaluated so often as there are // entries in new_line[*] which tells us // which constraints exist - for (int row=0; row distribute; - distribute.reserve (sparsity.n_rows()); - // replace the following line, since - // gcc2.8 chokes over it. -// distribute.insert (distribute.end(), sparsity.n_rows(), -1); - for (unsigned int i=0; i<(unsigned int)sparsity.n_rows(); ++i) - distribute.push_back (-1); - + distribute.resize (sparsity.n_rows(), -1); - for (int c=0; c<(signed int)lines.size(); ++c) - distribute[lines[c].line] = c; + for (unsigned int c=0; c::const_iterator next_constraint = lines.begin(); unsigned int shift = 0; - unsigned int n_rows = (unsigned int)uncondensed.n(); + unsigned int n_rows = uncondensed.n(); if (next_constraint == lines.end()) // if no constraint is to be handled @@ -562,7 +551,7 @@ void ConstraintMatrix::condense (const dVector &uncondensed, // only evaluated so often as there are // entries in new_line[*] which tells us // which constraints exist - for (int row=0; row::const_iterator next_constraint = lines.begin(); - for (unsigned int row=0; row<(unsigned int)vec.n(); ++row) + for (unsigned int row=0; row::const_iterator next_constraint = lines.begin(); unsigned int shift = 0; - unsigned int n_rows = (unsigned int)uncondensed.n(); + unsigned int n_rows = uncondensed.n(); if (next_constraint == lines.end()) // if no constraint is to be handled @@ -662,7 +651,7 @@ void ConstraintMatrix::distribute (const dVector &condensed, // only evaluated so often as there are // entries in new_line[*] which tells us // which constraints exist - for (unsigned int line=0; line<(unsigned int)uncondensed.n(); ++line) + for (unsigned int line=0; line::renumber_dofs (const RenumberingMethod method, // workaround // vector new_number(sparsity.n_rows(), -1); vector new_number; - new_number.reserve (sparsity.n_rows()); - for (unsigned int i=0; i<(unsigned int)sparsity.n_rows(); ++i) - new_number.push_back (-1); + new_number.resize (sparsity.n_rows(), -1); // store the indices of the dofs renumbered // in the last round. Default to starting @@ -809,14 +807,15 @@ void DoFHandler::renumber_dofs (const RenumberingMethod method, unsigned int min_coordination = n_dofs; for (int row=0; row::renumber_dofs (const RenumberingMethod method, // dofs numbered in the last // round for (unsigned int i=0; i::renumber_dofs (const RenumberingMethod method, s!=next_round_dofs.end(); ++s) { unsigned int coordination = 0; - for (int j=sparsity.get_rowstart_indices()[*s]; + for (unsigned int j=sparsity.get_rowstart_indices()[*s]; j::make_constraint_matrix (ConstraintMatrix &constraints) const 2*selected_fe->dofs_per_line); Assert(2*selected_fe->dofs_per_vertex+selected_fe->dofs_per_line == - (unsigned int)selected_fe->constraints().n(), + selected_fe->constraints().n(), ExcDifferentDimensions(2*selected_fe->dofs_per_vertex+ selected_fe->dofs_per_line, selected_fe->constraints().n())); Assert(selected_fe->dofs_per_vertex+2*selected_fe->dofs_per_line == - (unsigned int)selected_fe->constraints().m(), + selected_fe->constraints().m(), ExcDifferentDimensions(3*selected_fe->dofs_per_vertex+ 2*selected_fe->dofs_per_line, selected_fe->constraints().m())); @@ -1141,17 +1140,13 @@ void DoFHandler::make_transfer_matrix (const DoFHandler &transfer_from #ifdef DEBUG for (unsigned int c=0; c<(1<prolongate(c).m() == - selected_fe->total_dofs, + Assert (selected_fe->prolongate(c).m() == selected_fe->total_dofs, ExcMatrixHasWrongSize(selected_fe->prolongate(c).m())); - Assert ((unsigned int)selected_fe->prolongate(c).n() == - selected_fe->total_dofs, + Assert (selected_fe->prolongate(c).n() == selected_fe->total_dofs, ExcMatrixHasWrongSize(selected_fe->prolongate(c).n())); - Assert ((unsigned int)selected_fe->restrict(c).m() == - selected_fe->total_dofs, + Assert (selected_fe->restrict(c).m() == selected_fe->total_dofs, ExcMatrixHasWrongSize(selected_fe->restrict(c).m())); - Assert ((unsigned int)selected_fe->restrict(c).n() == - selected_fe->total_dofs, + Assert (selected_fe->restrict(c).n() == selected_fe->total_dofs, ExcMatrixHasWrongSize(selected_fe->restrict(c).n())); }; #endif @@ -1478,23 +1473,17 @@ void DoFHandler<1>::reserve_space (const FiniteElement<1> &fe) { // their size for (unsigned int i=0; ivertices.size()); - vertex_dofs.insert (vertex_dofs.end(), - tria->vertices.size(), - -1); + vertex_dofs.resize (tria->vertices.size(), -1); for (unsigned int i=0; in_levels(); ++i) { levels.push_back (new DoFLevel<1>); - levels.back()->line_dofs.reserve (tria->levels[i]->lines.lines.size() * - fe.dofs_per_line); - levels.back()->line_dofs.insert (levels.back()->line_dofs.end(), - (tria->levels[i]->lines.lines.size() * - fe.dofs_per_line), + levels.back()->line_dofs.resize (tria->levels[i]->lines.lines.size() * + fe.dofs_per_line, -1); }; }; @@ -1510,30 +1499,21 @@ void DoFHandler<2>::reserve_space (const FiniteElement<2> &fe) { // their size for (unsigned int i=0; ivertices.size()); - vertex_dofs.insert (vertex_dofs.end(), - tria->vertices.size(), + vertex_dofs.resize (tria->vertices.size(), -1); for (unsigned int i=0; in_levels(); ++i) { levels.push_back (new DoFLevel<2>); - levels.back()->line_dofs.reserve (tria->levels[i]->lines.lines.size() * - fe.dofs_per_line); - levels.back()->line_dofs.insert (levels.back()->line_dofs.end(), - (tria->levels[i]->lines.lines.size() * - fe.dofs_per_line), + levels.back()->line_dofs.resize (tria->levels[i]->lines.lines.size() * + fe.dofs_per_line, -1); - - levels.back()->quad_dofs.reserve (tria->levels[i]->quads.quads.size() * - fe.dofs_per_quad); - levels.back()->quad_dofs.insert (levels.back()->quad_dofs.end(), - (tria->levels[i]->quads.quads.size() * - fe.dofs_per_quad), + levels.back()->quad_dofs.resize (tria->levels[i]->quads.quads.size() * + fe.dofs_per_quad, -1); }; }; diff --git a/deal.II/deal.II/source/grid/tria.cc b/deal.II/deal.II/source/grid/tria.cc index 8501106000..d177be6a46 100644 --- a/deal.II/deal.II/source/grid/tria.cc +++ b/deal.II/deal.II/source/grid/tria.cc @@ -27,7 +27,7 @@ Triangulation::~Triangulation () { for (unsigned int i=0; i::max_adjacent_cells () const { template unsigned int Triangulation::max_adjacent_cells () const { cell_iterator cell = begin(0), - endc = (levels.size() != 0 ? begin(1) : cell_iterator(end())); + endc = (levels.size() > 1 ? begin(1) : cell_iterator(end())); // store the largest index of the vertices // used on level 0 unsigned int max_vertex_index = 0; @@ -1773,16 +1773,8 @@ void Triangulation<1>::execute_refinement () { bind2nd (equal_to(), true), needed_vertices); - vertices.reserve (needed_vertices); - vertices_used.reserve (needed_vertices); - vertices.insert (vertices.end(), - needed_vertices-vertices.size(), - Point<1>()); - vertices_used.insert (vertices_used.end(), - needed_vertices-vertices_used.size(), - false); - - + vertices.resize (needed_vertices, Point<1>()); + vertices_used.resize (needed_vertices, false); // Do REFINEMENT @@ -2049,15 +2041,8 @@ void Triangulation<2>::execute_refinement () { needed_vertices); // reserve enough space for all vertices - vertices.reserve (needed_vertices); - vertices_used.reserve (needed_vertices); - vertices.insert (vertices.end(), - needed_vertices-vertices.size(), - Point<2>()); - vertices_used.insert (vertices_used.end(), - needed_vertices-vertices_used.size(), - false); - + vertices.resize (needed_vertices, Point<2>()); + vertices_used.resize (needed_vertices, false);