-
-
Couldn't load subscription status.
- Fork 45
Introduce integral type and try to separate ufl concepts from FFCx concepts #787
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.
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
Open
jorgensd
wants to merge
12
commits into
main
Choose a base branch
from
dokken/integral-type
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jorgensd
commented
Sep 10, 2025
jorgensd
commented
Sep 10, 2025
jorgensd
commented
Sep 10, 2025
This was referenced Sep 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Following the discussion in: FEniCS/dolfinx#3900
here follows an attempt of separate
UFLconcepts fromFFCx/DOLFINxconcepts.This starts with replacing the
integral_type, which we are just taking directly from ufl as a string, with aNamedTuplethat contains:codim: An integer that is either 0, 1, ...., tdim to represent cells, facets, ridges and peaks, or -1 to represent vertices (for now as they are introduced in FFCx. I believe they should be replaced with peak integrals).num_cells: Number of cells the integral is attached to. This indicates if we have an "interior" or "exterior" quantity. Currently this is not used to do anything in UFCx.h, but i believe this is something we should store there, rather than the enum we are currently using (facet,exterior_facet,cell,ridge,vertex). Default value for any IntegralType is 1 neighbouris_expression: As the integral-ir of Expression and Integrands are the same, we store this information as an optional bool.is_custom: If anyone wants to implement a custom element, it should go through the custom measure (none of the other custom types) for now.This removes a lot of handwavy interaction between
uflandffcx, as we convert the integral type as early as possible.Secondly, it removes the extra argument
entity_type, as it should be possible to derive it from the integral-type.This PR also fixes some other errors encountered when introducing typing to more classes.