From f455fcb9b05b79976185a558b02e77ae852086e4 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Mon, 6 Oct 2014 22:14:02 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12586
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/USER-CUDA/atom_vec_angle_cuda.cpp                      | 2 +-
 src/USER-CUDA/atom_vec_full_cuda.cpp                       | 2 +-
 src/USER-CUDA/fix_freeze_cuda.cpp                          | 2 +-
 src/USER-CUDA/pair_born_coul_long_cuda.cpp                 | 2 +-
 src/USER-CUDA/pair_buck_coul_long_cuda.cpp                 | 2 +-
 src/USER-CUDA/pair_eam_cuda.cpp                            | 2 +-
 src/USER-CUDA/pair_gran_hooke_cuda.cpp                     | 2 +-
 src/USER-CUDA/pair_lj_charmm_coul_charmm_cuda.cpp          | 2 +-
 src/USER-CUDA/pair_lj_charmm_coul_charmm_implicit_cuda.cpp | 2 +-
 src/USER-CUDA/pair_lj_charmm_coul_long_cuda.cpp            | 2 +-
 src/USER-CUDA/pair_lj_class2_coul_cut_cuda.cpp             | 2 +-
 src/USER-CUDA/pair_lj_class2_coul_long_cuda.cpp            | 2 +-
 src/USER-CUDA/pair_lj_class2_cuda.cpp                      | 2 +-
 src/USER-CUDA/pair_lj_cut_coul_long_cuda.cpp               | 2 +-
 src/USER-CUDA/pair_lj_sdk_coul_long_cuda.cpp               | 2 +-
 src/USER-CUDA/pair_lj_sdk_cuda.cpp                         | 2 +-
 src/USER-CUDA/pair_sw_cuda.cpp                             | 2 +-
 src/USER-CUDA/pair_tersoff_cuda.cpp                        | 2 +-
 src/USER-CUDA/pppm_cuda.cpp                                | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/USER-CUDA/atom_vec_angle_cuda.cpp b/src/USER-CUDA/atom_vec_angle_cuda.cpp
index 2acc5d913e..be9dad78fd 100644
--- a/src/USER-CUDA/atom_vec_angle_cuda.cpp
+++ b/src/USER-CUDA/atom_vec_angle_cuda.cpp
@@ -46,7 +46,7 @@
 #include "fix.h"
 #include "memory.h"
 #include "error.h"
-#include "cuda.h"
+#include "user_cuda.h"
 #include "universe.h"
 #include "comm.h"
 
diff --git a/src/USER-CUDA/atom_vec_full_cuda.cpp b/src/USER-CUDA/atom_vec_full_cuda.cpp
index a69c68c987..cf4ad117db 100644
--- a/src/USER-CUDA/atom_vec_full_cuda.cpp
+++ b/src/USER-CUDA/atom_vec_full_cuda.cpp
@@ -46,7 +46,7 @@
 #include "fix.h"
 #include "memory.h"
 #include "error.h"
-#include "cuda.h"
+#include "user_cuda.h"
 #include "universe.h"
 #include "comm.h"
 
diff --git a/src/USER-CUDA/fix_freeze_cuda.cpp b/src/USER-CUDA/fix_freeze_cuda.cpp
index c9f9b4366d..d577ab25a1 100644
--- a/src/USER-CUDA/fix_freeze_cuda.cpp
+++ b/src/USER-CUDA/fix_freeze_cuda.cpp
@@ -28,7 +28,7 @@
 #include "update.h"
 #include "respa.h"
 #include "error.h"
-#include "cuda.h"
+#include "user_cuda.h"
 #include "memory.h"
 #include "modify.h"
 #include "cuda_modify_flags.h"
diff --git a/src/USER-CUDA/pair_born_coul_long_cuda.cpp b/src/USER-CUDA/pair_born_coul_long_cuda.cpp
index c5e65da3e2..7a4a264f0f 100644
--- a/src/USER-CUDA/pair_born_coul_long_cuda.cpp
+++ b/src/USER-CUDA/pair_born_coul_long_cuda.cpp
@@ -42,7 +42,7 @@
 #include "respa.h"
 #include "memory.h"
 #include "error.h"
