Base unscaled pairs on all atoms in a torsion #1182
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Test results are in openmm/openmmforcefields#156 (comment). With this change, we get excellent agreement on energies. |
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When I implemented unscaled 1-4 interactions in #1149, I based it on the assumption that pairs could be classified based just on the types of the two interacting atoms, ignoring the two other atoms that connect them. This turns out to be wrong. For example, O-C-CX-H1 is an ordinary backbone torsion that uses standard scaling factors. By O-C-Cg-H1 is a GLYCAM torsion that should be unscaled. You need to consider all four atoms to tell the difference. This changes it to do that.