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 116 #117

Merged
merged 13 commits into from
Oct 23, 2023
Merged

Fix 116 #117

merged 13 commits into from
Oct 23, 2023

Conversation

chryswoods
Copy link
Contributor

@chryswoods chryswoods commented Oct 20, 2023

This pull request fixes issue #116 and also fixes the vacuum bug reported on slack.

  • 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]

Suggested reviewers:

@lohedges

Any additional context of information?

This builds on and supersedes PR #114

…by comparing

the measured distance against either r0 (for bonds) or a list of seen angle
distances for angles. This massively speeds up OpenMM, as it is now able to
find equivalent molecules and optimise itself internally.
…ons"

error in 8.1beta, but only when the bonds(!?) change. The fix is
to minimise with h-bond constraints turned on. I've added a note
about this to investigate later, and updated the docs and example
script to minimise with h-bonds (with perturbable_constraint='none'
as otherwise that defeats the point of minimising...)
… the minimisation

process (i.e. correcting issues caused by our use of custom forcefields for
perturbations)

Will eventually integrate with the progress bar system plus give more control over
the way that constraints are handled
Fixed exclusions/exceptions errors on the CPU platform
…cules

with no internal bonding. Added a better algorithm to detect and fix
this.

Also cleaned up the code to get a shared constraint length.

Added the changelog entries ready for the PR
compliant.

Also, the tests give about 97% coverage :-)
…stake

was that I had replaced

```
if type(C) != D:
```

with

```
if isinstance(C, D):
```

when it should have been

```
if not isinstance(C, D):
```

All fixed now. Does not need a CI rebuild.

[ci skip]
…of dynamics/minimisation

adding in a fake OpenMM box when vacuum systems are committed
@chryswoods chryswoods linked an issue Oct 20, 2023 that may be closed by this pull request
@chryswoods chryswoods temporarily deployed to sire-build October 20, 2023 17:30 — with GitHub Actions Inactive
@chryswoods chryswoods temporarily deployed to sire-build October 20, 2023 17:30 — with GitHub Actions Inactive
@chryswoods chryswoods temporarily deployed to sire-build October 20, 2023 17:30 — with GitHub Actions Inactive
@chryswoods chryswoods temporarily deployed to sire-build October 20, 2023 17:30 — with GitHub Actions Inactive
@chryswoods chryswoods temporarily deployed to sire-build October 20, 2023 17:30 — with GitHub Actions Inactive
@lohedges lohedges self-requested a review October 23, 2023 10:53
Copy link
Contributor

@lohedges lohedges left a comment

Choose a reason for hiding this comment

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

All BioSimSpace tests are passing and the somd2 minimisation issue is resolved. The one thing to note is that tests/convert/test_openmm_minimise.py appears to pass both before and after the fix. I'm not sure why this system isn't affected by the issue that I was seeing. Perhaps it's worth updating the test with the perturbable molecule example so that we know we're using something that used to fail.

@chryswoods chryswoods merged commit 263fb18 into devel Oct 23, 2023
5 checks passed
@chryswoods chryswoods deleted the fix_116 branch October 23, 2023 11:28
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.

[BUG] Issue merging small molecules
2 participants