From 17e6ef5f970bed7d17665a68d96a29dadde246ea Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Tue, 23 Nov 2010 15:37:39 -0500 Subject: [PATCH] add a missing gayberne/omp entry --- tools/restart2data.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/restart2data.cpp b/tools/restart2data.cpp index 883de47427..0fe5e96449 100644 --- a/tools/restart2data.cpp +++ b/tools/restart2data.cpp @@ -421,7 +421,7 @@ int main (int argc, char **argv) void header(FILE *fp, Data &data) { - char *version = "19 Nov 2010-ICMS"; + char *version = "23 Nov 2010-ICMS"; data.triclinic = 0; @@ -1835,7 +1835,7 @@ void pair(FILE *fp, Data &data, char *style, int flag) (strcmp(style,"lj/cut/coul/long/omp") == 0) || (strcmp(style,"lj/cut/coul/long/tip4p/omp") == 0)) { - if ((strcmp(style,"lj/cut") == 0) || + if ((strcmp(style,"lj/cut") == 0) || (strcmp(style,"lj/cut/gpu") == 0) || (strcmp(style,"lj/cut/omp") == 0) || (strcmp(style,"lj/cut/opt") == 0)) { @@ -2898,7 +2898,8 @@ void Data::write(FILE *fp, FILE *fp2) pair_dpd_a0[i],pair_dpd_gamma[i]); } else if ((strcmp(pair_style,"gayberne") == 0) || - (strcmp(pair_style,"gayberne/gpu") == 0)) { + (strcmp(pair_style,"gayberne/gpu") == 0) || + (strcmp(pair_style,"gayberne/omp") == 0)) { for (int i = 1; i <= ntypes; i++) fprintf(fp,"%d %g %g %g %g %g %g %g %g\n",i, pair_gb_epsilon[i],pair_gb_sigma[i],