-
Notifications
You must be signed in to change notification settings - Fork 112
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
Rod sphere contact #298
Rod sphere contact #298
Conversation
Changes in examples/Binder have been repeated from #294 since this formatting has not been done in the update-0.3.2 branch. These changes are done by auto-formatting while committing. |
Codecov ReportPatch coverage is
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.
📢 Thoughts on this report? Let us know!. |
@Rahul-JOON Can you add tests for the RodSphereContact class? Otherwise looks good to me just some minor comments |
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.
minor comments.
elastica/contact_forces.py
Outdated
x_sph, | ||
system_two.radius * system_two.director_collection[2, :, 0], | ||
system_one.radius + system_two.radius, | ||
system_one.lengths + system_two.lengths, |
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.
Length doesn't make much sense of sphere, and it is set as length = 2*radius. Maybe here we replace with following
system_one.lengths + system_two.lengths, | |
system_one.lengths + 2 * system_two.radius, |
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.
@Ali-7800 what do you think?
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.
I agree, maybe we should remove it later too cause it only makes sense for cylinders.
system_two.position_collection[..., 0] | ||
- system_two.radius * system_two.director_collection[2, :, 0] | ||
system_two.position[..., 0] | ||
- system_two.radius * system_two.director[2, :, 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.
same here.
x_sph, | ||
system_two.radius * system_two.director_collection[2, :, 0], | ||
system_two.radius * system_two.director[2, :, 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.
same here
system_one.internal_forces, | ||
system_one.external_forces, | ||
system_two.external_forces, | ||
system_two.external_torques, | ||
system_two.director_collection[:, :, 0], | ||
system_two.director[:, :, 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.
here too
system_two.position_collection, | ||
system_two.director_collection, | ||
system_two.radius[0], | ||
system_two.position, |
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.
It was correct before why did you change it?
This PR attempts to add Rod SPhere contact functionality as per #266.