Skip to content

More fixes to DirichletBC.dof_indices #3941

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

Merged
merged 2 commits into from
Sep 28, 2025
Merged

More fixes to DirichletBC.dof_indices #3941

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d91705
Fix subspace bc dofs indices case
michalhabera Sep 27, 2025
7a2c56a
Extend bc dofs test
michalhabera Sep 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions cpp/dolfinx/fem/DirichletBC.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,12 +255,13 @@ class DirichletBC
{
private:
/// Compute number of owned dofs indices. Will contain 'gaps' for
/// sub-spaces.
/// sub-spaces. The dofs must be unrolled.
std::size_t num_owned(const DofMap& dofmap,
std::span<const std::int32_t> dofs)
{
int bs = dofmap.index_map_bs();
std::int32_t map_size = dofmap.index_map->size_local();
std::int32_t owned_size = map_size;
std::int32_t owned_size = bs * map_size;
auto it = std::ranges::lower_bound(dofs, owned_size);
return std::distance(dofs.begin(), it);
}
Expand Down Expand Up @@ -324,8 +325,7 @@ class DirichletBC
std::vector<std::int32_t>>
DirichletBC(std::shared_ptr<const Constant<T>> g, X&& dofs,
std::shared_ptr<const FunctionSpace<U>> V)
: _function_space(V), _g(g), _dofs0(std::forward<X>(dofs)),
_owned_indices0(num_owned(*V->dofmap(), _dofs0))
: _function_space(V), _g(g), _dofs0(std::forward<X>(dofs))
{
assert(g);
assert(V);
Expand All @@ -351,10 +351,9 @@ class DirichletBC

// Unroll _dofs0 if dofmap block size > 1
if (const int bs = V->dofmap()->bs(); bs > 1)
{
_owned_indices0 *= bs;
_dofs0 = unroll_dofs(_dofs0, bs);
}

_owned_indices0 = num_owned(*_function_space->dofmap(), _dofs0);
}

/// @brief Create a representation of a Dirichlet boundary condition
Expand All @@ -374,17 +373,15 @@ class DirichletBC
std::vector<std::int32_t>>
DirichletBC(std::shared_ptr<const Function<T, U>> g, X&& dofs)
: _function_space(g->function_space()), _g(g),
_dofs0(std::forward<X>(dofs)),
_owned_indices0(num_owned(*_function_space->dofmap(), _dofs0))
_dofs0(std::forward<X>(dofs))
{
assert(_function_space);

// Unroll _dofs0 if dofmap block size > 1
if (const int bs = _function_space->dofmap()->bs(); bs > 1)
{
_owned_indices0 *= bs;
_dofs0 = unroll_dofs(_dofs0, bs);
}

_owned_indices0 = num_owned(*_function_space->dofmap(), _dofs0);
}

/// @brief Create a representation of a Dirichlet boundary condition
Expand Down
Loading