Commits · 51f82c025619874753ed0b3c0c8f71bc61bd08da · tsoc / openmm

15 Dec, 2015 2 commits
- Merge branch 'genpt' of https://github.com/andysim/openmm into · 51f82c02
  Peter Eastman authored Dec 15, 2015
```
extrapolated
```
  51f82c02
- Merge pull request #1296 from peastman/bugs · cab0faf8
  peastman authored Dec 14, 2015
```
Bug fixes
```
  cab0faf8
14 Dec, 2015 7 commits
- Bug fixes · 80d41381
  Peter Eastman authored Dec 14, 2015
  
  80d41381
- Merge pull request #1295 from peastman/centroid · 844a91b4
  peastman authored Dec 14, 2015
```
Added serialization proxy for CustomCentroidBondForce
```
  844a91b4
- Added serialization proxy for CustomCentroidBondForce · eb943ace
  peastman authored Dec 14, 2015
  
  eb943ace
- Merge pull request #1294 from pandegroup/rmcgibbo-patch-1 · 239dc39e
  peastman authored Dec 14, 2015
```
Update CustomHbondForce.h
```
  239dc39e
- Merge pull request #1289 from rmcgibbo/appveyor-opencl2 · 5f9e7d01
  peastman authored Dec 14, 2015
```
Add OpenCL to Appveyor and fix nosetests
```
  5f9e7d01
- Other header updates to bring docs into consistency with function signatures · 90fea164
  Robert T. McGibbon authored Dec 13, 2015
  
  90fea164
- Update CustomHbondForce.h · 322bd639
  Robert T. McGibbon authored Dec 13, 2015
  
  322bd639
12 Dec, 2015 5 commits
- Fix path · 8807d7b4
  Robert T. McGibbon authored Dec 12, 2015
  
  8807d7b4
- Add OpenCL to Appveyor and fix nosetests · a802dfc2
  Robert T. McGibbon authored Dec 10, 2015
  
  a802dfc2
- Merge pull request #1291 from peastman/platformdoc · 4bafde33
  peastman authored Dec 11, 2015
```
Minor changes to doxygen comments
```
  4bafde33
- Merge pull request #1290 from peastman/energyfix · 3a1936fd
  peastman authored Dec 11, 2015
```
Fixed error in energy computation
```
  3a1936fd
- Minor changes to doxygen comments · 0af10b15
  peastman authored Dec 11, 2015
  
  0af10b15
11 Dec, 2015 1 commit
- Fixed error in energy computation · 86b2af14
  peastman authored Dec 11, 2015
  
  86b2af14
09 Dec, 2015 6 commits
- Added some tests for the PT polarization routines. · 2913b686
  Andy Simmonett authored Dec 09, 2015
  
  2913b686
- Fixed bug in NoCutoff PT polarization routine. · 0a608bf6
  Andy Simmonett authored Dec 09, 2015
  
  0a608bf6
- Single char fix to PT code. · c12298b8
  Andy Simmonett authored Dec 08, 2015
```
The forces were not correct for different uind/uinp as a result.
```
  c12298b8
- Fixed a silly cut 'n' paste error and, hopefully, the SWIG generation problem. · 34afae6a
  Andy Simmonett authored Dec 08, 2015
  
  34afae6a
- Merge branch 'master' of github.com:pandegroup/openmm into genpt · 2d2f05ce
  Andy Simmonett authored Dec 08, 2015
  
  2d2f05ce
- Unified direct and reciprocal field gradient terms for OPT.Tested with a triclinic crystal. · 94823d84
  Andy Simmonett authored Dec 08, 2015
  
  94823d84
08 Dec, 2015 2 commits
- Added Cartesian field-like OPT dipole response gradients to the PME routine. · 62cc2344
  Andy Simmonett authored Dec 07, 2015
  
  62cc2344
- Non-PME OPT calculations now use a much more efficient Cartesian field... · 52bd072b
  Andy Simmonett authored Dec 07, 2015
```
Non-PME OPT calculations now use a much more efficient Cartesian field algorithm for the dipole response force terms.
```
  52bd072b
02 Dec, 2015 1 commit
- Merge pull request #1279 from peastman/nucleic · 4d32047c
  peastman authored Dec 01, 2015
```
Support nucleic acids in AMOEBA 2009
```
  4d32047c
01 Dec, 2015 1 commit
- Merge pull request #1276 from rafwiewiora/multi_model_conect · 42b7ccd3
  peastman authored Dec 01, 2015
```
Add CONECT bonds for multi-model pdb files 
```
  42b7ccd3
25 Nov, 2015 1 commit
- add CONECT bonds for multimodel pdb files · a56ba941
  Rafal P. Wiewiora authored Nov 25, 2015
  
  a56ba941
23 Nov, 2015 2 commits
- Merge pull request #1275 from peastman/enforceperiodic · 83cfc856
  peastman authored Nov 23, 2015
```
Fixed bug in getState() when enforcing periodic boundary conditions
```
  83cfc856
- Fixed bug in getState() when enforcing periodic boundary conditions · 6463111f
  peastman authored Nov 23, 2015
  
  6463111f
21 Nov, 2015 1 commit
- Merge pull request #1273 from peastman/shake · d92e0937
  peastman authored Nov 20, 2015
```
Increased SHAKE iterations when positioning extra particles
```
  d92e0937
20 Nov, 2015 7 commits
- Increased SHAKE iterations when positioning extra particles · 6bb532ac
  peastman authored Nov 20, 2015
  
  6bb532ac
- Merge pull request #1272 from swails/amber-switching · 40dfdeea
  peastman authored Nov 20, 2015
```
Amber switching
```
  40dfdeea
- More clarification. · cb2ad95d
  Jason Swails authored Nov 20, 2015
  
  cb2ad95d
- Fix docstring. · 35adccb0
  Jason Swails authored Nov 20, 2015
  
  35adccb0
- Fix unit handling in switchDistance and add tests. · 9e934f69
  Jason Swails authored Nov 20, 2015
  
  9e934f69
- Merge branch 'master' into amber-switching · 1c938ceb
  Jason Swails authored Nov 20, 2015
```
 Conflicts:
	wrappers/python/simtk/openmm/app/amberprmtopfile.py

In fixing the merge conflict, I went ahead and fixed up the switchDistance logic
to match what I did in CharmmPsfFile.
```
  1c938ceb
- Merge pull request #1271 from peastman/gbvi · 167ae8a0
  peastman authored Nov 19, 2015
```
Deleted GBVIForce
```
  167ae8a0
19 Nov, 2015 3 commits
- Deleted GBVIForce · 14e78600
  Peter Eastman authored Nov 19, 2015
  
  14e78600
- Hopefully finished with supporting nucleotides in AMOEBA · 69d7dc4f
  peastman authored Nov 19, 2015
  
  69d7dc4f
- Fixed bugs that affected nucleotides in AMOEBA · 4daa1acb
  Peter Eastman authored Nov 19, 2015
  
  4daa1acb
17 Nov, 2015 1 commit
- Merge pull request #1264 from philiptzou/pull-request-ordered-set-fix · b20c20fe
  peastman authored Nov 17, 2015
```
Fix #1213 addInteractionGroup should accept `set` values as parameters
```
  b20c20fe