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

Fixed error compiling kernel

parent 37a87d8a
...@@ -119,9 +119,9 @@ extern "C" __global__ void selectLangevinStepSize(int numAtoms, int paddedNumAto ...@@ -119,9 +119,9 @@ extern "C" __global__ void selectLangevinStepSize(int numAtoms, int paddedNumAto
// Recalculate the integration parameters. // Recalculate the integration parameters.
mixed vscale = EXP(-newStepSize*friction); mixed vscale = exp(-newStepSize*friction);
mixed fscale = (friction == 0 ? newStepSize : (1-vscale)/friction); mixed fscale = (friction == 0 ? newStepSize : (1-vscale)/friction);
mixed noisescale = SQRT(kT*(1-vscale*vscale)); mixed noisescale = sqrt(kT*(1-vscale*vscale));
params[VelScale] = vscale; params[VelScale] = vscale;
params[ForceScale] = fscale; params[ForceScale] = fscale;
params[NoiseScale] = noisescale; params[NoiseScale] = noisescale;
......
...@@ -110,9 +110,9 @@ __kernel void selectLangevinStepSize(mixed maxStepSize, mixed errorTol, mixed fr ...@@ -110,9 +110,9 @@ __kernel void selectLangevinStepSize(mixed maxStepSize, mixed errorTol, mixed fr
// Recalculate the integration parameters. // Recalculate the integration parameters.
mixed vscale = EXP(-newStepSize*friction); mixed vscale = exp(-newStepSize*friction);
mixed fscale = (friction == 0 ? newStepSize : (1-vscale)/friction); mixed fscale = (friction == 0 ? newStepSize : (1-vscale)/friction);
mixed noisescale = SQRT(kT*(1-vscale*vscale)); mixed noisescale = sqrt(kT*(1-vscale*vscale));
params[VelScale] = vscale; params[VelScale] = vscale;
params[ForceScale] = fscale; params[ForceScale] = fscale;
params[NoiseScale] = noisescale; params[NoiseScale] = noisescale;
......
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