From 64ec9a8cd080a6e50d4fa37e14d8d2d809a856f2 Mon Sep 17 00:00:00 2001
From: Nguyen <nuy@nuymbpro.ornl.gov>
Date: Wed, 16 Nov 2011 09:45:42 -0500
Subject: [PATCH] Replace __float2int_rn with __float2int_rd so that it gives
 the same answer as static_cast<int>

---
 lib/gpu/lal_eam.cu | 4 ++--
 test/eam.gpu.in    | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/gpu/lal_eam.cu b/lib/gpu/lal_eam.cu
index 1f89d30f5b..74539cc326 100644
--- a/lib/gpu/lal_eam.cu
+++ b/lib/gpu/lal_eam.cu
@@ -77,7 +77,7 @@ __kernel void kernel_pair(__global numtyp4 *x_, __global numtyp *fp_,
       if (rsq<cutforcesq) {
         numtyp r = ucl_sqrt(rsq);
         numtyp p = r*rdr + (numtyp)1.0;
-        int m=__float2int_rn(p);
+        int m=__float2int_rd(p);
         m = MIN(m,nr-1);
         p -= m;
         p = MIN(p,(numtyp)1.0);
@@ -192,7 +192,7 @@ __kernel void kernel_pair_fast(__global numtyp4 *x_, __global numtyp *fp_,
       if (rsq<cutforcesq) {
         numtyp r = ucl_sqrt(rsq);
         numtyp p = r*rdr + (numtyp)1.0;
-        int m=__float2int_rn(p);
+        int m=__float2int_rd(p);
         m = MIN(m,nr-1);
         p -= m;
         p = MIN(p,(numtyp)1.0);
diff --git a/test/eam.gpu.in b/test/eam.gpu.in
index 42973f6894..771ab452d2 100644
--- a/test/eam.gpu.in
+++ b/test/eam.gpu.in
@@ -2,11 +2,7 @@
 
 newton off
 
-<<<<<<< HEAD
 package gpu force 0 0 1
-=======
-package gpu force 0 0 1.0
->>>>>>> ea346772202c63b86b63ef58a94b89365e209909
 
 units           metal
 boundary        p p p