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

This commit is contained in:
sjplimp
2013-01-02 16:27:31 +00:00
parent d6353f2da3
commit c8624bc7eb
4 changed files with 42 additions and 13 deletions

View File

@ -109,10 +109,10 @@ int BaseEllipsoidT::init_base(const int nlocal, const int nall,
for (int j=i; j<ntypes; j++)
if (_host_form[i][j]!=ELLIPSE_ELLIPSE)
_multiple_forms=true;
if (_multiple_forms && host_nlocal>0) {
std::cerr << "Cannot use Gayberne with multiple forms and GPU neighbor.\n";
exit(1);
}
if (_multiple_forms && host_nlocal>0)
return -8;
if (_multiple_forms && gpu_nbor!=0)
return -9;
if (_multiple_forms)
ans->force.zero();