Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions doc/src/Commands_pair.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ OPT.
* :doc:`airebo/morse (io) <pair_airebo>`
* :doc:`amoeba (g) <pair_amoeba>`
* :doc:`atm <pair_atm>`
* :doc:`beck (go) <pair_beck>`
* :doc:`beck (gko) <pair_beck>`
* :doc:`body/nparticle <pair_body_nparticle>`
* :doc:`body/rounded/polygon <pair_body_rounded_polygon>`
* :doc:`body/rounded/polyhedron <pair_body_rounded_polyhedron>`
* :doc:`bop <pair_bop>`
* :doc:`born (go) <pair_born>`
* :doc:`born (gko) <pair_born>`
* :doc:`born/coul/dsf <pair_born>`
* :doc:`born/coul/dsf/cs <pair_cs>`
* :doc:`born/coul/long (go) <pair_born>`
* :doc:`born/coul/long (gko) <pair_born>`
* :doc:`born/coul/long/cs (g) <pair_cs>`
* :doc:`born/coul/msm (o) <pair_born>`
* :doc:`born/coul/wolf (go) <pair_born>`
Expand All @@ -54,7 +54,7 @@ OPT.
* :doc:`buck/mdf <pair_mdf>`
* :doc:`buck6d/coul/gauss/dsf <pair_buck6d_coul_gauss>`
* :doc:`buck6d/coul/gauss/long <pair_buck6d_coul_gauss>`
* :doc:`colloid (go) <pair_colloid>`
* :doc:`colloid (gko) <pair_colloid>`
* :doc:`comb (o) <pair_comb>`
* :doc:`comb3 <pair_comb>`
* :doc:`cosine/squared <pair_cosine_squared>`
Expand All @@ -73,7 +73,7 @@ OPT.
* :doc:`coul/long/soft (o) <pair_fep_soft>`
* :doc:`coul/msm (o) <pair_coul>`
* :doc:`coul/slater/cut <pair_coul_slater>`
* :doc:`coul/slater/long (g) <pair_coul_slater>`
* :doc:`coul/slater/long (gk) <pair_coul_slater>`
* :doc:`coul/shield <pair_coul_shield>`
* :doc:`coul/streitz <pair_coul>`
* :doc:`coul/tt <pair_coul_tt>`
Expand Down Expand Up @@ -105,7 +105,7 @@ OPT.
* :doc:`eim (o) <pair_eim>`
* :doc:`exp6/rx (k) <pair_exp6_rx>`
* :doc:`extep <pair_extep>`
* :doc:`gauss (go) <pair_gauss>`
* :doc:`gauss (gko) <pair_gauss>`
* :doc:`gauss/cut (o) <pair_gauss>`
* :doc:`gayberne (gio) <pair_gayberne>`
* :doc:`gran/hertz/history (o) <pair_gran>`
Expand Down Expand Up @@ -190,8 +190,8 @@ OPT.
* :doc:`lj/spica/coul/long (gko) <pair_spica>`
* :doc:`lj/spica/coul/msm (o) <pair_spica>`
* :doc:`lj/sf/dipole/sf (go) <pair_dipole>`
* :doc:`lj/smooth (go) <pair_lj_smooth>`
* :doc:`lj/smooth/linear (o) <pair_lj_smooth_linear>`
* :doc:`lj/smooth (gko) <pair_lj_smooth>`
* :doc:`lj/smooth/linear (ko) <pair_lj_smooth_linear>`
* :doc:`lj/switch3/coulgauss/long <pair_lj_switch3_coulgauss_long>`
* :doc:`lj96/cut (gko) <pair_lj96>`
* :doc:`local/density <pair_local_density>`
Expand Down Expand Up @@ -306,7 +306,7 @@ OPT.
* :doc:`tip4p/long (o) <pair_coul>`
* :doc:`tip4p/long/soft (o) <pair_fep_soft>`
* :doc:`tri/lj <pair_tri_lj>`
* :doc:`ufm (got) <pair_ufm>`
* :doc:`ufm (gkot) <pair_ufm>`
* :doc:`uf3 (k) <pair_uf3>`
* :doc:`vashishta (gko) <pair_vashishta>`
* :doc:`vashishta/table (o) <pair_vashishta>`
Expand Down
3 changes: 2 additions & 1 deletion doc/src/pair_beck.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
.. index:: pair_style beck
.. index:: pair_style beck/gpu
.. index:: pair_style beck/kk
.. index:: pair_style beck/omp

pair_style beck command
=======================

Accelerator Variants: *beck/gpu*, *beck/omp*
Accelerator Variants: *beck/gpu*, *beck/kk*, *beck/omp*

Syntax
""""""
Expand Down
8 changes: 5 additions & 3 deletions doc/src/pair_born.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
.. index:: pair_style born
.. index:: pair_style born/omp
.. index:: pair_style born/gpu
.. index:: pair_style born/kk
.. index:: pair_style born/omp
.. index:: pair_style born/coul/long
.. index:: pair_style born/coul/long/gpu
.. index:: pair_style born/coul/long/kk
.. index:: pair_style born/coul/long/omp
.. index:: pair_style born/coul/msm
.. index:: pair_style born/coul/msm/omp
Expand All @@ -14,12 +16,12 @@
pair_style born command
=======================

