Commit 1f43efc1 authored by Trung Nguyen's avatar Trung Nguyen
Browse files

Cleaned up the changes in Device and the base class of the pair styles

parent c55009a0
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
@@ -64,15 +64,12 @@ int BaseAtomicT::init_atomic(const int nlocal, const int nall,
  } else
    _nbor_data=&(nbor->dev_nbor);

  int success=device->init(*ans,false,false,nlocal,host_nlocal,nall,nbor,
                           maxspecial,_gpu_host,max_nbors,cell_size,false,
                           _threads_per_atom);
  int success=device->init(*ans,false,false,nlocal,nall,maxspecial);
  if (success!=0)
    return success;

  success = device->init_nbor(nbor,nlocal,host_nlocal,nall,maxspecial,_gpu_host,
                  max_nbors,cell_size,false,_threads_per_atom);

  if (success!=0)
    return success;

+1 −4
Original line number Diff line number Diff line
@@ -65,15 +65,12 @@ int BaseChargeT::init_atomic(const int nlocal, const int nall,
  } else
    _nbor_data=&(nbor->dev_nbor);

  int success=device->init(*ans,true,false,nlocal,host_nlocal,nall,nbor,
                           maxspecial,_gpu_host,max_nbors,cell_size,false,
                           _threads_per_atom);
  int success=device->init(*ans,true,false,nlocal,nall,maxspecial);
  if (success!=0)
    return success;

  success = device->init_nbor(nbor,nlocal,host_nlocal,nall,maxspecial,_gpu_host,
                  max_nbors,cell_size,false,_threads_per_atom);

  if (success!=0)
    return success;

+1 −4
Original line number Diff line number Diff line
@@ -66,15 +66,12 @@ int BaseDipoleT::init_atomic(const int nlocal, const int nall,
  } else
    _nbor_data=&(nbor->dev_nbor);

  int success=device->init(*ans,true,true,nlocal,host_nlocal,nall,nbor,
                           maxspecial,_gpu_host,max_nbors,cell_size,false,
                           _threads_per_atom);
  int success=device->init(*ans,true,true,nlocal,nall,maxspecial);
  if (success!=0)
    return success;

  success = device->init_nbor(nbor,nlocal,host_nlocal,nall,maxspecial,_gpu_host,
                  max_nbors,cell_size,false,_threads_per_atom);

  if (success!=0)
    return success;

+1 −3
Original line number Diff line number Diff line
@@ -65,9 +65,7 @@ int BaseDPDT::init_atomic(const int nlocal, const int nall,
  } else
    _nbor_data=&(nbor->dev_nbor);

  int success=device->init(*ans,false,false,nlocal,host_nlocal,nall,nbor,
                           maxspecial,_gpu_host,max_nbors,cell_size,false,
                           _threads_per_atom,true);
  int success=device->init(*ans,false,false,nlocal,nall,maxspecial,true);
  if (success!=0)
    return success;

+6 −3
Original line number Diff line number Diff line
@@ -71,9 +71,12 @@ int BaseEllipsoidT::init_base(const int nlocal, const int nall,

  _threads_per_atom=device->threads_per_atom();

  int success=device->init(*ans,false,true,nlocal,host_nlocal,nall,nbor,
                           maxspecial,_gpu_host,max_nbors,cell_size,true,
                           1);
  int success=device->init(*ans,false,true,nlocal,nall,maxspecial);
  if (success!=0)
    return success;

  success = device->init_nbor(nbor,nlocal,host_nlocal,nall,maxspecial,_gpu_host,
                  max_nbors,cell_size,true,1);
  if (success!=0)
    return success;
  
Loading