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

Browse Source
This commit is contained in:
sjplimp
2013-01-17 20:13:03 +00:00
parent 9cd44aec33
commit 78aaed5f22
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/pair_hybrid.cpp
View File

@ -252,6 +252,19 @@ void PairHybrid::settings(int narg, char **arg)
if (count == 1) multiple[i] = 0; if (count == 1) multiple[i] = 0;
} }
// set pair flags from sub-style flags
flags();
}
/* ----------------------------------------------------------------------
set top-level pair flags from sub-style flags
------------------------------------------------------------------------- */
void PairHybrid::flags()
{
int m;
// set comm_forward, comm_reverse, comm_reverse_off to max of any sub-style // set comm_forward, comm_reverse, comm_reverse_off to max of any sub-style
for (m = 0; m < nstyles; m++) { for (m = 0; m < nstyles; m++) {
@ -635,6 +648,10 @@ void PairHybrid::read_restart(FILE *fp)
} }
if (count == 1) multiple[i] = 0; if (count == 1) multiple[i] = 0;
} }
// set pair flags from sub-style flags
flags();
} }
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------

1
src/pair_hybrid.h
View File

@ -61,6 +61,7 @@ class PairHybrid : public Pair {
int nallstyles; int nallstyles;
void allocate(); void allocate();
void flags();
virtual void modify_requests(); virtual void modify_requests();
void build_styles(); void build_styles();
int known_style(char *); int known_style(char *);