tx258/lammps-gran-kokkos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sjplimp
2014-08-27 15:23:05 +00:00
parent 845f61931a
commit 9b5124c54e
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/pair_hybrid.cpp
View File

@ -697,15 +697,21 @@ double PairHybrid::single(int i, int j, int itype, int jtype,
}
/* ----------------------------------------------------------------------
modify parameters of the pair style
if 1st keyword is pair, then applies to one sub-style
else pass command args to every sub-style of hybrid
modify parameters of the pair style and its sub-styles
------------------------------------------------------------------------- */
void PairHybrid::modify_params(int narg, char **arg)
{
if (narg == 0) error->all(FLERR,"Illegal pair_modify command");
// apply args to pair hybrid itself
// important for some keywords like tail or compute
Pair::modify_params(narg,arg);
// if 1st keyword is pair, then apply args to one sub-style
// else pass args to every sub-style
if (strcmp(arg[0],"pair") == 0) {
if (narg < 2) error->all(FLERR,"Illegal pair_modify command");
int m;
@ -724,7 +730,7 @@ void PairHybrid::modify_params(int narg, char **arg)
styles[m]->modify_params(narg-3,&arg[3]);
}
} else
} else
for (int m = 0; m < nstyles; m++) styles[m]->modify_params(narg,arg);
}