jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
sjplimp 2011-05-20 16:16:34 +00:00
parent 9879ce34aa
commit f99f923320
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/update.cpp
View File

@ -202,22 +202,46 @@ void Update::set_units(const char *style)
/* ---------------------------------------------------------------------- */
void Update::create_integrate(int narg, char **arg)
void Update::create_integrate(int narg, char **arg, char *suffix)
{
if (narg < 1) error->all("Illegal run_style command");
delete [] integrate_style;
delete integrate;
if (0) return; // dummy line to enable else-if macro expansion
// create the Integrate, first with suffix appended
int success = 0;
if (suffix) {
char estyle[256];
sprintf(estyle,"%s/%s",arg[0],suffix);
success = 1;
if (0) return;
#define INTEGRATE_CLASS
#define IntegrateStyle(key,Class) \
else if (strcmp(arg[0],#key) == 0) integrate = new Class(lmp,narg-1,&arg[1]);
else if (strcmp(estyle,#key) == 0) \
integrate = new Class(lmp,narg-1,&arg[1]);
#include "style_integrate.h"
#undef INTEGRATE_CLASS
else error->all("Illegal run_style command");
else success = 0;
}
if (!success) {
if (0) return;
#define INTEGRATE_CLASS
#define IntegrateStyle(key,Class) \
else if (strcmp(arg[0],#key) == 0) \
integrate = new Class(lmp,narg-1,&arg[1]);
#include "style_integrate.h"
#undef INTEGRATE_CLASS
else error->all("Illegal run_style command");
}
int n = strlen(arg[0]) + 1;
integrate_style = new char[n];