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@12310 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2014-08-14 16:30:03 +00:00
parent 405a2fd487
commit 0f6eb0877e
59 changed files with 9668 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/angle_hybrid.cpp
View File

@ -208,7 +208,7 @@ void AngleHybrid::settings(int narg, char **arg)
// one exception is 1st arg of style "table", which is non-numeric
// need a better way to skip these exceptions
int dummy;
int sflag;
nstyles = 0;
i = 0;
@ -221,9 +221,10 @@ void AngleHybrid::settings(int narg, char **arg)
error->all(FLERR,"Angle style hybrid cannot have hybrid as an argument");
if (strcmp(arg[i],"none") == 0)
error->all(FLERR,"Angle style hybrid cannot have none as an argument");
styles[nstyles] = force->new_angle(arg[i],lmp->suffix,dummy);
keywords[nstyles] = new char[strlen(arg[i])+1];
strcpy(keywords[nstyles],arg[i]);
styles[nstyles] = force->new_angle(arg[i],1,sflag);
force->store_style(keywords[nstyles],arg[i],sflag);
istyle = i;
if (strcmp(arg[i],"table") == 0) i++;
i++;
@ -346,7 +347,7 @@ void AngleHybrid::read_restart(FILE *fp)
keywords[m] = new char[n];
if (me == 0) fread(keywords[m],sizeof(char),n,fp);
MPI_Bcast(keywords[m],n,MPI_CHAR,0,world);
styles[m] = force->new_angle(keywords[m],lmp->suffix,dummy);
styles[m] = force->new_angle(keywords[m],0,dummy);
}
}