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

This commit is contained in:
sjplimp
2012-09-21 15:57:23 +00:00
parent 8bcf139b73
commit 209999068c
53 changed files with 1733 additions and 1081 deletions

View File

@ -80,7 +80,7 @@ int BaseEllipsoidT::init_base(const int nlocal, const int nall,
ucl_device=device->gpu;
atom=&device->atom;
_block_size=device->pair_block_size();
_block_size=device->block_ellipse();
compile_kernels(*ucl_device,ellipsoid_program,lj_program,k_name,ellip_sphere);
// Initialize host-device load balancer
@ -118,9 +118,8 @@ int BaseEllipsoidT::init_base(const int nlocal, const int nall,
ans->force.zero();
// Memory for ilist ordered by particle type
if (host_olist.alloc(nbor->max_atoms(),*ucl_device)==UCL_SUCCESS)
return 0;
else return -3;
if (host_olist.alloc(nbor->max_atoms(),*ucl_device)!=UCL_SUCCESS)
return -3;
_max_an_bytes=ans->gpu_bytes()+nbor->gpu_bytes();