From 2be078632da846d4e0893bcebe5ee4d03d4da490 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Mon, 2 May 2011 15:02:09 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6052 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- tools/restart2data.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/restart2data.cpp b/tools/restart2data.cpp index ba346a5087..70500c7d02 100644 --- a/tools/restart2data.cpp +++ b/tools/restart2data.cpp @@ -1860,7 +1860,8 @@ void pair(FILE *fp, Data &data, char *style, int flag) } } - } else if (strcmp(style,"lj/expand") == 0) { + } else if ((strcmp(style,"lj/expand") == 0) || + (strcmp(style,"lj/expand/gpu") == 0)) { double cut_global = read_double(fp); int offset_flag = read_int(fp); @@ -1981,6 +1982,7 @@ void pair(FILE *fp, Data &data, char *style, int flag) } else if (strcmp(style,"meam") == 0) { } else if ((strcmp(style,"morse") == 0) || + (strcmp(style,"morse/gpu") == 0) || (strcmp(style,"morse/opt") == 0)) { double cut_global = read_double(fp); @@ -2837,7 +2839,8 @@ void Data::write(FILE *fp, FILE *fp2) fprintf(fp,"%d %g %g\n",i, pair_lj_epsilon[i],pair_lj_sigma[i]); - } else if (strcmp(pair_style,"lj/expand") == 0) { + } else if ((strcmp(pair_style,"lj/expand") == 0) || + (strcmp(pair_style,"lj/expand/gpu")==0)) { for (int i = 1; i <= ntypes; i++) fprintf(fp,"%d %g %g %g\n",i, pair_ljexpand_epsilon[i],pair_ljexpand_sigma[i], @@ -2855,6 +2858,7 @@ void Data::write(FILE *fp, FILE *fp2) pair_ljsmooth_epsilon[i],pair_ljsmooth_sigma[i]); } else if ((strcmp(pair_style,"morse") == 0) || + (strcmp(pair_style,"morse/gpu") == 0) || (strcmp(pair_style,"morse/opt") == 0)) { for (int i = 1; i <= ntypes; i++) fprintf(fp,"%d %g %g %g\n",i,