Commit d4d5e5c8 authored by Peter Eastman's avatar Peter Eastman
Browse files

Bug fix

parent ebbc40e3
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * * along with this program. If not, see <http://www.gnu.org/licenses/>. *
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
#include "OpenMM/System.h" #include "openmm/System.h"
#include "OpenCLContext.h" #include "OpenCLContext.h"
namespace OpenMM { namespace OpenMM {
......
...@@ -949,7 +949,7 @@ void OpenCLIntegrateLangevinStepKernel::execute(ContextImpl& context, const Lang ...@@ -949,7 +949,7 @@ void OpenCLIntegrateLangevinStepKernel::execute(ContextImpl& context, const Lang
kernel1.setArg<cl::Buffer>(7, xVector->getDeviceBuffer()); kernel1.setArg<cl::Buffer>(7, xVector->getDeviceBuffer());
kernel1.setArg<cl::Buffer>(8, vVector->getDeviceBuffer()); kernel1.setArg<cl::Buffer>(8, vVector->getDeviceBuffer());
kernel1.setArg<cl::Buffer>(9,integration.getRandom().getDeviceBuffer()); kernel1.setArg<cl::Buffer>(9,integration.getRandom().getDeviceBuffer());
kernel1.setArg<cl_uint>(10, integration.prepareRandomNumbers(2*numAtoms)); kernel1.setArg<cl_uint>(10, integration.prepareRandomNumbers(2*cl.getPaddedNumAtoms()));
cl.executeKernel(kernel1, numAtoms); cl.executeKernel(kernel1, numAtoms);
// Apply constraints. // Apply constraints.
...@@ -966,7 +966,7 @@ void OpenCLIntegrateLangevinStepKernel::execute(ContextImpl& context, const Lang ...@@ -966,7 +966,7 @@ void OpenCLIntegrateLangevinStepKernel::execute(ContextImpl& context, const Lang
kernel2.setArg<cl::Buffer>(5, xVector->getDeviceBuffer()); kernel2.setArg<cl::Buffer>(5, xVector->getDeviceBuffer());
kernel2.setArg<cl::Buffer>(6, vVector->getDeviceBuffer()); kernel2.setArg<cl::Buffer>(6, vVector->getDeviceBuffer());
kernel2.setArg<cl::Buffer>(7,integration.getRandom().getDeviceBuffer()); kernel2.setArg<cl::Buffer>(7,integration.getRandom().getDeviceBuffer());
kernel2.setArg<cl_uint>(8, integration.prepareRandomNumbers(2*numAtoms)); kernel2.setArg<cl_uint>(8, integration.prepareRandomNumbers(2*cl.getPaddedNumAtoms()));
cl.executeKernel(kernel2, numAtoms); cl.executeKernel(kernel2, numAtoms);
// Reapply constraints. // Reapply constraints.
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include "../src/OpenCLArray.h" #include "../src/OpenCLArray.h"
#include "../src/OpenCLContext.h" #include "../src/OpenCLContext.h"
#include "../src/OpenCLIntegrationUtilities.h" #include "../src/OpenCLIntegrationUtilities.h"
#include "OpenMM/System.h" #include "openmm/System.h"
#include <iostream> #include <iostream>
using namespace OpenMM; using namespace OpenMM;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment