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

This commit is contained in:
sjplimp 2015-07-31 20:54:39 +00:00
parent 3159a0ca45
commit 7eb82ad620
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/pair_hybrid.cpp
View File

@ -820,17 +820,20 @@ void PairHybrid::modify_params(int narg, char **arg)
// invoke modify_special() for the sub-style
if (iarg < narg && strcmp(arg[iarg],"special") == 0) {
if (iarg+4 < narg)
if (narg < iarg+5)
error->all(FLERR,"Illegal pair_modify special command");
modify_special(m,narg-iarg,&arg[iarg]);
iarg += 4;
modify_special(m,narg-iarg,&arg[iarg+1]);
iarg += 5;
}
// apply all keywords (except pair and special) to pair hybrid itself
// important for some keywords like tail or compute
// apply the remaining keywords to the base pair style itself and the
// sub-style except for "pair" and "special".
// the former is important for some keywords like "tail" or "compute"
Pair::modify_params(narg-iarg,&arg[iarg]);
styles[m]->modify_params(narg-iarg,&arg[iarg]);
if (narg-iarg > 0) {
Pair::modify_params(narg-iarg,&arg[iarg]);
styles[m]->modify_params(narg-iarg,&arg[iarg]);
}
// apply all keywords to pair hybrid itself and every sub-style

1
src/pair_hybrid.h
View File

@ -27,6 +27,7 @@ namespace LAMMPS_NS {
class PairHybrid : public Pair {
friend class FixGPU;
friend class FixIntel;
friend class FixOMP;
friend class Force;
friend class Respa;