Merge branch 'master' into membrane

platforms/cuda/src/CudaContext.cpp

@@ -257,7 +257,7 @@ CudaContext::CudaContext(const System& system, int deviceIndex, bool useBlocking
     int multiprocessors;
     CHECK_RESULT(cuDeviceGetAttribute(&multiprocessors, CU_DEVICE_ATTRIBUTE_MULTIPROCESSOR_COUNT, device));
     numThreadBlocks = numThreadBlocksPerComputeUnit*multiprocessors;
-    if (cudaDriverVersion >= 9000) {
+    if (computeCapability >= 7.0) {
         compilationDefines["SYNC_WARPS"] = "__syncwarp();";
         compilationDefines["SHFL(var, srcLane)"] = "__shfl_sync(0xffffffff, var, srcLane);";
         compilationDefines["BALLOT(var)"] = "__ballot_sync(0xffffffff, var);";

platforms/cuda/src/CudaKernels.cpp

@@ -8021,6 +8021,7 @@ void CudaIntegrateCustomStepKernel::getGlobalVariables(ContextImpl& context, vec
         // The data structures haven't been created yet, so just return the list of values that was given earlier.
         
         values = initialGlobalVariables;
+        return;
     }
     values.resize(numGlobalVariables);
     for (int i = 0; i < numGlobalVariables; i++)

platforms/opencl/src/OpenCLKernels.cpp

@@ -8380,6 +8380,7 @@ void OpenCLIntegrateCustomStepKernel::getGlobalVariables(ContextImpl& context, v
         // The data structures haven't been created yet, so just return the list of values that was given earlier.
         
         values = initialGlobalVariables;
+        return;
     }
     values.resize(numGlobalVariables);
     for (int i = 0; i < numGlobalVariables; i++)

wrappers/python/simtk/openmm/app/forcefield.py

@@ -6,7 +6,7 @@ Simbios, the NIH National Center for Physics-Based Simulation of
 Biological Structures at Stanford, funded under the NIH Roadmap for
 Medical Research, grant U54 GM072970. See https://simtk.org.
 
-Portions copyright (c) 2012-2016 Stanford University and the Authors.
+Portions copyright (c) 2012-2017 Stanford University and the Authors.
 Authors: Peter Eastman, Mark Friedrichs
 Contributors:
 
@@ -2365,35 +2365,41 @@ class LennardJonesGenerator(object):
             generator.registerNBFIX(Nbfix.attrib)
 
     def createForce(self, sys, data, nonbondedMethod, nonbondedCutoff, args):
-        # First derive the lookup tables
+        # First derive the lookup tables.  We need to include entries for every type
+        # that a) appears in the system and b) has unique parameters.
 
         nbfixTypeSet = set().union(*self.nbfixTypes)
-        ljIndexList = [None]*len(data.atoms)
-        numLjTypes = 0
-        ljTypeList = []
-        typeMap = {}
-        for i, atom in enumerate(data.atoms):
-            atype = data.atomType[atom]
-            values = tuple(self.ljTypes.getAtomParameters(atom, data))
-            if values in typeMap and atype not in nbfixTypeSet:
-                # Only non-NBFIX types can be compressed
-                ljIndexList[i] = typeMap[values]
-            else:
-                typeMap[values] = numLjTypes
-                ljIndexList[i] = numLjTypes
-                numLjTypes += 1
-                ljTypeList.append(atype)
-        reverseMap = [0]*len(typeMap)
-        for typeValue in typeMap:
-            reverseMap[typeMap[typeValue]] = typeValue
+        allTypes = set(data.atomType[atom] for atom in data.atoms)
+        mergedTypes = []
+        mergedTypeParams = []
+        paramsToMergedType = {}
+        typeToMergedType = {}
+        for t in allTypes:
+            typeParams = self.ljTypes.paramsForType[t]
+            params = (typeParams['sigma'], typeParams['epsilon'])
+            if t in nbfixTypeSet:
+                # NBFIX types cannot be merged.
+                typeToMergedType[t] = len(mergedTypes)
+                mergedTypes.append(t)
+                mergedTypeParams.append(params)
+            elif params in paramsToMergedType:
+                # We can merge this with another type.
+                typeToMergedType[t] = paramsToMergedType[params]
+            else:
+                # This is a new type.
+                typeToMergedType[t] = len(mergedTypes)
+                paramsToMergedType[params] = len(mergedTypes)
+                mergedTypes.append(t)
+                mergedTypeParams.append(params)
         
         # Now everything is assigned. Create the A- and B-coefficient arrays
 
+        numLjTypes = len(mergedTypes)
         acoef = [0]*(numLjTypes*numLjTypes)
         bcoef = acoef[:]
         for m in range(numLjTypes):
             for n in range(numLjTypes):
-                pair = (ljTypeList[m], ljTypeList[n])
+                pair = (mergedTypes[m], mergedTypes[n])
                 if pair in self.nbfixTypes:
                     epsilon = self.nbfixTypes[pair][1]
                     sigma = self.nbfixTypes[pair][0]
@@ -2402,9 +2408,9 @@ class LennardJonesGenerator(object):
                     bcoef[m+numLjTypes*n] = 4*epsilon*sigma6
                     continue
                 else:
-                    sigma = 0.5*(reverseMap[m][0]+reverseMap[n][0])
+                    sigma = 0.5*(mergedTypeParams[m][0]+mergedTypeParams[n][0])
                     sigma6 = sigma**6
-                    epsilon = math.sqrt(reverseMap[m][-1]*reverseMap[n][-1])
+                    epsilon = math.sqrt(mergedTypeParams[m][1]*mergedTypeParams[n][1])
                     acoef[m+numLjTypes*n] = 4*epsilon*sigma6*sigma6
                     bcoef[m+numLjTypes*n] = 4*epsilon*sigma6
 
@@ -2423,8 +2429,8 @@ class LennardJonesGenerator(object):
 
         # Add the particles
 
-        for i in ljIndexList:
-            self.force.addParticle((i,))
+        for atom in data.atoms:
+            self.force.addParticle((typeToMergedType[data.atomType[atom]],))
         self.force.setUseLongRangeCorrection(True)
         self.force.setCutoffDistance(nonbondedCutoff)
         sys.addForce(self.force)

wrappers/python/tests/TestForceField.py

@@ -762,7 +762,7 @@ class TestForceField(unittest.TestCase):
   <Atom type="B" sigma="2" epsilon="0.2"/>
   <Atom type="C" sigma="3" epsilon="0.3"/>
   <Atom type="D" sigma="4" epsilon="0.4"/>
-  <Atom type="E" sigma="5" epsilon="0.5"/>
+  <Atom type="E" sigma="4" epsilon="0.4"/>
   <NBFixPair type1="A" type2="D" sigma="2.5" epsilon="1.1"/>
   <NBFixPair type1="A" type2="E" sigma="3.5" epsilon="1.5"/>
  </LennardJonesForce>
@@ -778,7 +778,7 @@ class TestForceField(unittest.TestCase):
         context.setPositions(positions)
         def ljEnergy(sigma, epsilon, r):
             return 4*epsilon*((sigma/r)**12-(sigma/r)**6)
-        expected = 0.3*ljEnergy(2.5, 1.1, 3)  + 0.3*ljEnergy(3.5, sqrt(0.1), 3) + ljEnergy(3.5, 1.5, 4)
+        expected = 0.3*ljEnergy(2.5, 1.1, 3) + 0.3*ljEnergy(3.0, sqrt(0.08), 3) + ljEnergy(3.5, 1.5, 4)
         self.assertAlmostEqual(expected, context.getState(getEnergy=True).getPotentialEnergy().value_in_unit(kilojoules_per_mole))
 
     def test_IgnoreExternalBonds(self):