-#include "cuda.h"
+#include "user_cuda.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-CUDA/pair_buck_coul_long_cuda.cpp b/src/USER-CUDA/pair_buck_coul_long_cuda.cpp
index 07948e5ee3..e27740bee1 100644
--- a/src/USER-CUDA/pair_buck_coul_long_cuda.cpp
+++ b/src/USER-CUDA/pair_buck_coul_long_cuda.cpp
@@ -42,7 +42,7 @@
 #include "respa.h"
 #include "memory.h"
 #include "error.h"
-#include "cuda.h"
+#include "user_cuda.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-CUDA/pair_eam_cuda.cpp b/src/USER-CUDA/pair_eam_cuda.cpp
index 7a3a9f0ce6..bcba0b55bf 100644
--- a/src/USER-CUDA/pair_eam_cuda.cpp
+++ b/src/USER-CUDA/pair_eam_cuda.cpp
@@ -58,7 +58,7 @@
 #include "respa.h"
 #include "memory.h"
 #include "error.h"
-#include "cuda.h"
+#include "user_cuda.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-CUDA/pair_gran_hooke_cuda.cpp b/src/USER-CUDA/pair_gran_hooke_cuda.cpp
index 4b31d0d869..a4e144ce51 100644
--- a/src/USER-CUDA/pair_gran_hooke_cuda.cpp
+++ b/src/USER-CUDA/pair_gran_hooke_cuda.cpp
@@ -59,7 +59,7 @@
 #include "respa.h"
 #include "memory.h"
 #include "error.h"
-#include "cuda.h"
+#include "user_cuda.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-CUDA/pair_lj_charmm_coul_charmm_cuda.cpp b/src/USER-CUDA/pair_lj_charmm_coul_charmm_cuda.cpp
index ccc7a5897a..f22cc21839 100644
--- a/src/USER-CUDA/pair_lj_charmm_coul_charmm_cuda.cpp
+++ b/src/USER-CUDA/pair_lj_charmm_coul_charmm_cuda.cpp
@@ -42,7 +42,7 @@
 #include "respa.h"
 #include "memory.h"
 #include "error.h"
-#include "cuda.h"
+#include "user_cuda.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-CUDA/pair_lj_charmm_coul_charmm_implicit_cuda.cpp b/src/USER-CUDA/pair_lj_charmm_coul_charmm_implicit_cuda.cpp
index 9c4e1634eb..3377717a1e 100644
--- a/src/USER-CUDA/pair_lj_charmm_coul_charmm_implicit_cuda.cpp
+++ b/src/USER-CUDA/pair_lj_charmm_coul_charmm_implicit_cuda.cpp
@@ -42,7 +42,7 @@
 #include "respa.h"
 #include "memory.h"
 #include "error.h"
-#include "cuda.h"
+#include "user_cuda.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-CUDA/pair_lj_charmm_coul_long_cuda.cpp b/src/USER-CUDA/pair_lj_charmm_coul_long_cuda.cpp
index 8da8fdb677..8344d076b5 100644
--- a/src/USER-CUDA/pair_lj_charmm_coul_long_cuda.cpp
+++ b/src/USER-CUDA/pair_lj_charmm_coul_long_cuda.cpp
@@ -42,7 +42,7 @@
 #include "respa.h"
 #include "memory.h"
 #include "error.h"
-#include "cuda.h"
+#include "user_cuda.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-CUDA/pair_lj_class2_coul_cut_cuda.cpp b/src/USER-CUDA/pair_lj_class2_coul_cut_cuda.cpp
index 5c0aa6d32a..8cbc03bafe 100644
--- a/src/USER-CUDA/pair_lj_class2_coul_cut_cuda.cpp
+++ b/src/USER-CUDA/pair_lj_class2_coul_cut_cuda.cpp
@@ -42,7 +42,7 @@
 #include "respa.h"
 #include "memory.h"
 #include "error.h"
