Merged a change that Mark checked into the pyopenmm repository after the app had already been moved

1d2c0a03 · Peter Eastman · ccc0ba85 · 1d2c0a03
Commit 1d2c0a03 authored Nov 08, 2011 by Peter Eastman
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

wrappers/python/simtk/openmm/app/forcefield.py wrappers/python/simtk/openmm/app/forcefield.py +2 -1

No files found.
--- a/wrappers/python/simtk/openmm/app/forcefield.py
+++ b/wrappers/python/simtk/openmm/app/forcefield.py
@@ -2733,7 +2733,8 @@ class AmoebaVdwGenerator:

            if( 'vdwCutoff' in args ):
                force.setCutoff( float( args['vdwCutoff'] ) )
-
+            else:
+                force.setCutoff( nonbondedCutoff )
            if( nonbondedMethod == PME ):
                force.setPBC( 1 )
                force.setUseNeighborList( 1 )