-
Notifications
You must be signed in to change notification settings - Fork 25
Test that connections that should be permutations actually *are* permutations #225
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
Conversation
alexfikl
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not quite sure about the split of the warp and blend classes, but functionally it looks good to me! (barring a few nitpicks)
| if tol_multiplier is None: | ||
| tol_multiplier = 500 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's another tol_multiplier is None above that sets it to 50. Which one did you mean to keep?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| 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)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| 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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| return result | ||
|
|
||
|
|
||
| class PolynomialWarpAndBlend3DElementGroup(_MassMatrixQuadratureElementGroup): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Feels like this should have From3DRestriction or something to that effect in the name? This makes it sound like it only works in 3D.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fair point.
PolynomialWarpAndBlend3DRestrictingElementGroup?PolynomialWarpAndBlend2DRestrictingElementGroup?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep, that sounds better!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| default_simplex_group_factory, | ||
| ElementGroupFactory) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| default_simplex_group_factory, | |
| ElementGroupFactory) | |
| default_simplex_group_factory, | |
| ElementGroupFactory) |
? Everyone else seems to be indented like this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
be2f9c2 to
2d96e65
Compare
…ynomialWarpAndBlendGroupFactory
2d96e65 to
af04be8
Compare
af04be8 to
351b7c4
Compare
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