From 8cd582843cac7445b3b8da7ff74a6302994fad5c Mon Sep 17 00:00:00 2001 From: wolf Date: Tue, 16 Feb 1999 14:01:38 +0000 Subject: [PATCH] Revert Guido's patch with total_dofs->n_dofs. git-svn-id: https://svn.dealii.org/trunk@814 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/dofs/dof_accessor.cc | 16 ++++++++-------- deal.II/deal.II/source/dofs/mg_dof_handler.cc | 8 ++++---- .../deal.II/source/multigrid/mg_dof_handler.cc | 8 ++++---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/deal.II/deal.II/source/dofs/dof_accessor.cc b/deal.II/deal.II/source/dofs/dof_accessor.cc index d8a664ddfe..c55ffbac34 100644 --- a/deal.II/deal.II/source/dofs/dof_accessor.cc +++ b/deal.II/deal.II/source/dofs/dof_accessor.cc @@ -565,11 +565,11 @@ template void DoFCellAccessor::get_interpolated_dof_values (const dVector &values, dVector &interpolated_values) const { - const unsigned int n_dofs = dof_handler->get_fe().total_dofs; + const unsigned int total_dofs = dof_handler->get_fe().total_dofs; Assert (dof_handler != 0, ExcInvalidObject()); Assert (&dof_handler->get_fe() != 0, ExcInvalidObject()); - Assert (interpolated_values.size() == n_dofs, + Assert (interpolated_values.size() == total_dofs, ExcVectorDoesNotMatch()); Assert (values.size() == dof_handler->n_dofs(), ExcVectorDoesNotMatch()); @@ -581,8 +581,8 @@ DoFCellAccessor::get_interpolated_dof_values (const dVector &values, else // otherwise clobber them from the children { - dVector tmp1(n_dofs); - dVector tmp2(n_dofs); + dVector tmp1(total_dofs); + dVector tmp2(total_dofs); interpolated_values.clear (); @@ -605,7 +605,7 @@ DoFCellAccessor::get_interpolated_dof_values (const dVector &values, // end in adding up the contribution // from nodes on boundaries of // children more than once. - for (unsigned int i=0; i void DoFCellAccessor::set_dof_values_by_interpolation (const dVector &local_values, dVector &values) const { - const unsigned int n_dofs = dof_handler->get_fe().total_dofs; + const unsigned int total_dofs = dof_handler->get_fe().total_dofs; Assert (dof_handler != 0, ExcInvalidObject()); Assert (&dof_handler->get_fe() != 0, ExcInvalidObject()); - Assert (local_values.size() == n_dofs, + Assert (local_values.size() == total_dofs, ExcVectorDoesNotMatch()); Assert (values.size() == dof_handler->n_dofs(), ExcVectorDoesNotMatch()); @@ -634,7 +634,7 @@ DoFCellAccessor::set_dof_values_by_interpolation (const dVector &local_valu else // otherwise distribute them to the children { - dVector tmp(n_dofs); + dVector tmp(total_dofs); for (unsigned int child=0; child::children_per_cell; ++child) diff --git a/deal.II/deal.II/source/dofs/mg_dof_handler.cc b/deal.II/deal.II/source/dofs/mg_dof_handler.cc index 097382612d..c1ce677a99 100644 --- a/deal.II/deal.II/source/dofs/mg_dof_handler.cc +++ b/deal.II/deal.II/source/dofs/mg_dof_handler.cc @@ -1009,16 +1009,16 @@ void MGDoFHandler::make_sparsity_pattern (const unsigned int level, Assert (sparsity.n_cols() == n_dofs(level), ExcDifferentDimensions (sparsity.n_cols(), n_dofs(level))); - const unsigned int n_dofs = selected_fe->total_dofs; - vector dofs_on_this_cell(n_dofs); + const unsigned int total_dofs = selected_fe->total_dofs; + vector dofs_on_this_cell(total_dofs); cell_iterator cell = begin_active(level), endc = end(level); for (; cell!=endc; ++cell) { cell->get_mg_dof_indices (dofs_on_this_cell); // make sparsity pattern for this cell - for (unsigned int i=0; i::make_sparsity_pattern (const unsigned int level, Assert (sparsity.n_cols() == n_dofs(level), ExcDifferentDimensions (sparsity.n_cols(), n_dofs(level))); - const unsigned int n_dofs = selected_fe->total_dofs; - vector dofs_on_this_cell(n_dofs); + const unsigned int total_dofs = selected_fe->total_dofs; + vector dofs_on_this_cell(total_dofs); cell_iterator cell = begin_active(level), endc = end(level); for (; cell!=endc; ++cell) { cell->get_mg_dof_indices (dofs_on_this_cell); // make sparsity pattern for this cell - for (unsigned int i=0; i