Skip to content

Commit

Permalink
Rename Basix functions (#2849)
Browse files Browse the repository at this point in the history
* rename highest_degree and highest_complete_degree to match UFL

* branches

* branch names

* more branches

* branches
  • Loading branch information
mscroggs committed Nov 1, 2023
1 parent ef7255b commit f488f4e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/redhat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:

steps:
- uses: actions/checkout@v4

- name: Upgrade pip and setuptools
run: |
python3 -m pip install --upgrade pip setuptools wheel
python3 -m pip install --upgrade pip setuptools wheel
- name: Install FEniCS Python components
run: |
Expand Down
2 changes: 1 addition & 1 deletion cpp/dolfinx/fem/FiniteElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ FiniteElement<T>::FiniteElement(const ufcx_finite_element& e)
cell_type, value_shape, wcoeffs, _x, _M, nderivs,
static_cast<basix::maps::type>(ce->map_type),
static_cast<basix::sobolev::space>(ce->sobolev_space),
ce->discontinuous, ce->highest_complete_degree, ce->highest_degree,
ce->discontinuous, ce->embedded_subdegree, ce->embedded_superdegree,
static_cast<basix::polyset::type>(ce->polyset_type)));
_needs_dof_transformations
= !_element->dof_transformations_are_identity()
Expand Down
4 changes: 2 additions & 2 deletions python/test/unit/fem/test_custom_basix_element.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ def func(x):
e2 = basix.ufl.custom_element(
e1.element.cell_type, e1.element.value_shape, e1.element.wcoeffs, e1.element.x,
e1.element.M, 0, e1.element.map_type, e1.element.sobolev_space,
e1.element.discontinuous, e1.element.highest_complete_degree, e1.element.highest_degree)
e1.element.discontinuous, e1.element.embedded_subdegree, e1.element.embedded_superdegree)

space1 = functionspace(mesh, e1)
space2 = functionspace(mesh, e2)
Expand Down Expand Up @@ -218,7 +218,7 @@ def func(x):
e2 = basix.ufl.custom_element(
e1.element.cell_type, e1.element.value_shape, e1.element.wcoeffs, e1.element.x,
e1.element.M, 0, e1.element.map_type, e1.element.sobolev_space,
e1.element.discontinuous, e1.element.highest_complete_degree, e1.element.highest_degree)
e1.element.discontinuous, e1.element.embedded_subdegree, e1.element.embedded_superdegree)

space1 = functionspace(mesh, e1)
space2 = functionspace(mesh, e2)
Expand Down

0 comments on commit f488f4e

Please sign in to comment.