Merge pull request #999 from rmcgibbo/icc

Small fixes to support Intel compilers

platforms/cuda/tests/TestCudaVirtualSites.cpp

@@ -80,8 +80,8 @@ void testMasslessParticle() {
     for (int i = 0; i < 1000; ++i) {
         State state = context.getState(State::Positions | State::Velocities | State::Forces);
         double time = state.getTime();
-        ASSERT_EQUAL_VEC(Vec3(), state.getPositions()[0], 0.0);
-        ASSERT_EQUAL_VEC(Vec3(), state.getVelocities()[0], 0.0);
+        ASSERT_EQUAL_VEC(Vec3(0,0,0), state.getPositions()[0], 0.0);
+        ASSERT_EQUAL_VEC(Vec3(0,0,0), state.getVelocities()[0], 0.0);
         ASSERT_EQUAL_VEC(Vec3(cos(time), sin(time), 0), state.getPositions()[1], 0.01);
         ASSERT_EQUAL_VEC(Vec3(-sin(time), cos(time), 0), state.getVelocities()[1], 0.01);
         integrator.step(1);

platforms/opencl/src/cl.hpp

@@ -143,6 +143,7 @@
  */
 #ifndef CL_HPP_
 #define CL_HPP_
+#define CL_USE_DEPRECATED_OPENCL_2_0_APIS
 
 #ifdef _WIN32
 

platforms/opencl/tests/TestOpenCLVirtualSites.cpp

@@ -80,8 +80,8 @@ void testMasslessParticle() {
     for (int i = 0; i < 1000; ++i) {
         State state = context.getState(State::Positions | State::Velocities | State::Forces);
         double time = state.getTime();
-        ASSERT_EQUAL_VEC(Vec3(), state.getPositions()[0], 0.0);
-        ASSERT_EQUAL_VEC(Vec3(), state.getVelocities()[0], 0.0);
+        ASSERT_EQUAL_VEC(Vec3(0, 0, 0), state.getPositions()[0], 0.0);
+        ASSERT_EQUAL_VEC(Vec3(0, 0, 0), state.getVelocities()[0], 0.0);
         ASSERT_EQUAL_VEC(Vec3(cos(time), sin(time), 0), state.getPositions()[1], 0.01);
         ASSERT_EQUAL_VEC(Vec3(-sin(time), cos(time), 0), state.getVelocities()[1], 0.01);
         integrator.step(1);

plugins/cpupme/src/CpuPmeKernels.cpp

@@ -39,6 +39,7 @@
 #include <cmath>
 #include <cstring>
 #include <sstream>
+#include <cstdlib>
 
 using namespace OpenMM;
 using namespace std;

plugins/rpmd/platforms/cuda/tests/TestCudaRpmd.cpp

@@ -271,7 +271,7 @@ void testCMMotionRemoval() {
             pos += calcCM(state.getPositions(), system);
         }
         pos *= 1.0/numCopies;
-        ASSERT_EQUAL_VEC(Vec3(), pos, 0.5);
+        ASSERT_EQUAL_VEC(Vec3(0,0,0), pos, 0.5);
     }
 }
 

plugins/rpmd/platforms/opencl/tests/TestOpenCLRpmd.cpp

@@ -272,7 +272,7 @@ void testCMMotionRemoval() {
             pos += calcCM(state.getPositions(), system);
         }
         pos *= 1.0/numCopies;
-        ASSERT_EQUAL_VEC(Vec3(), pos, 0.5);
+        ASSERT_EQUAL_VEC(Vec3(0,0,0), pos, 0.5);
     }
 }
 

plugins/rpmd/platforms/reference/tests/TestReferenceRpmd.cpp

@@ -155,7 +155,7 @@ void testCMMotionRemoval() {
             pos += calcCM(state.getPositions(), system);
         }
         pos *= 1.0/numCopies;
-        ASSERT_EQUAL_VEC(Vec3(), pos, 0.5);
+        ASSERT_EQUAL_VEC(Vec3(0,0,0), pos, 0.5);
     }
 }