Accelerator Variants: *born/omp*, *born/gpu*
Accelerator Variants: *born/gpu*, *born/kk*, *born/omp*

pair_style born/coul/long command
=================================

Accelerator Variants: *born/coul/long/gpu*, *born/coul/long/omp*
Accelerator Variants: *born/coul/long/gpu*, *born/coul/long/kk*, *born/coul/long/omp*

pair_style born/coul/msm command
================================
Expand Down
3 changes: 2 additions & 1 deletion doc/src/pair_colloid.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
.. index:: pair_style colloid
.. index:: pair_style colloid/gpu
.. index:: pair_style colloid/kk
.. index:: pair_style colloid/omp

pair_style colloid command
==========================

Accelerator Variants: *colloid/gpu*, *colloid/omp*
Accelerator Variants: *colloid/gpu*, *colloid/kk*, *colloid/omp*

Syntax
""""""
Expand Down
3 changes: 2 additions & 1 deletion doc/src/pair_coul_slater.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
.. index:: pair_style coul/slater/cut
.. index:: pair_style coul/slater/long
.. index:: pair_style coul/slater/long/gpu
.. index:: pair_style coul/slater/long/kk

pair_style coul/slater command
==============================
Expand All @@ -12,7 +13,7 @@ pair_style coul/slater/cut command
pair_style coul/slater/long command
===================================

Accelerator Variants: *coul/slater/long/gpu*
Accelerator Variants: *coul/slater/long/gpu*, *coul/slater/long/kk*

Syntax
""""""
Expand Down
3 changes: 2 additions & 1 deletion doc/src/pair_gauss.rst
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
.. index:: pair_style gauss
.. index:: pair_style gauss/gpu
.. index:: pair_style gauss/kk
.. index:: pair_style gauss/omp
.. index:: pair_style gauss/cut
.. index:: pair_style gauss/cut/omp

pair_style gauss command
========================

Accelerator Variants: *gauss/gpu*, *gauss/omp*
Accelerator Variants: *gauss/gpu*, *gauss/kk*, *gauss/omp*

pair_style gauss/cut command
============================
Expand Down
3 changes: 2 additions & 1 deletion doc/src/pair_lj_smooth.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
.. index:: pair_style lj/smooth
.. index:: pair_style lj/smooth/gpu
.. index:: pair_style lj/smooth/kk
.. index:: pair_style lj/smooth/omp

pair_style lj/smooth command
============================

Accelerator Variants: *lj/smooth/gpu*, *lj/smooth/omp*
Accelerator Variants: *lj/smooth/gpu*, *lj/smooth/kk*, *lj/smooth/omp*

Syntax
""""""
Expand Down
3 changes: 2 additions & 1 deletion doc/src/pair_ufm.rst
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
.. index:: pair_style ufm
.. index:: pair_style ufm/gpu
.. index:: pair_style ufm/kk
.. index:: pair_style ufm/omp
.. index:: pair_style ufm/opt

pair_style ufm command
======================

Accelerator Variants: *ufm/gpu*, *ufm/omp*, *ufm/opt*
Accelerator Variants: *ufm/gpu*, *ufm/kk*, *ufm/omp*, *ufm/opt*

Syntax
""""""
Expand Down
2 changes: 2 additions & 0 deletions src/COLLOID/pair_colloid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ PairColloid::PairColloid(LAMMPS *lmp) : Pair(lmp)

