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

Browse Source
This commit is contained in:
sjplimp
2014-07-30 14:59:20 +00:00
parent f6c15d997d
commit fe1ade5fad
43 changed files with 379 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/kspace.cpp
View File

@ -173,17 +173,31 @@ void KSpace::pair_check()
{
if (force->pair == NULL)
error->all(FLERR,"KSpace solver requires a pair style");
if (ewaldflag && force->pair->ewaldflag == 0)
if (ewaldflag && !force->pair->ewaldflag)
error->all(FLERR,"KSpace style is incompatible with Pair style");
if (pppmflag && force->pair->pppmflag == 0)
if (pppmflag && !force->pair->pppmflag)
error->all(FLERR,"KSpace style is incompatible with Pair style");
if (msmflag && force->pair->msmflag == 0)
if (msmflag && !force->pair->msmflag)
error->all(FLERR,"KSpace style is incompatible with Pair style");
if (dispersionflag && force->pair->dispersionflag == 0)
if (dispersionflag && !force->pair->dispersionflag)
error->all(FLERR,"KSpace style is incompatible with Pair style");
if (tip4pflag && force->pair->tip4pflag == 0)
if (tip4pflag && !force->pair->tip4pflag)
error->all(FLERR,"KSpace style is incompatible with Pair style");
if (dipoleflag && force->pair->dipoleflag == 0)
if (dipoleflag && !force->pair->dipoleflag)
error->all(FLERR,"KSpace style is incompatible with Pair style");
if (!ewaldflag && force->pair->ewaldflag)
error->all(FLERR,"KSpace style is incompatible with Pair style");
if (!pppmflag && force->pair->pppmflag)
error->all(FLERR,"KSpace style is incompatible with Pair style");
if (!msmflag && force->pair->msmflag)
error->all(FLERR,"KSpace style is incompatible with Pair style");
if (!dispersionflag && force->pair->dispersionflag)
error->all(FLERR,"KSpace style is incompatible with Pair style");
if (!tip4pflag && force->pair->tip4pflag)
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");
}