From 9c4597b5e979191aede2b27c7b6fc09975f3c38c Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Wed, 17 Jan 2024 16:12:36 -0500 Subject: [PATCH] more GPU package cleanup from Trung --- lib/gpu/lal_base_sph.h | 2 +- lib/gpu/lal_coul_slater_long.h | 4 ++-- lib/gpu/lal_eam.cpp | 6 +++--- lib/gpu/lal_sph_heatconduction.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/gpu/lal_base_sph.h b/lib/gpu/lal_base_sph.h index e1e5731573..d37e85f170 100644 --- a/lib/gpu/lal_base_sph.h +++ b/lib/gpu/lal_base_sph.h @@ -15,7 +15,7 @@ ***************************************************************************/ #ifndef LAL_BASE_SPH_H -#define LAL_BASE_DPD_H +#define LAL_BASE_SPH_H #include "lal_device.h" #include "lal_balance.h" diff --git a/lib/gpu/lal_coul_slater_long.h b/lib/gpu/lal_coul_slater_long.h index 8950fd81ef..1731992a16 100644 --- a/lib/gpu/lal_coul_slater_long.h +++ b/lib/gpu/lal_coul_slater_long.h @@ -13,8 +13,8 @@ email : ndactrung@gmail.com ***************************************************************************/ -#ifndef LAL_Coul_Slater_Long_H -#define LAL_Coul_Slater_Long_H +#ifndef LAL_COUL_SLATER_LONG_H +#define LAL_COUL_SLATER_LONG_H #include "lal_base_charge.h" diff --git a/lib/gpu/lal_eam.cpp b/lib/gpu/lal_eam.cpp index b7bc7b958a..0a2ed21ab3 100644 --- a/lib/gpu/lal_eam.cpp +++ b/lib/gpu/lal_eam.cpp @@ -303,7 +303,7 @@ double EAMT::host_memory_usage() const { } // --------------------------------------------------------------------------- -// Copy nbor list from host if necessary and then compute atom energies/forces +// Copy nbor list from host if necessary and then compute per-atom fp // --------------------------------------------------------------------------- template void EAMT::compute(const int f_ago, const int inum_full, const int nlocal, @@ -379,7 +379,7 @@ void EAMT::compute(const int f_ago, const int inum_full, const int nlocal, } // --------------------------------------------------------------------------- -// Reneighbor on GPU and then compute per-atom densities +// Reneighbor on GPU and then compute per-atom fp // --------------------------------------------------------------------------- template int** EAMT::compute(const int ago, const int inum_full, const int nall, @@ -461,7 +461,7 @@ int** EAMT::compute(const int ago, const int inum_full, const int nall, } // --------------------------------------------------------------------------- -// Copy nbor list from host if necessary and then calculate forces, virials,.. +// Update per-atom fp, and then calculate forces, virials,.. // --------------------------------------------------------------------------- template void EAMT::compute2(int *ilist, const bool eflag, const bool vflag, diff --git a/lib/gpu/lal_sph_heatconduction.h b/lib/gpu/lal_sph_heatconduction.h index 23241e8c92..cd7a46e3bd 100644 --- a/lib/gpu/lal_sph_heatconduction.h +++ b/lib/gpu/lal_sph_heatconduction.h @@ -13,8 +13,8 @@ email : ndactrung@gmail.com ***************************************************************************/ -#ifndef LAL_SPH_LJ_H -#define LAL_SPH_LJ_H +#ifndef LAL_SPH_HEATCONDUCTION_H +#define LAL_SPH_HEATCONDUCTION_H #include "lal_base_sph.h"