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

Extend VectorFunctionSpace to custom elements #2576

Merged
merged 14 commits into from
Mar 16, 2023
Merged

Extend VectorFunctionSpace to custom elements #2576

Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6e020f7
extend VectorFunctionSpace to custom elements
pierricmora Mar 8, 2023
d8d247d
Merge branch 'main' into PR_VectorFunctionSpace
mscroggs Mar 8, 2023
66d46ac
Apply suggestions from code review
pierricmora Mar 8, 2023
a4eccb9
Update function.py (adjust spaces)
pierricmora Mar 8, 2023
9ee4abf
correct flake8 E125 at line 615
pierricmora Mar 8, 2023
e53f43c
Merge branch 'main' into PR_VectorFunctionSpace
mscroggs Mar 9, 2023
2da751d
Update python/dolfinx/fem/function.py
mscroggs Mar 9, 2023
5bd42ef
Update python/dolfinx/fem/function.py
mscroggs Mar 9, 2023
81bb52e
Merge branch 'main' into PR_VectorFunctionSpace
mscroggs Mar 13, 2023
7d802b7
Merge branch 'FEniCS:main' into PR_VectorFunctionSpace
pierricmora Mar 14, 2023
3e1ba78
formatting & replace isinstance
pierricmora Mar 14, 2023
050e88e
flake8 line 611
pierricmora Mar 14, 2023
0052aa9
mypy -> fill with # type: ignore
pierricmora Mar 15, 2023
86914b4
flake8 line length max 120
pierricmora Mar 15, 2023
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
19 changes: 14 additions & 5 deletions python/dolfinx/fem/function.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,12 +608,21 @@ def tabulate_dof_coordinates(self) -> npt.NDArray[np.float64]:
return self._cpp_object.tabulate_dof_coordinates()


def VectorFunctionSpace(mesh: Mesh, element: typing.Union[ElementMetaData, typing.Tuple[str, int]],
dim=None) -> FunctionSpace:
def VectorFunctionSpace(
mesh: Mesh,
pierricmora marked this conversation as resolved.
Show resolved Hide resolved
element: typing.Union[basix.ufl_wrapper._BasixElementBase,
ElementMetaData, typing.Tuple[str, int]],
dim=None) -> FunctionSpace:
"""Create vector finite element (composition of scalar elements) function space."""
e = ElementMetaData(*element)
ufl_element = basix.ufl_wrapper.create_vector_element(e.family, mesh.ufl_cell().cellname(), e.degree,
dim=dim, gdim=mesh.geometry.dim)
if isinstance(element, basix.ufl_wrapper._BasixElementBase):
pierricmora marked this conversation as resolved.
Show resolved Hide resolved
e = element
ufl_element = basix.ufl_wrapper.create_vector_element(e.family(), e.cell_type, e.degree(),
e.lagrange_variant, e.dpc_variant, e.discontinuous,
dim=dim, gdim=mesh.geometry.dim)
else:
e = ElementMetaData(*element)
mscroggs marked this conversation as resolved.
Show resolved Hide resolved
ufl_element = basix.ufl_wrapper.create_vector_element(e.family, mesh.ufl_cell().cellname(), e.degree,
mscroggs marked this conversation as resolved.
Show resolved Hide resolved
dim=dim, gdim=mesh.geometry.dim)
return FunctionSpace(mesh, ufl_element)


Expand Down