Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace present_index by index() in DoFAccessor #13429

Merged
merged 1 commit into from
Feb 22, 2022
Merged

Replace present_index by index() in DoFAccessor #13429

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 20 additions & 21 deletions include/deal.II/dofs/dof_accessor.templates.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1417,7 +1417,7 @@ DoFAccessor<structdim, dim, spacedim, level_dof_access>::dof_index(
return dealii::internal::DoFAccessorImplementation::Implementation::
get_dof_index(*this->dof_handler,
this->level(),
this->present_index,
this->index(),
fe_index,
i,
std::integral_constant<int, structdim>());
Expand All @@ -1430,8 +1430,10 @@ DoFAccessor<structdim, dim, spacedim, level_dof_access>::mg_dof_index(
const int level,
const unsigned int i) const
{
return this->dof_handler->template get_dof_index<structdim>(
level, this->present_index, 0, i);
return this->dof_handler->template get_dof_index<structdim>(level,
this->index(),
0,
i);
}


Expand All @@ -1452,7 +1454,7 @@ DoFAccessor<structdim, dim, spacedim, level_dof_access>::set_dof_index(
dealii::internal::DoFAccessorImplementation::Implementation::set_dof_index(
*this->dof_handler,
this->level(),
this->present_index,
this->index(),
fe_index,
i,
std::integral_constant<int, structdim>(),
Expand All @@ -1470,7 +1472,7 @@ DoFAccessor<structdim, dim, spacedim, level_dof_access>::n_active_fe_indices()
return dealii::internal::DoFAccessorImplementation::Implementation::
n_active_fe_indices(*this->dof_handler,
this->level(),
this->present_index,
this->index(),
std::integral_constant<int, structdim>());
}

Expand All @@ -1485,7 +1487,7 @@ DoFAccessor<structdim, dim, spacedim, level_dof_access>::nth_active_fe_index(
return dealii::internal::DoFAccessorImplementation::Implementation::
nth_active_fe_index(*this->dof_handler,
this->level(),
this->present_index,
this->index(),
n,
std::integral_constant<int, structdim>());
}
Expand Down Expand Up @@ -1514,7 +1516,7 @@ DoFAccessor<structdim, dim, spacedim, level_dof_access>::fe_index_is_active(
return dealii::internal::DoFAccessorImplementation::Implementation::
fe_index_is_active(*this->dof_handler,
this->level(),
this->present_index,
this->index(),
fe_index,
std::integral_constant<int, structdim>());
}
Expand Down Expand Up @@ -1621,7 +1623,7 @@ DoFAccessor<structdim, dim, spacedim, level_dof_access>::set_mg_dof_index(
const types::global_dof_index index) const
{
this->dof_handler->template set_dof_index<structdim>(
level, this->present_index, 0, i, index);
level, this->index(), 0, i, index);
}


Expand Down Expand Up @@ -2580,12 +2582,9 @@ DoFCellAccessor<dimension_, space_dimension_, level_dof_access>::
const auto dofs_per_cell = this->get_fe().n_dofs_per_cell();
if (dofs_per_cell > 0)
{
const types::global_dof_index *cache =
dealii::internal::DoFAccessorImplementation::Implementation::
get_cache_ptr(this->dof_handler,
this->present_level,
this->present_index,
dofs_per_cell);
const types::global_dof_index *cache = dealii::internal::
DoFAccessorImplementation::Implementation::get_cache_ptr(
this->dof_handler, this->present_level, this->index(), dofs_per_cell);
for (unsigned int i = 0; i < dofs_per_cell; ++i, ++cache)
dof_indices[i] = *cache;
}
Expand Down Expand Up @@ -2671,7 +2670,7 @@ DoFCellAccessor<dimension_, space_dimension_, level_dof_access>::get_dof_values(
dealii::internal::DoFAccessorImplementation::Implementation::get_cache_ptr(
this->dof_handler,
this->present_level,
this->present_index,
this->index(),
this->get_fe().n_dofs_per_cell());
dealii::internal::DoFAccessorImplementation::Implementation::
extract_subvector_to(values,
Expand Down Expand Up @@ -2706,7 +2705,7 @@ DoFCellAccessor<dimension_, space_dimension_, level_dof_access>::get_dof_values(
dealii::internal::DoFAccessorImplementation::Implementation::get_cache_ptr(
this->dof_handler,
this->present_level,
this->present_index,
this->index(),
this->get_fe().n_dofs_per_cell());

constraints.get_dof_values(values,
Expand Down Expand Up @@ -2740,7 +2739,7 @@ DoFCellAccessor<dimension_, space_dimension_, level_dof_access>::set_dof_values(
dealii::internal::DoFAccessorImplementation::Implementation::get_cache_ptr(
this->dof_handler,
this->present_level,
this->present_index,
this->index(),
this->get_fe().n_dofs_per_cell());

for (unsigned int i = 0; i < this->get_fe().n_dofs_per_cell(); ++i, ++cache)
Expand Down Expand Up @@ -2967,7 +2966,7 @@ DoFCellAccessor<dimension_, space_dimension_, level_dof_access>::

const types::global_dof_index *dofs =
dealii::internal::DoFAccessorImplementation::Implementation::get_cache_ptr(
this->dof_handler, this->level(), this->present_index, n_dofs);
this->dof_handler, this->level(), this->index(), n_dofs);

// distribute cell vector
global_destination.add(n_dofs, dofs, local_source_begin);
Expand Down Expand Up @@ -2999,7 +2998,7 @@ DoFCellAccessor<dimension_, space_dimension_, level_dof_access>::

const types::global_dof_index *dofs =
dealii::internal::DoFAccessorImplementation::Implementation::get_cache_ptr(
this->dof_handler, this->level(), this->present_index, n_dofs);
this->dof_handler, this->level(), this->index(), n_dofs);

// distribute cell vector
constraints.distribute_local_to_global(local_source_begin,
Expand Down Expand Up @@ -3034,7 +3033,7 @@ DoFCellAccessor<dimension_, space_dimension_, level_dof_access>::

const types::global_dof_index *dofs =
dealii::internal::DoFAccessorImplementation::Implementation::get_cache_ptr(
this->dof_handler, this->level(), this->present_index, n_dofs);
this->dof_handler, this->level(), this->index(), n_dofs);

// distribute cell matrix
for (unsigned int i = 0; i < n_dofs; ++i)
Expand Down Expand Up @@ -3072,7 +3071,7 @@ DoFCellAccessor<dimension_, space_dimension_, level_dof_access>::
const unsigned int n_dofs = this->get_fe().n_dofs_per_cell();
const types::global_dof_index *dofs =
dealii::internal::DoFAccessorImplementation::Implementation::get_cache_ptr(
this->dof_handler, this->level(), this->present_index, n_dofs);
this->dof_handler, this->level(), this->index(), n_dofs);

// distribute cell matrices
for (unsigned int i = 0; i < n_dofs; ++i)
Expand Down