From a91e904f349d49b7015345a5e5d00aeeed6649f7 Mon Sep 17 00:00:00 2001 From: Gurgen Date: Sat, 17 Apr 2021 14:56:16 +0300 Subject: [PATCH] minor changes --- lib/gpu/lal_lj_smooth.cpp | 4 ++-- lib/gpu/lal_lj_smooth.cu | 2 +- lib/gpu/lal_lj_smooth.h | 8 ++++---- lib/gpu/lal_lj_smooth_ext.cpp | 2 -- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/gpu/lal_lj_smooth.cpp b/lib/gpu/lal_lj_smooth.cpp index 5e4785230b..47ca4ab6fa 100644 --- a/lib/gpu/lal_lj_smooth.cpp +++ b/lib/gpu/lal_lj_smooth.cpp @@ -145,7 +145,7 @@ double LJSMOOTHT::host_memory_usage() const { // Calculate energies, forces, and torques // --------------------------------------------------------------------------- template -void LJSMOOTHT::loop(const bool _eflag, const bool _vflag) { +int LJSMOOTHT::loop(const bool _eflag, const bool _vflag) { // Compute the block size and grid size to keep all cores busy const int BX=this->block_size(); int eflag, vflag; @@ -183,4 +183,4 @@ void LJSMOOTHT::loop(const bool _eflag, const bool _vflag) { } template class LJSMOOTH; -} \ No newline at end of file +} diff --git a/lib/gpu/lal_lj_smooth.cu b/lib/gpu/lal_lj_smooth.cu index c02e1b5ae0..fa87e6fcee 100644 --- a/lib/gpu/lal_lj_smooth.cu +++ b/lib/gpu/lal_lj_smooth.cu @@ -232,4 +232,4 @@ __kernel void k_lj_smooth_fast(const __global numtyp4 *restrict x_, store_answers(f,energy,virial,ii,inum,tid,t_per_atom,offset,eflag,vflag, ans,engv); } // if ii -} \ No newline at end of file +} diff --git a/lib/gpu/lal_lj_smooth.h b/lib/gpu/lal_lj_smooth.h index f869977c58..fec39c95c6 100644 --- a/lib/gpu/lal_lj_smooth.h +++ b/lib/gpu/lal_lj_smooth.h @@ -1,13 +1,13 @@ /*************************************************************************** lj_smooth.h ------------------- - W. Michael Brown (ORNL) + G. Melikyan Class for acceleration of the lj/smooth pair style. __________________________________________________________________________ This file is part of the LAMMPS Accelerator Library (LAMMPS_AL) __________________________________________________________________________ begin : - email : brownw@ornl.gov + email : gkmelikyan@edu.hse.ru ***************************************************************************/ #ifndef LAL_LJ_SMOOTH_H @@ -83,9 +83,9 @@ class LJSMOOTH : public BaseAtomic { private: bool _allocated; - void loop(const bool _eflag, const bool _vflag); + int loop(const int _eflag, const int _vflag); }; } -#endif \ No newline at end of file +#endif diff --git a/lib/gpu/lal_lj_smooth_ext.cpp b/lib/gpu/lal_lj_smooth_ext.cpp index fd4dfd46be..aaebbe1493 100644 --- a/lib/gpu/lal_lj_smooth_ext.cpp +++ b/lib/gpu/lal_lj_smooth_ext.cpp @@ -142,5 +142,3 @@ void ljsmt_gpu_compute(const int ago, const int inum_full, const int nall, double ljsmt_gpu_bytes() { return LJSMTMF.host_memory_usage(); } - -