From: Wolfgang Bangerth Date: Tue, 2 May 2006 02:50:21 +0000 (+0000) Subject: Rename a few variables X-Git-Tag: v8.0.0~11819 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4792de54c867edb2a2a4bb36d3f3f127ca02deda;p=dealii.git Rename a few variables git-svn-id: https://svn.dealii.org/trunk@12958 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/dofs/hp_dof_handler.cc b/deal.II/deal.II/source/dofs/hp_dof_handler.cc index 838898ba9a..d087b17f61 100644 --- a/deal.II/deal.II/source/dofs/hp_dof_handler.cc +++ b/deal.II/deal.II/source/dofs/hp_dof_handler.cc @@ -2090,14 +2090,14 @@ namespace hp // count how much space we need // on each level and set the - // dof_*_index_offset + // dof_*_offsets // data. initially set the latter // to an invalid index, and only // later set it to something // reasonable for active cells for (unsigned int level=0; leveln_levels(); ++level) { - levels[level]->dof_line_index_offset + levels[level]->line_dof_offsets = std::vector (tria->n_raw_lines(level), invalid_dof_index); @@ -2106,7 +2106,7 @@ namespace hp cell!=end_active(level); ++cell) if (!cell->has_children()) { - levels[level]->dof_line_index_offset[cell->index()] = next_free_line_dof; + levels[level]->line_dof_offsets[cell->index()] = next_free_line_dof; next_free_line_dof += (*finite_elements)[cell->active_fe_index()].dofs_per_line; } @@ -2120,7 +2120,7 @@ namespace hp // the number of DoFs we // allocated is actually correct // (above we have also set the - // dof_*_index_offset field, so + // dof_*_offsets field, so // we couldn't use this simpler // algorithm) #ifdef DEBUG @@ -2135,8 +2135,8 @@ namespace hp Assert (levels[level]->line_dofs.size() == n_line_dofs, ExcInternalError()); Assert (static_cast - (std::count (levels[level]->dof_line_index_offset.begin(), - levels[level]->dof_line_index_offset.end(), + (std::count (levels[level]->line_dof_offsets.begin(), + levels[level]->line_dof_offsets.end(), invalid_dof_index)) == tria->n_raw_lines(level) - tria->n_active_lines(level), @@ -2188,14 +2188,14 @@ namespace hp // count how much space we need // on each level for the quad // dofs and set the - // dof_*_index_offset + // dof_*_offsets // data. initially set the latter // to an invalid index, and only // later set it to something // reasonable for active cells for (unsigned int level=0; leveln_levels(); ++level) { - levels[level]->dof_quad_index_offset + levels[level]->quad_dof_offsets = std::vector (tria->n_raw_quads(level), invalid_dof_index); @@ -2204,7 +2204,7 @@ namespace hp cell!=end_active(level); ++cell) if (!cell->has_children()) { - levels[level]->dof_quad_index_offset[cell->index()] + levels[level]->quad_dof_offsets[cell->index()] = next_free_quad_dof; next_free_quad_dof += (*finite_elements)[cell->active_fe_index()].dofs_per_quad; @@ -2219,7 +2219,7 @@ namespace hp // the number of DoFs we // allocated is actually correct // (above we have also set the - // dof_*_index_offset field, so + // dof_*_offsets field, so // we couldn't use this simpler // algorithm) #ifdef DEBUG @@ -2235,8 +2235,8 @@ namespace hp Assert (levels[level]->quad_dofs.size() == n_quad_dofs, ExcInternalError()); Assert (static_cast - (std::count (levels[level]->dof_quad_index_offset.begin(), - levels[level]->dof_quad_index_offset.end(), + (std::count (levels[level]->quad_dof_offsets.begin(), + levels[level]->quad_dof_offsets.end(), invalid_dof_index)) == tria->n_raw_quads(level) - tria->n_active_quads(level), @@ -2352,7 +2352,7 @@ namespace hp // non-invalid value later on for (unsigned int level=0; leveln_levels(); ++level) { - levels[level]->dof_line_index_offset + levels[level]->line_dof_offsets = std::vector (tria->n_raw_lines(level), invalid_dof_index); levels[level]->line_dofs @@ -2388,7 +2388,7 @@ namespace hp (cell->active_fe_index() == cell->neighbor(face)->active_fe_index()))) { levels[cell->level()] - ->dof_line_index_offset[cell->face(face)->index()] + ->line_dof_offsets[cell->face(face)->index()] = next_free_line_slot[cell->level()]; // set first slot @@ -2424,7 +2424,7 @@ namespace hp else { levels[cell->level()] - ->dof_line_index_offset[cell->face(face)->index()] + ->line_dof_offsets[cell->face(face)->index()] = next_free_line_slot[cell->level()]; // set first slot @@ -2638,14 +2638,14 @@ namespace hp // count how much space we need // on each level and set the - // dof_*_index_offset + // dof_*_offsets // data. initially set the latter // to an invalid index, and only // later set it to something // reasonable for active cells for (unsigned int level=0; leveln_levels(); ++level) { - levels[level]->dof_hex_index_offset + levels[level]->hex_dof_offsets = std::vector (tria->n_raw_hexs(level), invalid_dof_index); @@ -2654,7 +2654,7 @@ namespace hp cell!=end_active(level); ++cell) if (!cell->has_children()) { - levels[level]->dof_hex_index_offset[cell->index()] = next_free_hex_dof; + levels[level]->hex_dof_offsets[cell->index()] = next_free_hex_dof; next_free_hex_dof += (*finite_elements)[cell->active_fe_index()].dofs_per_hex; } @@ -2668,7 +2668,7 @@ namespace hp // the number of DoFs we // allocated is actually correct // (above we have also set the - // dof_*_index_offset field, so + // dof_*_offsets field, so // we couldn't use this simpler // algorithm) #ifdef DEBUG @@ -2683,8 +2683,8 @@ namespace hp Assert (levels[level]->hex_dofs.size() == n_hex_dofs, ExcInternalError()); Assert (static_cast - (std::count (levels[level]->dof_hex_index_offset.begin(), - levels[level]->dof_hex_index_offset.end(), + (std::count (levels[level]->hex_dof_offsets.begin(), + levels[level]->hex_dof_offsets.end(), invalid_dof_index)) == tria->n_raw_hexs(level) - tria->n_active_hexs(level), diff --git a/deal.II/deal.II/source/dofs/hp_dof_levels.all_dimensions.cc b/deal.II/deal.II/source/dofs/hp_dof_levels.all_dimensions.cc index 8df4c72598..a2205358e1 100644 --- a/deal.II/deal.II/source/dofs/hp_dof_levels.all_dimensions.cc +++ b/deal.II/deal.II/source/dofs/hp_dof_levels.all_dimensions.cc @@ -24,7 +24,7 @@ namespace internal DoFLevel<1>::memory_consumption () const { return (MemoryConsumption::memory_consumption (line_dofs) + - MemoryConsumption::memory_consumption (dof_line_index_offset)); + MemoryConsumption::memory_consumption (line_dof_offsets)); } @@ -34,7 +34,7 @@ namespace internal { return (DoFLevel<1>::memory_consumption () + MemoryConsumption::memory_consumption (quad_dofs) + - MemoryConsumption::memory_consumption (dof_quad_index_offset)); + MemoryConsumption::memory_consumption (quad_dof_offsets)); } @@ -44,7 +44,7 @@ namespace internal { return (DoFLevel<2>::memory_consumption () + MemoryConsumption::memory_consumption (hex_dofs) + - MemoryConsumption::memory_consumption (dof_hex_index_offset)); + MemoryConsumption::memory_consumption (hex_dof_offsets)); } } } diff --git a/deal.II/deal.II/source/dofs/hp_dof_levels.cc b/deal.II/deal.II/source/dofs/hp_dof_levels.cc index 4da48a1b5f..bd479f97d6 100644 --- a/deal.II/deal.II/source/dofs/hp_dof_levels.cc +++ b/deal.II/deal.II/source/dofs/hp_dof_levels.cc @@ -52,7 +52,7 @@ namespace internal { Assert (fe_index == this->active_fe_indices[line_index], ExcMessage ("FE index does not match that of the present cell")); - return line_dofs[dof_line_index_offset[line_index]+local_index]; + return line_dofs[line_dof_offsets[line_index]+local_index]; } else { @@ -69,7 +69,7 @@ namespace internal // an exception if we can't // find a set for this // particular fe_index - const unsigned int starting_offset = dof_line_index_offset[line_index]; + const unsigned int starting_offset = line_dof_offsets[line_index]; const unsigned int *pointer = &line_dofs[starting_offset]; while (true) { @@ -116,7 +116,7 @@ namespace internal { Assert (fe_index == this->active_fe_indices[line_index], ExcMessage ("FE index does not match that of the present cell")); - line_dofs[dof_line_index_offset[line_index]+local_index] = global_index; + line_dofs[line_dof_offsets[line_index]+local_index] = global_index; } else { @@ -133,7 +133,7 @@ namespace internal // an exception if we can't // find a set for this // particular fe_index - const unsigned int starting_offset = dof_line_index_offset[line_index]; + const unsigned int starting_offset = line_dof_offsets[line_index]; unsigned int *pointer = &line_dofs[starting_offset]; while (true) { @@ -183,7 +183,7 @@ namespace internal { Assert (fe_index == this->active_fe_indices[quad_index], ExcMessage ("FE index does not match that of the present cell")); - return quad_dofs[dof_quad_index_offset[quad_index]+local_index]; + return quad_dofs[quad_dof_offsets[quad_index]+local_index]; } else { @@ -200,7 +200,7 @@ namespace internal // an exception if we can't // find a set for this // particular fe_index - const unsigned int starting_offset = dof_quad_index_offset[quad_index]; + const unsigned int starting_offset = quad_dof_offsets[quad_index]; const unsigned int *pointer = &quad_dofs[starting_offset]; while (true) { @@ -248,7 +248,7 @@ namespace internal { Assert (fe_index == this->active_fe_indices[quad_index], ExcMessage ("FE index does not match that of the present cell")); - quad_dofs[dof_quad_index_offset[quad_index]+local_index] = global_index; + quad_dofs[quad_dof_offsets[quad_index]+local_index] = global_index; } else { @@ -265,7 +265,7 @@ namespace internal // an exception if we can't // find a set for this // particular fe_index - const unsigned int starting_offset = dof_quad_index_offset[quad_index]; + const unsigned int starting_offset = quad_dof_offsets[quad_index]; unsigned int *pointer = &quad_dofs[starting_offset]; while (true) { @@ -315,7 +315,7 @@ namespace internal { Assert (fe_index == this->active_fe_indices[hex_index], ExcMessage ("FE index does not match that of the present cell")); - return hex_dofs[dof_hex_index_offset[hex_index]+local_index]; + return hex_dofs[hex_dof_offsets[hex_index]+local_index]; } else { @@ -332,7 +332,7 @@ namespace internal // an exception if we can't // find a set for this // particular fe_index - const unsigned int starting_offset = dof_hex_index_offset[hex_index]; + const unsigned int starting_offset = hex_dof_offsets[hex_index]; const unsigned int *pointer = &hex_dofs[starting_offset]; while (true) { @@ -380,7 +380,7 @@ namespace internal { Assert (fe_index == this->active_fe_indices[hex_index], ExcMessage ("FE index does not match that of the present cell")); - hex_dofs[dof_hex_index_offset[hex_index]+local_index] = global_index; + hex_dofs[hex_dof_offsets[hex_index]+local_index] = global_index; } else { @@ -397,7 +397,7 @@ namespace internal // an exception if we can't // find a set for this // particular fe_index - const unsigned int starting_offset = dof_hex_index_offset[hex_index]; + const unsigned int starting_offset = hex_dof_offsets[hex_index]; unsigned int *pointer = &hex_dofs[starting_offset]; while (true) {