diff --git a/lib/gpu/lal_dpd_charged.cpp b/lib/gpu/lal_dpd_coul_slater_long.cpp similarity index 98% rename from lib/gpu/lal_dpd_charged.cpp rename to lib/gpu/lal_dpd_coul_slater_long.cpp index f9c52cba0d..bf23674999 100644 --- a/lib/gpu/lal_dpd_charged.cpp +++ b/lib/gpu/lal_dpd_coul_slater_long.cpp @@ -14,14 +14,14 @@ ***************************************************************************/ #if defined(USE_OPENCL) -#include "dpd_charged_cl.h" +#include "lal_dpd_coul_slater_long_cl.h" #elif defined(USE_CUDART) const char *dpd_charged=0; #else -#include "dpd_charged_cubin.h" +#include "lal_dpd_coul_slater_long_cubin.h" #endif -#include "lal_dpd_charged.h" +#include "lal_dpd_coul_slater_long.h" #include namespace LAMMPS_AL { #define DPDChargedT DPDCharged diff --git a/lib/gpu/lal_dpd_charged.cu b/lib/gpu/lal_dpd_coul_slater_long.cu similarity index 100% rename from lib/gpu/lal_dpd_charged.cu rename to lib/gpu/lal_dpd_coul_slater_long.cu diff --git a/lib/gpu/lal_dpd_charged.h b/lib/gpu/lal_dpd_coul_slater_long.h similarity index 100% rename from lib/gpu/lal_dpd_charged.h rename to lib/gpu/lal_dpd_coul_slater_long.h diff --git a/lib/gpu/lal_dpd_charged_ext.cpp b/lib/gpu/lal_dpd_coul_slater_long_ext.cpp similarity index 99% rename from lib/gpu/lal_dpd_charged_ext.cpp rename to lib/gpu/lal_dpd_coul_slater_long_ext.cpp index a8e153300a..c39bbcdf88 100644 --- a/lib/gpu/lal_dpd_charged_ext.cpp +++ b/lib/gpu/lal_dpd_coul_slater_long_ext.cpp @@ -17,7 +17,7 @@ #include #include -#include "lal_dpd_charged.h" +#include "lal_dpd_coul_slater_long.h" using namespace std; using namespace LAMMPS_AL; diff --git a/src/DPD-BASIC/pair_dpd_charged.cpp b/src/DPD-BASIC/pair_dpd_coul_slater_long.cpp similarity index 99% rename from src/DPD-BASIC/pair_dpd_charged.cpp rename to src/DPD-BASIC/pair_dpd_coul_slater_long.cpp index 0c73b71c1a..e34931fbb6 100644 --- a/src/DPD-BASIC/pair_dpd_charged.cpp +++ b/src/DPD-BASIC/pair_dpd_coul_slater_long.cpp @@ -16,7 +16,7 @@ Contributing author: Kurt Smith (U Pittsburgh) ------------------------------------------------------------------------- */ -#include "pair_dpd_charged.h" +#include "pair_dpd_coul_slater_long.h" #include "atom.h" #include "comm.h" diff --git a/src/DPD-BASIC/pair_dpd_charged.h b/src/DPD-BASIC/pair_dpd_coul_slater_long.h similarity index 97% rename from src/DPD-BASIC/pair_dpd_charged.h rename to src/DPD-BASIC/pair_dpd_coul_slater_long.h index eebe421ed6..c0a1a192d3 100644 --- a/src/DPD-BASIC/pair_dpd_charged.h +++ b/src/DPD-BASIC/pair_dpd_coul_slater_long.h @@ -13,7 +13,7 @@ #ifdef PAIR_CLASS // clang-format off -PairStyle(dpd/charged,PairDPDCharged); +PairStyle(dpd/coul/slater/long,PairDPDCharged); // clang-format on #else diff --git a/src/GPU/pair_dpd_charged_gpu.cpp b/src/GPU/pair_dpd_coul_slater_long_gpu.cpp similarity index 99% rename from src/GPU/pair_dpd_charged_gpu.cpp rename to src/GPU/pair_dpd_coul_slater_long_gpu.cpp index c3a48d6657..0a104c6107 100644 --- a/src/GPU/pair_dpd_charged_gpu.cpp +++ b/src/GPU/pair_dpd_coul_slater_long_gpu.cpp @@ -15,7 +15,7 @@ Contributing author: Trung Dac Nguyen (ORNL) ------------------------------------------------------------------------- */ -#include "pair_dpd_charged_gpu.h" +#include "pair_dpd_coul_slater_long_gpu.h" #include "atom.h" #include "comm.h" diff --git a/src/GPU/pair_dpd_charged_gpu.h b/src/GPU/pair_dpd_coul_slater_long_gpu.h similarity index 93% rename from src/GPU/pair_dpd_charged_gpu.h rename to src/GPU/pair_dpd_coul_slater_long_gpu.h index 6c755660a1..aed5243fe6 100644 --- a/src/GPU/pair_dpd_charged_gpu.h +++ b/src/GPU/pair_dpd_coul_slater_long_gpu.h @@ -13,14 +13,14 @@ #ifdef PAIR_CLASS // clang-format off -PairStyle(dpd/charged/gpu,PairDPDChargedGPU); +PairStyle(dpd/coul/slater/long,PairDPDChargedGPU); // clang-format on #else #ifndef LMP_PAIR_DPD_CHARGED_GPU_H #define LMP_PAIR_DPD_CHARGED_GPU_H -#include "pair_dpd_charged.h" +#include "pair_coul_slater_long.h" namespace LAMMPS_NS {