-#include "cuda.h"
+#include "user_cuda.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-CUDA/pair_lj_class2_coul_long_cuda.cpp b/src/USER-CUDA/pair_lj_class2_coul_long_cuda.cpp
index 5de5787e08..daa1326408 100644
--- a/src/USER-CUDA/pair_lj_class2_coul_long_cuda.cpp
+++ b/src/USER-CUDA/pair_lj_class2_coul_long_cuda.cpp
@@ -42,7 +42,7 @@
 #include "respa.h"
 #include "memory.h"
 #include "error.h"
-#include "cuda.h"
+#include "user_cuda.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-CUDA/pair_lj_class2_cuda.cpp b/src/USER-CUDA/pair_lj_class2_cuda.cpp
index df0ba7a0de..8275e2e4b3 100644
--- a/src/USER-CUDA/pair_lj_class2_cuda.cpp
+++ b/src/USER-CUDA/pair_lj_class2_cuda.cpp
@@ -57,7 +57,7 @@
 #include "respa.h"
 #include "memory.h"
 #include "error.h"
-#include "cuda.h"
+#include "user_cuda.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-CUDA/pair_lj_cut_coul_long_cuda.cpp b/src/USER-CUDA/pair_lj_cut_coul_long_cuda.cpp
index 37825a66b9..a240c40eea 100644
--- a/src/USER-CUDA/pair_lj_cut_coul_long_cuda.cpp
+++ b/src/USER-CUDA/pair_lj_cut_coul_long_cuda.cpp
@@ -42,7 +42,7 @@
 #include "respa.h"
 #include "memory.h"
 #include "error.h"
-#include "cuda.h"
+#include "user_cuda.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-CUDA/pair_lj_sdk_coul_long_cuda.cpp b/src/USER-CUDA/pair_lj_sdk_coul_long_cuda.cpp
index 89134d7e37..ab365e7524 100644
--- a/src/USER-CUDA/pair_lj_sdk_coul_long_cuda.cpp
+++ b/src/USER-CUDA/pair_lj_sdk_coul_long_cuda.cpp
@@ -58,7 +58,7 @@
 #include "respa.h"
 #include "memory.h"
 #include "error.h"
-#include "cuda.h"
+#include "user_cuda.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-CUDA/pair_lj_sdk_cuda.cpp b/src/USER-CUDA/pair_lj_sdk_cuda.cpp
index 64a7a48311..89edf82a3c 100644
--- a/src/USER-CUDA/pair_lj_sdk_cuda.cpp
+++ b/src/USER-CUDA/pair_lj_sdk_cuda.cpp
@@ -57,7 +57,7 @@
 #include "respa.h"
 #include "memory.h"
 #include "error.h"
-#include "cuda.h"
+#include "user_cuda.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-CUDA/pair_sw_cuda.cpp b/src/USER-CUDA/pair_sw_cuda.cpp
index 89d1d744c9..2ff32af01e 100644
--- a/src/USER-CUDA/pair_sw_cuda.cpp
+++ b/src/USER-CUDA/pair_sw_cuda.cpp
@@ -56,7 +56,7 @@
 #include "respa.h"
 #include "memory.h"
 #include "error.h"
-#include "cuda.h"
+#include "user_cuda.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-CUDA/pair_tersoff_cuda.cpp b/src/USER-CUDA/pair_tersoff_cuda.cpp
index 9ce69ae3a6..8951decbb7 100644
--- a/src/USER-CUDA/pair_tersoff_cuda.cpp
+++ b/src/USER-CUDA/pair_tersoff_cuda.cpp
@@ -56,7 +56,7 @@
 #include "respa.h"
 #include "memory.h"
 #include "error.h"
-#include "cuda.h"
+#include "user_cuda.h"
 
 using namespace LAMMPS_NS;
 
diff --git a/src/USER-CUDA/pppm_cuda.cpp b/src/USER-CUDA/pppm_cuda.cpp
index 61b6cb7192..9c64d0a4cc 100644
--- a/src/USER-CUDA/pppm_cuda.cpp
+++ b/src/USER-CUDA/pppm_cuda.cpp
@@ -60,7 +60,7 @@
 #include <ctime> //crmadd
 #include "cuda_wrapper_cu.h"
 #include "pppm_cuda_cu.h"
-#include "cuda.h"
+#include "user_cuda.h"
 #include "math_const.h"
 
 using namespace LAMMPS_NS;