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

Error when non-bonded 1-4 scaling factors differ significantly #1153

Merged
merged 5 commits into from
Feb 6, 2025

Conversation

mattwthompson
Copy link
Member

@mattwthompson mattwthompson commented Jan 24, 2025

Description

Closes #380

Checklist

  • Add tests
  • Lint
  • Update docstrings

Copy link

codecov bot commented Jan 24, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.38%. Comparing base (d207957) to head (4a9f529).
Report is 6 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1153   +/-   ##
=======================================
  Coverage   93.38%   93.38%           
=======================================
  Files          70       70           
  Lines        6028     6036    +8     
=======================================
+ Hits         5629     5637    +8     
  Misses        399      399           

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

@mattwthompson mattwthompson force-pushed the error-combine-mixed-14 branch from 49bd0cf to 7cf3605 Compare January 30, 2025 16:32
Comment on lines +57 to +62
warnings.warn(
"Found electrostatics 1-4 scaling factors of 5/6 with slightly different rounding "
"(0.833333 and 0.8333333333). This likely stems from OpenFF using more digits in rounding 1/1.2. "
"The value of 0.8333333333 will be used, which may or may not introduce small errors. ",
InterchangeCombinationWarning,
)
Copy link
Member Author

Choose a reason for hiding this comment

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

Here's where I'd like to link to upstream openforcefield/openff-forcefields#120

@mattwthompson mattwthompson force-pushed the error-combine-mixed-14 branch from 7cf3605 to 5be8691 Compare January 30, 2025 16:46
@mattwthompson mattwthompson changed the title TST: Add test for combining mixed 1-4 vdW and/or electrostatics Error when non-bonded 1-4 scaling factors differ significantly Jan 30, 2025
@mattwthompson mattwthompson marked this pull request as ready for review January 30, 2025 17:10
docs/using/edges.md Outdated Show resolved Hide resolved
mattwthompson and others added 2 commits February 5, 2025 16:57
Co-authored-by: Lily Wang <31115101+lilyminium@users.noreply.github.com>
@mattwthompson
Copy link
Member Author

Thanks!

@mattwthompson mattwthompson merged commit 668a4cd into main Feb 6, 2025
16 checks passed
@mattwthompson mattwthompson added this to the 0.4.2 milestone Feb 6, 2025
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.

Combination: Components with different 1-4 scaling factors
3 participants