-
Notifications
You must be signed in to change notification settings - Fork 60
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
Modify some classes to functions and struct in DEM #1232
Conversation
c4fab77
to
8e1b167
Compare
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.
Some minor comments. I will continue reading tomorrow but I doubt I will have many comments
include/dem/find_cell_neighbors.h
Outdated
* of a cell in a list (up to 4 vertices can have the same cell in common in | ||
* 3D). 2 types of container are used for cell neighbors : local-local cells |
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.
isnt that up to 8 in 3d? Maybe there's a way to make this paragraph a bit clearer :).
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.
Ok! I did not modify the text here, but I can take a look so it makes more sense
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 the description is not that obvious, but this is still a good summary. The comments in the function itself are quite explicit tho
std::make_tuple(particles_in_cell_iterator, | ||
first_vertex_location, | ||
second_vertex_location)}); | ||
particle_line_contact_candidates.emplace( |
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.
good usage of emplace here. nice
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.
last few comments. This is very good work. Thanks for this amazing refactor. It's much easier to read now.
|
||
private: | ||
// Broad search objects | ||
ParticleParticleBroadSearch<dim> particle_particle_broad_search_object; |
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.
Cool to get rid of all these objects :)
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.
So many!
Some tests seem to be crashing but it seems to be due to a deal.II update. I'll try to work on this tomorrow AM |
@acdaigneault can you rebase, this way we will be able to see what is breaking because of previous bugs and not |
611a908
to
b6a32dc
Compare
@acdaigneault I'm not sure what is this hang error you are getting, but it seems something is off since it happens in both release and debug? |
d6531ce
to
cf3c6f0
Compare
Yes this is related to my PR |
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.
All clear to me. Cleaning is so satisfying haha. Great job!
cf3c6f0
to
87c32a2
Compare
87c32a2
to
5ba1d0c
Compare
Description Some classes should not has been classes but functions or struct. I modified those classes to a more coherent architechture. I also gathered all the particle-object contact info structures in one file because it is more convenient that having 3 files for small structs. Testing Unit tests have been change according to that. Former-commit-id: ce0736b
Description Some classes should not has been classes but functions or struct. I modified those classes to a more coherent architechture. I also gathered all the particle-object contact info structures in one file because it is more convenient that having 3 files for small structs. Testing Unit tests have been change according to that. Former-commit-id: ce0736b
Description
Some classes should not has been classes but functions or struct.
I modified those classes to a more coherent architechture.
I also gathered all the particle-object contact info structures in one file because it is more convenient that having 3 files for small structs.
Testing
Unit tests have been change according to that.
Miscellaneous (will be removed when merged)
I do not think that needs a change log.
The particle-wall contact info needs to be changed as other, but I will do it when modifying the particle-wall forces.
Checklist (will be removed when merged)
See this page for more information about the pull request process.
Code related list:
Pull request related list: