ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6209 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2011-05-23 14:04:44 +00:00
parent 69786dc452
commit e97e40698a
12 changed files with 122 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/update.cpp
View File

@ -216,15 +216,20 @@ void Update::create_integrate(int narg, char **arg, char *suffix)
}
}
/* ---------------------------------------------------------------------- */
/* ----------------------------------------------------------------------
create the Integrate style, first with suffix appended
------------------------------------------------------------------------- */
void Update::new_integrate(char *style, int narg, char **arg,
char *suffix, int &sflag)
{
int success = 0;
if (suffix && lmp->offaccel == 0) {
sflag = 1;
char estyle[256];
sprintf(estyle,"%s/%s",style,suffix);
success = 1;
if (0) return;
@ -235,20 +240,23 @@ void Update::new_integrate(char *style, int narg, char **arg,
#undef IntegrateStyle
#undef INTEGRATE_CLASS
else success = 0;
}
sflag = 0;
if (0) return;
if (!success) {
if (0) return;
#define INTEGRATE_CLASS
#define IntegrateStyle(key,Class) \
else if (strcmp(style,#key) == 0) integrate = new Class(lmp,narg,arg);
else if (strcmp(style,#key) == 0) integrate = new Class(lmp,narg,arg);
#include "style_integrate.h"
#undef IntegrateStyle
#undef INTEGRATE_CLASS
else error->all("Illegal integrate style");
else error->all("Illegal integrate style");
}
}
/* ---------------------------------------------------------------------- */