From 93181e05b01da17f969b1b96299a79b9a1e3f9b6 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Mon, 6 Aug 2012 21:10:08 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8531
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/GPU/pppm_gpu.cpp | 13 +++++++------
 src/GPU/pppm_gpu.h   |  4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/GPU/pppm_gpu.cpp b/src/GPU/pppm_gpu.cpp
index 5cdbb75e84..569b0d8c00 100644
--- a/src/GPU/pppm_gpu.cpp
+++ b/src/GPU/pppm_gpu.cpp
@@ -85,7 +85,7 @@ void PPPM_GPU_API(forces)(double **f);
 
 /* ---------------------------------------------------------------------- */
 
-PPPMGPU::PPPMGPU(LAMMPS *lmp, int narg, char **arg) : PPPM(lmp, narg, arg)
+PPPMGPU::PPPMGPU(LAMMPS *lmp, int narg, char **arg) : PPPMOld(lmp, narg, arg)
 {
   if (narg != 1) error->all(FLERR,"Illegal kspace_style pppm/gpu command");
 
@@ -111,7 +111,7 @@ PPPMGPU::~PPPMGPU()
 
 void PPPMGPU::init()
 {
-  PPPM::init();
+  PPPMOld::init();
 
   if (strcmp(update->integrate_style,"verlet/split") == 0)
     kspace_split=true;
@@ -923,13 +923,14 @@ double PPPMGPU::memory_usage()
    perform and time the 4 FFTs required for N timesteps
 ------------------------------------------------------------------------- */
 
-void PPPMGPU::timing(int n, double &time3d, double &time1d) {
+int PPPMGPU::timing(int n, double &time3d, double &time1d) {
   if (im_real_space) {
     time3d = 0.0;
     time1d = 0.0;
-    return;
+    return 4;
   }
-  PPPM::timing(n,time3d,time1d);
+  PPPMOld::timing(n,time3d,time1d);
+  return 4;
 }
 
 /* ----------------------------------------------------------------------
@@ -939,5 +940,5 @@ void PPPMGPU::timing(int n, double &time3d, double &time1d) {
 void PPPMGPU::setup()
 {
   if (im_real_space) return;
-  PPPM::setup();
+  PPPMOld::setup();
 }
diff --git a/src/GPU/pppm_gpu.h b/src/GPU/pppm_gpu.h
index 9614fd640c..8ecc8eb706 100644
--- a/src/GPU/pppm_gpu.h
+++ b/src/GPU/pppm_gpu.h
@@ -20,11 +20,11 @@ KSpaceStyle(pppm/gpu,PPPMGPU)
 #ifndef LMP_PPPM_GPU_H
 #define LMP_PPPM_GPU_H
 
-#include "pppm.h"
+#include "pppm_old.h"
 
 namespace LAMMPS_NS {
 
-class PPPMGPU : public PPPM {
+class PPPMGPU : public PPPMOld {
  public:
   PPPMGPU(class LAMMPS *, int, char **);
   virtual ~PPPMGPU();