From 5f4a69b0b01be70465028c1f6474e7bfac63a253 Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Mon, 2 May 2011 15:05:13 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6056
 f3b2605a-c512-4ea7-a41b-209d697bcdaa

---
 src/pair_hybrid.cpp  | 4 ----
 src/pair_lj_expand.h | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pair_hybrid.cpp b/src/pair_hybrid.cpp
index 786eb674fd..a3d0dafd32 100644
--- a/src/pair_hybrid.cpp
+++ b/src/pair_hybrid.cpp
@@ -199,7 +199,6 @@ void PairHybrid::settings(int narg, char **arg)
   // exception is 1st arg of style "table", which is non-numeric word
   // exception is 1st two args of style "lj/coul", which are non-numeric
   // exception is 1st two args of style "buck/coul", which are non-numeric
-  // exception is 1st arg of any "gpu" style, which is non-numeric
   // exception is 1st arg of reax/c style, which is non-numeric
   // need a better way to skip these exceptions
 
@@ -209,7 +208,6 @@ void PairHybrid::settings(int narg, char **arg)
     if (strcmp(arg[i],"table") == 0) i++;
     if (strcmp(arg[i],"lj/coul") == 0) i += 2;
     if (strcmp(arg[i],"buck/coul") == 0) i += 2;
-    if (strstr(arg[i],"gpu")) i++;
     if (strcmp(arg[i],"reax/c") == 0) i++;
     i++;
     while (i < narg && !isalpha(arg[i][0])) i++;
@@ -226,7 +224,6 @@ void PairHybrid::settings(int narg, char **arg)
   // exception is 1st arg of style "table", which is non-numeric
   // exception is 1st two args of style "lj/coul", which are non-numeric
   // exception is 1st two args of style "buck/coul", which are non-numeric
-  // exception is 1st arg of any "gpu" style, which is non-numeric
   // exception is 1st arg of reax/c style, which is non-numeric
   // need a better way to skip these exceptions
 
@@ -247,7 +244,6 @@ void PairHybrid::settings(int narg, char **arg)
     if (strcmp(arg[i],"table") == 0) i++;
     if (strcmp(arg[i],"lj/coul") == 0) i += 2;
     if (strcmp(arg[i],"buck/coul") == 0) i += 2;
-    if (strstr(arg[i],"gpu")) i++;
     if (strcmp(arg[i],"reax/c") == 0) i++;
     i++;
     while (i < narg && !isalpha(arg[i][0])) i++;
diff --git a/src/pair_lj_expand.h b/src/pair_lj_expand.h
index fa6b136c67..1d1b10c315 100644
--- a/src/pair_lj_expand.h
+++ b/src/pair_lj_expand.h
@@ -38,7 +38,7 @@ class PairLJExpand : public Pair {
   void read_restart_settings(FILE *);
   double single(int, int, int, int, double, double, double, double &);
 
- private:
+ protected:
   double cut_global;
   double **cut;
   double **epsilon,**sigma,**shift;