From df5c028ad4c1c239ae2fcfab6fdeaa53b273909f Mon Sep 17 00:00:00 2001 From: sjplimp Date: Fri, 1 Aug 2014 14:42:32 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12238 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/kspace.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/kspace.cpp b/src/kspace.cpp index 0c1159819e..c12af7c84c 100644 --- a/src/kspace.cpp +++ b/src/kspace.cpp @@ -173,6 +173,7 @@ void KSpace::pair_check() { if (force->pair == NULL) error->all(FLERR,"KSpace solver requires a pair style"); + if (ewaldflag && !force->pair->ewaldflag) error->all(FLERR,"KSpace style is incompatible with Pair style"); if (pppmflag && !force->pair->pppmflag) @@ -181,9 +182,14 @@ void KSpace::pair_check() 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 (dipoleflag && !force->pair->dipoleflag) + 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) + + 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"); }