From ffcbbe98d460fa9e8d09319462bcb52ab72a7149 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Tue, 28 Aug 2012 22:59:06 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8731
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/USER-CUDA/pppm_cuda.cpp | 43 +++++--------------------------------
 src/USER-CUDA/pppm_cuda.h   |  3 ++-
 2 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/src/USER-CUDA/pppm_cuda.cpp b/src/USER-CUDA/pppm_cuda.cpp
index 9d5236ab39..ec79dadf34 100644
--- a/src/USER-CUDA/pppm_cuda.cpp
+++ b/src/USER-CUDA/pppm_cuda.cpp
@@ -1382,52 +1382,19 @@ void PPPMCuda::fieldforce()
   return;
 }
 
-
-
-
 /* ----------------------------------------------------------------------
    perform and time the 4 FFTs required for N timesteps
 ------------------------------------------------------------------------- */
 
-int PPPMCuda::timing(int n, double &time3d, double &time1d)
+int PPPMCuda::timing_1d(int n, double &time1d)
 {
-
-  time3d = cuda->shared_data.cuda_timings.pppm_poisson/update->nsteps*n;
   time1d = cuda->shared_data.cuda_timings.pppm_poisson/update->nsteps/4*n;
   return 4;
+}
 
-  double time1,time2;
-
-  for (int i = 0; i < 2*nfft_both; i++) work1[i] = 0.0;
-
-  MPI_Barrier(world);
-  time1 = MPI_Wtime();
-
-  for (int i = 0; i < n; i++) {
-    fft1c->compute(work1,work1,1);
-    fft2c->compute(work1,work1,-1);
-    fft2c->compute(work1,work1,-1);
-    fft2c->compute(work1,work1,-1);
-  }
-
-  MPI_Barrier(world);
-  time2 = MPI_Wtime();
-  time3d = time2 - time1;
-  time1d = 0;
-  MPI_Barrier(world);
-  /*time1 = MPI_Wtime();
-
-  for (int i = 0; i < n; i++) {
-    fft1c->timing1d(work1,nfft_both,1);
-    fft2c->timing1d(work1,nfft_both,-1);
-    fft2c->timing1d(work1,nfft_both,-1);
-    fft2c->timing1d(work1,nfft_both,-1);
-  }
-
-  MPI_Barrier(world);
-  time2 = MPI_Wtime();
-  time1d = time2 - time1;*/
-
+int PPPMCuda::timing_3d(int n, double &time3d)
+{
+  time3d = cuda->shared_data.cuda_timings.pppm_poisson/update->nsteps*n;
   return 4;
 }
 
diff --git a/src/USER-CUDA/pppm_cuda.h b/src/USER-CUDA/pppm_cuda.h
index 89d809c425..e04d662ed0 100644
--- a/src/USER-CUDA/pppm_cuda.h
+++ b/src/USER-CUDA/pppm_cuda.h
@@ -43,7 +43,8 @@ class PPPMCuda : public PPPMOld {
   void init();
   void setup();
   void compute(int, int);
-  int timing(int, double &, double &);
+  int timing_1d(int, double &);
+  int timing_3d(int, double &);
 
   double poissontime;