Merge remote-tracking branch 'upstream/master' into forcefield

4d007499 · jchodera · f1ec09fe · 6b3a8337 · 4d007499
Commit 4d007499 authored Jan 19, 2016 by jchodera
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

platforms/cuda/src/CudaKernels.cpp platforms/cuda/src/CudaKernels.cpp +0 -2

No files found.
--- a/platforms/cuda/src/CudaKernels.cpp
+++ b/platforms/cuda/src/CudaKernels.cpp
@@ -1710,8 +1710,6 @@ void CudaCalcNonbondedForceKernel::initialize(const System& system, const Nonbon
                    result = cufftPlan3d(&fftBackward, gridSizeX, gridSizeY, gridSizeZ, cu.getUseDoublePrecision() ? CUFFT_Z2D : CUFFT_C2R);
                    if (result != CUFFT_SUCCESS)
                        throw OpenMMException("Error initializing FFT: "+cu.intToString(result));
-                    cufftSetCompatibilityMode(fftForward, CUFFT_COMPATIBILITY_NATIVE);
-                    cufftSetCompatibilityMode(fftBackward, CUFFT_COMPATIBILITY_NATIVE);
                }
                else
                    fft = new CudaFFT3D(cu, gridSizeX, gridSizeY, gridSizeZ, true);