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

Regenerate clean application test outputs in DEM and CFD-DEM #1207

Merged
merged 5 commits into from
Jul 26, 2024

Conversation

acdaigneault
Copy link
Collaborator

@acdaigneault acdaigneault commented Jul 25, 2024

Description

The application test outputs had some extra spaces or some missing spaces, making it appears in diff of files when the output is updated and put them back or remove them. It makes it hard to focus on the real changes of the test.
Also, some strings in CFD-DEM did have spaces for no reason.

Solution

Remove the explicit spaces in CFD-DEM and regenerate all the tests in DEM and CFD-DEM from the real output files of tests (no copy-paste).

Testing

All tests are the same.
I added particle statistic output to spouted_bed_load_balancing test for more robust testing in CFD-DEM.

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
  • Fix has unit test(s) (preferred) or application test(s), and restart files are in the generator folder
  • The branch is rebased onto master
  • Changelog (CHANGELOG.md) is up to date
  • Code is indented with indent-all and .prm files (examples and tests) with prm-indent

Pull request related list:

  • 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 the fix is temporary, an issue is opened
  • The PR description is cleaned and ready for merge


*******************************************************************************
Transient iteration: 2 Time: 0.002 Time step: 0.001 CFL: 1.39637
Transient iteration: 2 Time: 0.002 Time step: 0.001 CFL: 1.39637
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Here are the changes of this test after enabling particle statistics

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I changed the output, but the test is disabled...

@@ -1406,6 +1406,9 @@ CFDDEMSolver<dim>::dem_setup_contact_parameters()
break;
}
}

// Initialize the total contact list counter
contact_search_total_number = 0;
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This was not initialized, so the first number in the stats was wrong (and kinda random)

@acdaigneault acdaigneault requested a review from blaisb July 25, 2024 21:01
@blaisb blaisb merged commit cda1644 into master Jul 26, 2024
8 checks passed
@blaisb blaisb deleted the cfddem_remove-space-string branch July 26, 2024 14:30
M-Badri pushed a commit to M-Badri/lethe that referenced this pull request Sep 29, 2024
…olymtl#1207)

Description
The application test outputs had some extra spaces or some missing spaces, making it appears in diff of files when the output is updated and put them back or remove them. It makes it hard to focus on the real changes of the test.
Also, some strings in CFD-DEM did have spaces for no reason.

Solution
Remove the explicit spaces in CFD-DEM and regenerate all the tests in DEM and CFD-DEM from the real output files of tests (no copy-paste).

Testing
All tests are the same.
I added particle statistic output to spouted_bed_load_balancing test for more robust testing in CFD-DEM.

Former-commit-id: cda1644
blaisb pushed a commit that referenced this pull request Sep 30, 2024
Description
The application test outputs had some extra spaces or some missing spaces, making it appears in diff of files when the output is updated and put them back or remove them. It makes it hard to focus on the real changes of the test.
Also, some strings in CFD-DEM did have spaces for no reason.

Solution
Remove the explicit spaces in CFD-DEM and regenerate all the tests in DEM and CFD-DEM from the real output files of tests (no copy-paste).

Testing
All tests are the same.
I added particle statistic output to spouted_bed_load_balancing test for more robust testing in CFD-DEM.

Former-commit-id: cda1644
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants