-
-
Notifications
You must be signed in to change notification settings - Fork 208
Refactor dolfinx::fem::Form
to use local indexing of forms, rather than integral ids
#3740
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/mixed_quadrature
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.
+133
−110
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
Can you add some gentle background to the PR description? |
I've added an example to the description of the PR. |
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.
As shown in: #3735, there are many UFL forms (especially in the case of mixed quadrature rules), where the
subdomain_id
is not mapped 1-1 with an integration kernel.This PR refactors the Form class, to rather use the local indexing from the generated code (where integrals have been grouped) as the lookup key for the integral.
Only a minor change occurs in the user-interface, as
Form::subdomain_ids
no longer maps to the UFL subdomain_ids.However, this is currently only used for internal looping, as the integral_idx -> subdomain_id mapping happens within the
create_form_factory
function.This allows for different quadrature degrees in different parts of a form.
Example:
This generates two different integration kernels in FFCx, with the integral information as:
As seen in the latter line here,
form_integral_ids_form_*
is not a list of unique integers.In the main branch of DOLFINx, we assume that this id is unique, which is the root cause of #3735.