PairColloid::~PairColloid()
{
if (copymode) return;

if (allocated) {
memory->destroy(setflag);
memory->destroy(cutsq);
Expand Down
2 changes: 1 addition & 1 deletion src/COLLOID/pair_colloid.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class PairColloid : public Pair {
double **lj1, **lj2, **lj3, **lj4;
int **form;

void allocate();
virtual void allocate();
};

} // namespace LAMMPS_NS
Expand Down
2 changes: 2 additions & 0 deletions src/EXTRA-PAIR/pair_beck.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ PairBeck::PairBeck(LAMMPS *lmp) : Pair(lmp) {}

PairBeck::~PairBeck()
{
if (copymode) return;

if (allocated) {
memory->destroy(setflag);
memory->destroy(cutsq);
Expand Down
2 changes: 1 addition & 1 deletion src/EXTRA-PAIR/pair_beck.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class PairBeck : public Pair {
double **AA, **BB;
double **aa, **alpha, **beta;

void allocate();
virtual void allocate();
};

} // namespace LAMMPS_NS
Expand Down
2 changes: 2 additions & 0 deletions src/EXTRA-PAIR/pair_gauss.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ PairGauss::PairGauss(LAMMPS *lmp) : Pair(lmp)

PairGauss::~PairGauss()
{
if (copymode) return;

delete[] pvector;

if (allocated) {
Expand Down
2 changes: 1 addition & 1 deletion src/EXTRA-PAIR/pair_gauss.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class PairGauss : public Pair {
double **a, **b;
double **offset;

void allocate();
virtual void allocate();
};

} // namespace LAMMPS_NS
Expand Down
2 changes: 2 additions & 0 deletions src/EXTRA-PAIR/pair_lj_smooth.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ PairLJSmooth::PairLJSmooth(LAMMPS *lmp) : Pair(lmp)

PairLJSmooth::~PairLJSmooth()
{
if (copymode) return;

if (allocated) {
memory->destroy(setflag);
memory->destroy(cutsq);
Expand Down
2 changes: 1 addition & 1 deletion src/EXTRA-PAIR/pair_lj_smooth.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class PairLJSmooth : public Pair {
double **ljsw0, **ljsw1, **ljsw2, **ljsw3, **ljsw4;
double **offset;

void allocate();
virtual void allocate();
};

} // namespace LAMMPS_NS
Expand Down
2 changes: 2 additions & 0 deletions src/EXTRA-PAIR/pair_ufm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ PairUFM::PairUFM(LAMMPS *lmp) : Pair(lmp)

PairUFM::~PairUFM()
{
if (copymode) return;

if (allocated) {
memory->destroy(setflag);
memory->destroy(cutsq);
Expand Down
16 changes: 16 additions & 0 deletions src/KOKKOS/Install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,16 @@ action pair_buck_coul_cut_kokkos.cpp
action pair_buck_coul_cut_kokkos.h
action pair_buck_coul_long_kokkos.cpp pair_buck_coul_long.cpp
action pair_buck_coul_long_kokkos.h pair_buck_coul_long.h
action pair_beck_kokkos.cpp pair_beck.cpp
action pair_beck_kokkos.h pair_beck.h
action pair_born_coul_long_kokkos.cpp pair_born_coul_long.cpp
action pair_born_coul_long_kokkos.h pair_born_coul_long.h
action pair_born_kokkos.cpp
action pair_born_kokkos.h
action pair_buck_kokkos.cpp
action pair_buck_kokkos.h
action pair_colloid_kokkos.cpp pair_colloid.cpp
action pair_colloid_kokkos.h pair_colloid.h
action pair_coul_cut_kokkos.cpp
action pair_coul_cut_kokkos.h
action pair_coul_debye_kokkos.cpp
Expand All @@ -322,6 +330,8 @@ action pair_coul_dsf_kokkos.cpp
action pair_coul_dsf_kokkos.h
action pair_coul_long_kokkos.cpp pair_coul_long.cpp
action pair_coul_long_kokkos.h pair_coul_long.h
action pair_coul_slater_long_kokkos.cpp pair_coul_slater_long.cpp
action pair_coul_slater_long_kokkos.h pair_coul_slater_long.h
action pair_coul_wolf_kokkos.cpp
action pair_coul_wolf_kokkos.h
action pair_dpd_ext_kokkos.cpp pair_dpd_ext.cpp
Expand All @@ -342,6 +352,8 @@ action pair_eam_kokkos.cpp pair_eam.cpp
action pair_eam_kokkos.h pair_eam.h
action pair_exp6_rx_kokkos.cpp pair_exp6_rx.cpp
action pair_exp6_rx_kokkos.h pair_exp6_rx.h
action pair_gauss_kokkos.cpp pair_gauss.cpp
action pair_gauss_kokkos.h pair_gauss.h
action pair_gran_hooke_history_kokkos.cpp pair_gran_hooke_history.cpp
action pair_gran_hooke_history_kokkos.h pair_gran_hooke_history.h
action pair_hybrid_kokkos.cpp
Expand Down Expand Up @@ -385,6 +397,8 @@ action pair_lj_gromacs_coul_gromacs_kokkos.cpp pair_lj_gromacs_coul_gromacs.cpp
action pair_lj_gromacs_coul_gromacs_kokkos.h pair_lj_gromacs_coul_gromacs.h
action pair_lj_gromacs_kokkos.cpp pair_lj_gromacs.cpp
action pair_lj_gromacs_kokkos.h pair_lj_gromacs.h
action pair_lj_smooth_kokkos.cpp pair_lj_smooth.cpp
action pair_lj_smooth_kokkos.h pair_lj_smooth.h
action pair_lj_spica_coul_long_kokkos.cpp pair_lj_spica_coul_long.cpp
action pair_lj_spica_coul_long_kokkos.h pair_lj_spica_coul_long.h
action pair_lj_spica_kokkos.cpp pair_lj_spica.cpp
Expand Down Expand Up @@ -420,6 +434,8 @@ action pair_table_rx_kokkos.cpp pair_table_rx.cpp
action pair_table_rx_kokkos.h pair_table_rx.h
action pair_tersoff_kokkos.cpp pair_tersoff.cpp
action pair_tersoff_kokkos.h pair_tersoff.h
action pair_ufm_kokkos.cpp pair_ufm.cpp
action pair_ufm_kokkos.h pair_ufm.h
action pair_tersoff_mod_kokkos.cpp pair_tersoff_mod.cpp
action pair_tersoff_mod_kokkos.h pair_tersoff_mod.h
action pair_tersoff_zbl_kokkos.cpp pair_tersoff_zbl.cpp
Expand Down
Loading