Test that connections that should be permutations actually *are* permutations#225
Merged
Test that connections that should be permutations actually *are* permutations#225
Conversation
This was referenced Jun 16, 2021
alexfikl
approved these changes
Jun 16, 2021
Collaborator
alexfikl
left a comment
alexfikl
left a comment
There was a problem hiding this comment.
Not quite sure about the split of the warp and blend classes, but functionally it looks good to me! (barring a few nitpicks)
Comment on lines
272
to
273
| if tol_multiplier is None: | ||
| tol_multiplier = 500 |
Collaborator
There was a problem hiding this comment.
There's another tol_multiplier is None above that sets it to 50. Which one did you mean to keep?
| if len(zero_indices) != ncols - 1: | ||
| dist_vecs = (ibatch.result_unit_nodes.reshape(dim, -1, 1) | ||
| - from_grp.unit_nodes.reshape(dim, 1, -1)) | ||
| dists = np.sqrt(np.sum(dist_vecs**2, axis=0)) |
Collaborator
There was a problem hiding this comment.
Suggested change
| dists = np.sqrt(np.sum(dist_vecs**2, axis=0)) | |
| dists = la.norm(dist_vecs, axis=0, ord=2) |
? Don't know if this is any faster.
| return result | ||
|
|
||
|
|
||
| class PolynomialWarpAndBlend3DElementGroup(_MassMatrixQuadratureElementGroup): |
Collaborator
There was a problem hiding this comment.
Feels like this should have From3DRestriction or something to that effect in the name? This makes it sound like it only works in 3D.
Owner
Author
There was a problem hiding this comment.
Fair point.
PolynomialWarpAndBlend3DRestrictingElementGroup?PolynomialWarpAndBlend2DRestrictingElementGroup?
Collaborator
There was a problem hiding this comment.
Yep, that sounds better!
Comment on lines
42
to
43
| default_simplex_group_factory, | ||
| ElementGroupFactory) |
Collaborator
There was a problem hiding this comment.
Suggested change
| default_simplex_group_factory, | |
| ElementGroupFactory) | |
| default_simplex_group_factory, | |
| ElementGroupFactory) |
? Everyone else seems to be indented like this.
inducer
force-pushed
the
conn-permutations
branch
3 times, most recently
from
be2f9c2 to
2d96e65
Compare
…ynomialWarpAndBlendGroupFactory
inducer
force-pushed
the
conn-permutations
branch
from
2d96e65 to
af04be8
Compare
inducer
force-pushed
the
conn-permutations
branch
from
af04be8 to
351b7c4
Compare
inducer
added a commit
to inducer/grudge
that referenced
this pull request
Jun 16, 2021
inducer
added a commit
to inducer/grudge
that referenced
this pull request
Jun 17, 2021
inducer
added a commit
to inducer/grudge
that referenced
this pull request
Jun 17, 2021
inducer
added a commit
to inducer/grudge
that referenced
this pull request
Jun 17, 2021
inducer
added a commit
to inducer/grudge
that referenced
this pull request
Jun 17, 2021
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 is supposed to be a version of #105 that we can merge right away, plus a number of fixes that arose around that. For review, this PR is probably best viewed commit-by-commit. The commit messages provide a pretty good inventory of what's here.
Diff-wise, the biggest part of this is the (annoying, but IMO required) split of
PolynomialWarpAndBlendGroupFactoryintoPolynomialWarpAndBlend2DGroupFactoryandPolynomialWarpAndBlend3DGroupFactory. (The 2D WnB nodes are not equivalent to a restriction of the 3D nodes to a face, and we very much would like 2D el groups in 3D discretizations to be just that, so that the boundary extractions can be done by indirect addressing.)cc @nchristensen