Skip to content
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

Move includes after #define in DEM #1223

Merged
merged 2 commits into from
Aug 6, 2024
Merged

Move includes after #define in DEM #1223

merged 2 commits into from
Aug 6, 2024

Conversation

acdaigneault
Copy link
Collaborator

@acdaigneault acdaigneault commented Aug 5, 2024

Description

Quick refactor as done in PR #1170 that moves header includes after the #define.
Some @brief has been added here and there at the same time.

Miscellaneous (will be removed when merged)

I tried to add @brief, but did not really worked on the content of the doc since this was not the aim of this refactoring.

Checklist (will be removed when merged)

See this page for more information about the pull request process.

Code related list:

  • All in-code documentation related to this PR is up to date (Doxygen format)
  • Lethe documentation is up to date
  • The branch is rebased onto master
  • Code is indented with indent-all and .prm files (examples and tests) with prm-indent
  • If parameters are modified, the tests and the documentation of examples are up to date
  • Changelog (CHANGELOG.md) is up to date if the refactor affects the user experience or the codebase

Pull request related list:

  • No other PR is open related to this refactoring
  • Labels are applied
  • There are at least 2 reviewers (or 1 if small feature) excluding the responsible for the merge
  • If this PR closes an issue or is related to a project, it is linked in the "Projects" or "Development" section
  • If any future works is planed, an issue is opened
  • The PR description is cleaned and ready for merge

@acdaigneault acdaigneault added the Refactoring This PR is only refactoring or clean up label Aug 5, 2024
@acdaigneault acdaigneault requested a review from blaisb August 5, 2024 17:23
Copy link
Contributor

@blaisb blaisb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2 minor things to fix and this is ready for merge :)

include/dem/dem_solver_parameters.h Outdated Show resolved Hide resolved
@@ -37,7 +37,7 @@ add_library(lethe-dem
particle_wall_linear_force.cc
particle_wall_nonlinear_force.cc
periodic_boundaries_manipulator.cc
post_processing.cc
dem_post_processing.cc
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
dem_post_processing.cc
dem_post_processing.cc

Can you put in alphabetical order please

@@ -90,7 +90,7 @@ add_library(lethe-dem
../../include/dem/particle_wall_linear_force.h
../../include/dem/particle_wall_nonlinear_force.h
../../include/dem/periodic_boundaries_manipulator.h
../../include/dem/post_processing.h
../../include/dem/dem_post_processing.h
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you put in alphabetical order please

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry about that, I never saw the file because I use the refactor tools in CLion and forget about that detail

@blaisb blaisb merged commit 9beea0c into master Aug 6, 2024
8 checks passed
@blaisb blaisb deleted the dem_cleanup-headers branch August 6, 2024 20:06
M-Badri pushed a commit to M-Badri/lethe that referenced this pull request Sep 29, 2024
Description
Quick refactor as done in PR chaos-polymtl#1170 that moves header includes after the #define.
Some @brief has been added here and there at the same time.



Former-commit-id: 9beea0c
blaisb pushed a commit that referenced this pull request Sep 30, 2024
Description
Quick refactor as done in PR #1170 that moves header includes after the #define.
Some @brief has been added here and there at the same time.



Former-commit-id: 9beea0c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Ready for review Refactoring This PR is only refactoring or clean up
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants