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
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
17915cf
Proper length of the custom_clj_params used for positional restraint …
mb2055 Sep 26, 2024
0a7fe8d
Updates changelog
mb2055 Sep 26, 2024
265bf81
Fix for repex in NPT ensemble
mb2055 Sep 26, 2024
2a0c15d
Changelog
mb2055 Sep 26, 2024
8836f92
Fix buffer overflow. [closes #236]
lohedges Sep 27, 2024
1028bca
Fix delta squared parameter in nonbonded expressions. [closes #238]
lohedges Sep 27, 2024
b8c23a3
Adds test for positional restraints on perturbed molecules
mb2055 Sep 27, 2024
e699235
Fixed typo in changelog
mb2055 Sep 27, 2024
1894153
Exclude to/from ghost interactions from ghost_14ff. [closes #239]
lohedges Sep 27, 2024
9e529ea
Update CHANGELOG. [ci skip]
lohedges Sep 27, 2024
132055e
Fix definition of ghost alpha parameter. [ci skip]
lohedges Sep 30, 2024
0e24205
Add function for evaluating custom XML forces. [ci skip]
lohedges Sep 30, 2024
3d9fe40
Update CHANGELOG. [ci skip]
lohedges Sep 30, 2024
4fcce0f
Return pairs and energy components separately. [ci skip]
lohedges Sep 30, 2024
9982932
Replica exchange now has the correct signs
mb2055 Sep 30, 2024
af24297
Add timeout to OpenMM minimiser. [closes #230]
lohedges Oct 2, 2024
9c9bc32
Expose pickle operator on LambdaLever.
lohedges Oct 2, 2024
0162be3
Remove debugging statement. [ci skip]
lohedges Oct 2, 2024
4c3effa
Update CHANGELOG. [ci skip]
lohedges Oct 2, 2024
9d520c9
Increase default minimiser timeout. [ci skip]
lohedges Oct 3, 2024
d4f7e83
Multiply out -1 to simplify expression
mb2055 Oct 4, 2024
03b7b90
Fix sign in volume correction term. [ci skip]
lohedges Oct 4, 2024
bf3b240
Merge remote-tracking branch 'origin/fix_232' into fix_236 [ci skip]
lohedges Oct 4, 2024
94e4d64
Merge remote-tracking branch 'origin/fix_234' into fix_236.
lohedges Oct 4, 2024
fe30263
Re-calculate energy after constraint projection. [closes #241] [ci skip]
lohedges Oct 8, 2024
18cb052
Update minimisation log message. [ci skip]
lohedges Oct 8, 2024
481afe1
Clear OpenMM state when minimising. [closes #242]
lohedges Oct 9, 2024
0d2297c
Update CHANGELOG.
lohedges Oct 9, 2024
f4c68de
Add xfail unit test for crazy constraint bug. [ci skip]
lohedges Oct 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix buffer overflow. [closes #236]
lohedges committed Sep 27, 2024
commit 8836f9216c2f034add1754a37bca48d45418e770
1 change: 1 addition & 0 deletions doc/source/changelog.rst
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@ organisation on `GitHub <https://github.com/openbiosim/sire>`__.
* Add support for boresch restraints to PME.
* Port SOMD torsion fix to PME code.
* Fix issues with ``atomtype`` and ``atom`` records for dummy atoms in GROMACS topology files.
* Fixed buffer overflow when computing molecule indices to excluded to/from ghost atom interactions.


`2024.2.0 <https://github.com/openbiosim/sire/compare/2024.1.0...2024.2.0>`__ - June 2024
4 changes: 2 additions & 2 deletions wrapper/Convert/SireOpenMM/sire_to_openmm_system.cpp
Original file line number Diff line number Diff line change
@@ -1578,14 +1578,14 @@ OpenMMMetaData SireOpenMM::sire_to_openmm_system(OpenMM::System &system,
{
// work out the molecule index for the from ghost atom
int mol_from = 0;
while (start_indexes[mol_from] <= from_ghost_idx)
while (start_indexes[mol_from] <= from_ghost_idx and mol_from < nmols)
mol_from++;

for (const auto &to_ghost_idx : to_ghost_idxs)
{
// work out the molecule index for the to ghost atom
int mol_to = 0;
while (start_indexes[mol_to] <= to_ghost_idx)
while (start_indexes[mol_to] <= to_ghost_idx and mol_to < nmols)
mol_to++;

if (not excluded_ghost_pairs.contains(IndexPair(from_ghost_idx, to_ghost_idx)))