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

Remove ufcx_dofmap and ufcx_element #681

Merged
merged 8 commits into from
Apr 26, 2024
Merged

Remove ufcx_dofmap and ufcx_element #681

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5e98fef
branches
mscroggs Apr 17, 2024
a25f4a3
remove element and dofmap
mscroggs Apr 17, 2024
af88a07
Merge branch 'main' into mscroggs/element-from-basix
mscroggs Apr 23, 2024
7845cb2
Merge branch 'main' into mscroggs/element-from-basix
mscroggs Apr 25, 2024
0b5cb0b
basix main
mscroggs Apr 25, 2024
cf3a3c8
Merge branch 'main' into mscroggs/element-from-basix
mscroggs Apr 26, 2024
4ceb81a
fstrings
mscroggs Apr 26, 2024
a625d46
dolfinx main
mscroggs Apr 26, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/dolfinx-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: github.event_name != 'workflow_dispatch'
run: |
python3 -m pip install git+https://github.com/FEniCS/ufl.git
python3 -m pip install git+https://github.com/FEniCS/basix.git
python3 -m pip install git+https://github.com/FEniCS/basix.git@mscroggs/default_scalar_type
- name: Install UFL and Basix (specified branches/tags)
if: github.event_name == 'workflow_dispatch'
run: |
Expand All @@ -51,7 +51,7 @@ jobs:
with:
path: ./dolfinx
repository: FEniCS/dolfinx
ref: main
ref: mscroggs/element-from-basix
- name: Get DOLFINx source (specified branch/tag)
if: github.event_name == 'workflow_dispatch'
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pythonapp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Install FEniCS dependencies (Python)
run: |
pip install git+https://github.com/FEniCS/ufl.git
pip install git+https://github.com/FEniCS/basix.git
pip install git+https://github.com/FEniCS/basix.git@mscroggs/default_scalar_type
- name: Install FFCx
run: pip install .[ci]
- name: Static check with mypy
Expand Down
39 changes: 0 additions & 39 deletions ffcx/codegeneration/C/basix_custom_element_template.py
View file
Open in desktop

This file was deleted.

95 changes: 0 additions & 95 deletions ffcx/codegeneration/C/dofmap.py
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions ffcx/codegeneration/C/dofmap_template.py
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions ffcx/codegeneration/C/expressions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ def generator(ir, options):
# ufcx_function_space is generated (also for ufcx_form)
for name, (
element,
dofmap,
cmap_family,
cmap_degree,
cmap_celltype,
Expand All @@ -117,8 +116,7 @@ def generator(ir, options):
) in ir.function_spaces.items():
code += [f"static ufcx_function_space function_space_{name}_{ir.name_from_uflfile} ="]
code += ["{"]
code += [f".finite_element = &{element},"]
code += [f".dofmap = &{dofmap},"]
code += [f".finite_element = {element},"]
code += [f'.geometry_family = "{cmap_family}",']
code += [f".geometry_degree = {cmap_degree},"]
code += [f".geometry_basix_cell = {int(cmap_celltype)},"]
Expand Down
Loading