Merge pull request #1444 from peastman/tabulated

Fixed an error in the earlier fix for tabulated functions with interaction groups

platforms/cuda/src/CudaKernels.cpp

@@ -2434,10 +2434,10 @@ void CudaCalcCustomNonbondedForceKernel::initInteractionGroups(const CustomNonbo
     stringstream args;
     for (int i = 0; i < (int) buffers.size(); i++)
         args<<", const "<<buffers[i].getType()<<"* __restrict__ global_params"<<(i+1);
-    if (globals != NULL)
-        args<<", const float* __restrict__ globals";
     for (int i = 0; i < (int) tabulatedFunctions.size(); i++)
         args << ", const " << tableTypes[i]<< "* __restrict__ table" << i;
+    if (globals != NULL)
+        args<<", const float* __restrict__ globals";
     replacements["PARAMETER_ARGUMENTS"] = args.str();
     stringstream load1;
     for (int i = 0; i < (int) buffers.size(); i++)

platforms/opencl/src/OpenCLKernels.cpp

@@ -2507,10 +2507,10 @@ void OpenCLCalcCustomNonbondedForceKernel::initInteractionGroups(const CustomNon
     stringstream args;
     for (int i = 0; i < (int) buffers.size(); i++)
         args<<", __global const "<<buffers[i].getType()<<"* restrict global_params"<<(i+1);
-    if (globals != NULL)
-        args<<", __global const float* restrict globals";
     for (int i = 0; i < (int) tabulatedFunctions.size(); i++)
         args << ", __global const " << tableTypes[i]<< "* restrict table" << i;
+    if (globals != NULL)
+        args<<", __global const float* restrict globals";
     replacements["PARAMETER_ARGUMENTS"] = args.str();
     stringstream load1;
     for (int i = 0; i < (int) buffers.size(); i++)