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

Browse Source
This commit is contained in:
sjplimp
2014-08-01 14:42:32 +00:00
parent 3dace181b7
commit df5c028ad4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/kspace.cpp
View File

@ -173,6 +173,7 @@ void KSpace::pair_check()
{ {
if (force->pair == NULL) if (force->pair == NULL)
error->all(FLERR,"KSpace solver requires a pair style"); error->all(FLERR,"KSpace solver requires a pair style");
if (ewaldflag && !force->pair->ewaldflag) if (ewaldflag && !force->pair->ewaldflag)
error->all(FLERR,"KSpace style is incompatible with Pair style"); error->all(FLERR,"KSpace style is incompatible with Pair style");
if (pppmflag && !force->pair->pppmflag) if (pppmflag && !force->pair->pppmflag)
@ -181,9 +182,14 @@ void KSpace::pair_check()
error->all(FLERR,"KSpace style is incompatible with Pair style"); error->all(FLERR,"KSpace style is incompatible with Pair style");
if (dispersionflag && !force->pair->dispersionflag) if (dispersionflag && !force->pair->dispersionflag)
error->all(FLERR,"KSpace style is incompatible with Pair style"); error->all(FLERR,"KSpace style is incompatible with Pair style");
if (dipoleflag && !force->pair->dipoleflag)
error->all(FLERR,"KSpace style is incompatible with Pair style");
if (tip4pflag && !force->pair->tip4pflag) if (tip4pflag && !force->pair->tip4pflag)
error->all(FLERR,"KSpace style is incompatible with Pair style"); error->all(FLERR,"KSpace style is incompatible with Pair style");
if (dipoleflag && !force->pair->dipoleflag)
if (force->pair->dispersionflag && !dispersionflag)
error->all(FLERR,"KSpace style is incompatible with Pair style");
if (force->pair->tip4pflag && !tip4pflag)
error->all(FLERR,"KSpace style is incompatible with Pair style"); error->all(FLERR,"KSpace style is incompatible with Pair style");
} }