Parse multiple expressions #74
Merged
Conversation
This file contains 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
wence-
reviewed
Jan 11, 2022
| @@ -204,7 +204,7 @@ def get_form(name): | |||
| # Validate types | |||
| if not isinstance(ufd.expressions, (list, tuple)): | |||
| error("Expecting 'expressions' to be a list or tuple, not '%s'." % type(ufd.expressions)) | |||
| if not all(isinstance(e, Expr) for e in ufd.expressions): | |||
| if not all(isinstance(e[0], Expr) for e in ufd.expressions): | |||
There was a problem hiding this comment.
I guess I don't know how the form files work, but should one not write:
all(isinstance(e, Expr) for e in itertools.chain(*ufd.expressions))
Rather than implicitly indicating that the ufd.expressions variable is a list of singleton lists.
There was a problem hiding this comment.
Currently, "expressions" is a list of tuples of different type, List[Tuple(ufl.core.expr.Expression, numpy.ndarray)], but this is not standardised within UFL. We only need to know that first item in the tuple is of UFL Expression type. The second item in the tuple is used to tell what reference points expression is evaluated.
wence-
approved these changes
Jan 31, 2022
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.
This expects
expressionsgobal name in UFL files be list of expressions (ufl.core.expr.Expr and evaluation points). Needed to parse multiple expressions on FFCx side. Not affecting FEniCS(old) nor Firedrake.