changing the fix name and file names for coherence
This commit is contained in:
@ -14,14 +14,14 @@
|
|||||||
***************************************************************************/
|
***************************************************************************/
|
||||||
|
|
||||||
#if defined(USE_OPENCL)
|
#if defined(USE_OPENCL)
|
||||||
#include "dpd_charged_cl.h"
|
#include "lal_dpd_coul_slater_long_cl.h"
|
||||||
#elif defined(USE_CUDART)
|
#elif defined(USE_CUDART)
|
||||||
const char *dpd_charged=0;
|
const char *dpd_charged=0;
|
||||||
#else
|
#else
|
||||||
#include "dpd_charged_cubin.h"
|
#include "lal_dpd_coul_slater_long_cubin.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "lal_dpd_charged.h"
|
#include "lal_dpd_coul_slater_long.h"
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
namespace LAMMPS_AL {
|
namespace LAMMPS_AL {
|
||||||
#define DPDChargedT DPDCharged<numtyp, acctyp>
|
#define DPDChargedT DPDCharged<numtyp, acctyp>
|
||||||
@ -17,7 +17,7 @@
|
|||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
|
||||||
#include "lal_dpd_charged.h"
|
#include "lal_dpd_coul_slater_long.h"
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
using namespace LAMMPS_AL;
|
using namespace LAMMPS_AL;
|
||||||
@ -16,7 +16,7 @@
|
|||||||
Contributing author: Kurt Smith (U Pittsburgh)
|
Contributing author: Kurt Smith (U Pittsburgh)
|
||||||
------------------------------------------------------------------------- */
|
------------------------------------------------------------------------- */
|
||||||
|
|
||||||
#include "pair_dpd_charged.h"
|
#include "pair_dpd_coul_slater_long.h"
|
||||||
|
|
||||||
#include "atom.h"
|
#include "atom.h"
|
||||||
#include "comm.h"
|
#include "comm.h"
|
||||||
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
#ifdef PAIR_CLASS
|
#ifdef PAIR_CLASS
|
||||||
// clang-format off
|
// clang-format off
|
||||||
PairStyle(dpd/charged,PairDPDCharged);
|
PairStyle(dpd/coul/slater/long,PairDPDCharged);
|
||||||
// clang-format on
|
// clang-format on
|
||||||
#else
|
#else
|
||||||
|
|
||||||
@ -15,7 +15,7 @@
|
|||||||
Contributing author: Trung Dac Nguyen (ORNL)
|
Contributing author: Trung Dac Nguyen (ORNL)
|
||||||
------------------------------------------------------------------------- */
|
------------------------------------------------------------------------- */
|
||||||
|
|
||||||
#include "pair_dpd_charged_gpu.h"
|
#include "pair_dpd_coul_slater_long_gpu.h"
|
||||||
|
|
||||||
#include "atom.h"
|
#include "atom.h"
|
||||||
#include "comm.h"
|
#include "comm.h"
|
||||||
@ -13,14 +13,14 @@
|
|||||||
|
|
||||||
#ifdef PAIR_CLASS
|
#ifdef PAIR_CLASS
|
||||||
// clang-format off
|
// clang-format off
|
||||||
PairStyle(dpd/charged/gpu,PairDPDChargedGPU);
|
PairStyle(dpd/coul/slater/long,PairDPDChargedGPU);
|
||||||
// clang-format on
|
// clang-format on
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#ifndef LMP_PAIR_DPD_CHARGED_GPU_H
|
#ifndef LMP_PAIR_DPD_CHARGED_GPU_H
|
||||||
#define 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 {
|
namespace LAMMPS_NS {
|
||||||
|
|
||||||
Reference in New Issue
Block a user