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

Fix #236 #237

Merged
merged 29 commits into from
Oct 9, 2024
Merged

Fix #236 #237

merged 29 commits into from
Oct 9, 2024

Conversation

lohedges
Copy link
Contributor

@lohedges lohedges commented Sep 27, 2024

This PR closes #236 by restricting the loop over the start_indexes vector to the number of molecules in the system.

Also closes #238 by fixing the calculation of delta^2 used in the Coulomb term of the nonbonded expressions.

Also closes #239 by excluding to/from ghost interactions from the ghost_14ff.

Also closes #230 by adding a crude timeout to the OpenMM minimiser. This just checks to see if a maximum number of seconds has been exceeded in both the inner and outer loops of the code. This obviously doesn't check the timing within the internal line search algorithm itself. The main point of this is allow the user a single lever to control the max time (roughly) before the minimiser exits, rather than needing to adjust the number of iterations, ratchets, etc. (And even then, those might still lead to a hang.)

Also closes #241 by re-computing the energy after performing the final constraint projection in order to get the correct delta energy.

Also closes #242 by clearing the internal OpenMM state of the dynamics object when performing a minimisation.

  • I confirm that I have merged the latest version of devel into this branch before issuing this pull request (e.g. by running git pull origin devel): [y]
  • I confirm that I have added a changelog entry to the changelog (we will add a link to this PR as part of the review): [y]
  • I confirm that I have permission to release this code under the GPL3 license: [y]

mb2055
mb2055 previously approved these changes Sep 27, 2024
Copy link
Contributor

@mb2055 mb2055 left a comment

Choose a reason for hiding this comment

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

👍 All good (once the CI is done)

@lohedges lohedges mentioned this pull request Oct 4, 2024
@lohedges lohedges merged commit c868254 into devel Oct 9, 2024
@lohedges lohedges deleted the fix_236 branch October 9, 2024 13:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment