From f488f4ecc687d0065315bc9a74939634b18e11ff Mon Sep 17 00:00:00 2001 From: Matthew Scroggs Date: Wed, 1 Nov 2023 22:21:27 +0000 Subject: [PATCH] Rename Basix functions (#2849) * rename highest_degree and highest_complete_degree to match UFL * branches * branch names * more branches * branches --- .github/workflows/redhat.yml | 4 ++-- cpp/dolfinx/fem/FiniteElement.cpp | 2 +- python/test/unit/fem/test_custom_basix_element.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/redhat.yml b/.github/workflows/redhat.yml index c454aea6bf5..7561bc4c4e2 100644 --- a/.github/workflows/redhat.yml +++ b/.github/workflows/redhat.yml @@ -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: | diff --git a/cpp/dolfinx/fem/FiniteElement.cpp b/cpp/dolfinx/fem/FiniteElement.cpp index 4122640d510..25f09248e39 100644 --- a/cpp/dolfinx/fem/FiniteElement.cpp +++ b/cpp/dolfinx/fem/FiniteElement.cpp @@ -234,7 +234,7 @@ FiniteElement::FiniteElement(const ufcx_finite_element& e) cell_type, value_shape, wcoeffs, _x, _M, nderivs, static_cast(ce->map_type), static_cast(ce->sobolev_space), - ce->discontinuous, ce->highest_complete_degree, ce->highest_degree, + ce->discontinuous, ce->embedded_subdegree, ce->embedded_superdegree, static_cast(ce->polyset_type))); _needs_dof_transformations = !_element->dof_transformations_are_identity() diff --git a/python/test/unit/fem/test_custom_basix_element.py b/python/test/unit/fem/test_custom_basix_element.py index 607fc041dfe..28ec0913072 100644 --- a/python/test/unit/fem/test_custom_basix_element.py +++ b/python/test/unit/fem/test_custom_basix_element.py @@ -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) @@ -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)