Skip to content

Ksagiyam/tsfc refactor 1 #2200

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
dham merged 5 commits into from
Feb 10, 2022
Merged

Ksagiyam/tsfc refactor 1 #2200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a3c42a1
tsfc_refactor: KernelBuilder takes TSFCIntegralDataInfo
ksagiyam Sep 1, 2021
c293267
tsfc_refactor: change KernelBuilder.set_arguments()
ksagiyam Sep 3, 2021
68d0a0c
tsfc_refactor: add builder.fem_config
ksagiyam Sep 3, 2021
ea27e18
DROP BEFORE MERGE
ksagiyam Sep 1, 2021
ad6c990
tsfc_refactor: move some functions from driver to kernel_interface/co…
ksagiyam Sep 4, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- name: Build Firedrake
run: |
cd ..
./firedrake/scripts/firedrake-install $COMPLEX --venv-name build --tinyasm --disable-ssh --minimal-petsc --slepc --documentation-dependencies --install thetis --install gusto --install icepack --install irksome --install femlium --no-package-manager|| (cat firedrake-install.log && /bin/false)
./firedrake/scripts/firedrake-install $COMPLEX --venv-name build --tinyasm --disable-ssh --minimal-petsc --slepc --documentation-dependencies --install thetis --install gusto --install icepack --install irksome --install femlium --no-package-manager --package-branch tsfc ksagiyam/tsfc_refactor_1|| (cat firedrake-install.log && /bin/false)
- name: Install test dependencies
run: |
. ../build/bin/activate
Expand Down
17 changes: 13 additions & 4 deletions firedrake/mg/kernels.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@

from tsfc.coffee import generate as generate_coffee
from tsfc import fem, ufl_utils, spectral
from tsfc.driver import lower_integral_type
from tsfc.driver import TSFCIntegralDataInfo
from tsfc.kernel_interface.common import lower_integral_type
from tsfc.parameters import default_parameters
from tsfc.finatinterface import create_element
from finat.quadrature import make_quadrature
Expand Down Expand Up @@ -548,11 +549,19 @@ def dg_injection_kernel(Vf, Vc, ncell):

Vce = create_element(Vc.ufl_element())

coarse_builder = firedrake_interface.KernelBuilder("cell", "otherwise", 0, ScalarType_c)
info = TSFCIntegralDataInfo(domain=Vc.mesh(),
integral_type="cell",
subdomain_id="otherwise",
domain_number=0,
arguments=(ufl.TestFunction(Vc), ),
coefficients=(),
coefficient_numbers=())

coarse_builder = firedrake_interface.KernelBuilder(info, parameters["scalar_type"])
coarse_builder.set_coordinates(Vc.mesh())
argument_multiindices = (Vce.get_indices(), )
argument_multiindices = coarse_builder.argument_multiindices
argument_multiindex, = argument_multiindices
return_variable, = coarse_builder.set_arguments((ufl.TestFunction(Vc), ), argument_multiindices)
return_variable, = coarse_builder.return_variables

integration_dim, entity_ids = lower_integral_type(Vce.cell, "cell")
# Midpoint quadrature for jacobian on coarse cell.
Expand Down