Skip to content

Ksagiyam/tsfc refactor #1864

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

Closed
wants to merge 3 commits into from
Closed

Ksagiyam/tsfc refactor #1864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4dbd594
adapt to tsfc KernelBuilder changes
ksagiyam Oct 13, 2020
fa08937
DROP BEFORE MERGE
ksagiyam Oct 30, 2020
bdba9ca
DROP BEFORE MERGE
ksagiyam Nov 1, 2020
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 Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pipeline {
sh 'mkdir tmp'
dir('tmp') {
timestamps {
sh '../scripts/firedrake-install $COMPLEX --tinyasm --disable-ssh --minimal-petsc --slepc --documentation-dependencies --install thetis --install gusto --install icepack --install irksome --no-package-manager || (cat firedrake-install.log && /bin/false)'
sh '../scripts/firedrake-install $COMPLEX --tinyasm --disable-ssh --minimal-petsc --slepc --documentation-dependencies --install thetis --install gusto --install icepack --install irksome --no-package-manager --package-branch tsfc ksagiyam/tsfc_refactor --package-branch firedrake ksagiyam/tsfc_refactor || (cat firedrake-install.log && /bin/false)'
}
}
}
Expand Down
21 changes: 16 additions & 5 deletions firedrake/mg/kernels.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
import ufl
import tsfc

from tsfc.kernel_interface.common import lower_integral_type
import tsfc.kernel_interface.firedrake as firedrake_interface

from tsfc.coffee import generate as generate_coffee
from tsfc import fem, ufl_utils, spectral
from tsfc.driver 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 @@ -530,11 +530,22 @@ def dg_injection_kernel(Vf, Vc, ncell):

Vce = create_element(Vc.ufl_element())

coarse_builder = firedrake_interface.KernelBuilder("cell", "otherwise", 0, ScalarType_c)
coarse_builder.set_coordinates(Vc.mesh())
argument_multiindices = (Vce.get_indices(), )
class _IntegralData(object):
def __init__(self, Vc):
self.domain = Vc.mesh()
self.integral_type = "cell"
self.subdoamin_id = "otherwise"
self.domain_number = 0
self.coefficients = ()
self.coefficient_numbers = ()
self.integrals = ()
self._integral_to_form_data_map = {}
self.arguments = (ufl.TestFunction(Vc), )

coarse_builder = firedrake_interface.KernelBuilder(_IntegralData(Vc), ScalarType_c, parameters["scalar_type"])
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