Skip to content

945 Allow contact increase for simulation of larger events#975

Merged
mknaranja merged 5 commits intomainfrom
945-Allow-contact-increase-for-simulation-of-larger-events
Apr 4, 2024
Merged

945 Allow contact increase for simulation of larger events#975
mknaranja merged 5 commits intomainfrom
945-Allow-contact-increase-for-simulation-of-larger-events

Conversation

@HenrZu
Copy link
Contributor

@HenrZu HenrZu commented Mar 21, 2024

Changes and Information

Please briefly list the changes (main added features, changed items, or corrected bugs) made:

  • Remove the assertion for negative Damping coefficients
  • Now, we can model an increase of contacts which is important for the simulation of larger events

If need be, add additional information and what the reviewer should look out for in particular:

Merge Request - Guideline Checklist

Please check our git workflow. Use the draft feature if the Pull Request is not yet ready to review.

Checks by code author

  • Every addressed issue is linked (use the "Closes #ISSUE" keyword below)
  • New code adheres to coding guidelines
  • No large data files have been added (files should in sum not exceed 100 KB, avoid PDFs, Word docs, etc.)
  • Tests are added for new functionality and a local test run was successful (with and without OpenMP)
  • Appropriate documentation for new functionality has been added (Doxygen in the code and Markdown files if necessary)
  • Proper attention to licenses, especially no new third-party software with conflicting license has been added
  • (For ABM development) Checked benchmark results and ran and posted a local test above from before and after development to ensure performance is monitored.

Checks by code reviewer(s)

  • Corresponding issue(s) is/are linked and addressed
  • Code is clean of development artifacts (no deactivated or commented code lines, no debugging printouts, etc.)
  • Appropriate unit tests have been added, CI passes, code coverage and performance is acceptable (did not decrease)
  • No large data files added in the whole history of commits(files should in sum not exceed 100 KB, avoid PDFs, Word docs, etc.)
  • On merge, add 2-5 lines with the changes (main added features, changed items, or corrected bugs) to the merge-commit-message. This can be taken from the briefly-list-the-changes above (best case) or the separate commit messages (worst case).

@HenrZu HenrZu linked an issue Mar 21, 2024 that may be closed by this pull request
2 tasks
@codecov
Copy link

codecov bot commented Mar 21, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.32%. Comparing base (04179df) to head (fcc4509).
Report is 7 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #975      +/-   ##
==========================================
+ Coverage   96.29%   96.32%   +0.02%     
==========================================
  Files         123      129       +6     
  Lines        9844    10058     +214     
==========================================
+ Hits         9479     9688     +209     
- Misses        365      370       +5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@HenrZu HenrZu requested a review from mknaranja March 21, 2024 19:36
Copy link
Member

@mknaranja mknaranja left a comment

Choose a reason for hiding this comment

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

I will add another general test on dampings and then it can be merged from my side.

@mknaranja
Copy link
Member

@HenrZu Please see (and review) tests, example and slight default value changes.

@HenrZu
Copy link
Contributor Author

HenrZu commented Apr 4, 2024

I just added some line breaks after the std::cout calls to make the output clearer. Otherwise it is an very interesting & helpful example

@mknaranja mknaranja merged commit f5e415a into main Apr 4, 2024
@mknaranja mknaranja deleted the 945-Allow-contact-increase-for-simulation-of-larger-events branch April 4, 2024 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Allow contact increase for simulation of larger events

2 participants