From 7aaa85c3a1dc5f87f0087f12b39718732b4cdb7b Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Thu, 20 Jan 2022 15:44:16 -0500 Subject: [PATCH] Apply override to NBin classes --- src/DPD-REACT/nbin_ssa.h | 7 +++---- src/INTEL/nbin_intel.h | 9 +++++---- src/KOKKOS/nbin_kokkos.h | 6 +++--- src/KOKKOS/nbin_ssa_kokkos.h | 6 +++--- src/nbin.h | 2 +- src/nbin_multi.h | 10 +++++----- src/nbin_standard.h | 10 +++++----- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/DPD-REACT/nbin_ssa.h b/src/DPD-REACT/nbin_ssa.h index 5285c5b44d..ca04ed4bd5 100644 --- a/src/DPD-REACT/nbin_ssa.h +++ b/src/DPD-REACT/nbin_ssa.h @@ -41,12 +41,11 @@ class NBinSSA : public NBinStandard { int lbinzhi; // highest local bin z-dim coordinate NBinSSA(class LAMMPS *); - virtual ~NBinSSA() = default; - void bin_atoms_setup(int); - void bin_atoms(); + void bin_atoms_setup(int) override; + void bin_atoms() override; - double memory_usage(); + double memory_usage() override; inline int coord2bin(const double &x, const double &y, const double &z, int &ixo, int &iyo, int &izo) const diff --git a/src/INTEL/nbin_intel.h b/src/INTEL/nbin_intel.h index dbed37b347..8e4e387581 100644 --- a/src/INTEL/nbin_intel.h +++ b/src/INTEL/nbin_intel.h @@ -32,16 +32,17 @@ namespace LAMMPS_NS { class NBinIntel : public NBinStandard { public: NBinIntel(class LAMMPS *); - ~NBinIntel(); - void bin_atoms_setup(int); - void bin_atoms(); + ~NBinIntel() override; + + void bin_atoms_setup(int) override; + void bin_atoms() override; int *get_binpacked() { return _binpacked; } private: FixIntel *_fix; int *_atombin, *_binpacked; int _precision_mode; - double memory_usage(); + double memory_usage() override; template void bin_atoms(IntelBuffers *); diff --git a/src/KOKKOS/nbin_kokkos.h b/src/KOKKOS/nbin_kokkos.h index 1f6569177c..35bf50f48a 100644 --- a/src/KOKKOS/nbin_kokkos.h +++ b/src/KOKKOS/nbin_kokkos.h @@ -38,9 +38,9 @@ class NBinKokkos : public NBinStandard { typedef ArrayTypes AT; NBinKokkos(class LAMMPS *); - ~NBinKokkos() {} - void bin_atoms_setup(int); - void bin_atoms(); + + void bin_atoms_setup(int) override; + void bin_atoms() override; int atoms_per_bin; DAT::tdual_int_1d k_bincount; diff --git a/src/KOKKOS/nbin_ssa_kokkos.h b/src/KOKKOS/nbin_ssa_kokkos.h index eb5ade3e48..a31c57d67c 100644 --- a/src/KOKKOS/nbin_ssa_kokkos.h +++ b/src/KOKKOS/nbin_ssa_kokkos.h @@ -38,9 +38,9 @@ class NBinSSAKokkos : public NBinStandard { typedef ArrayTypes AT; NBinSSAKokkos(class LAMMPS *); - ~NBinSSAKokkos() {} - void bin_atoms_setup(int); - void bin_atoms(); + + void bin_atoms_setup(int) override; + void bin_atoms() override; // temporary array to hold the binID for each atom DAT::tdual_int_1d k_binID; diff --git a/src/nbin.h b/src/nbin.h index 6755158bc2..5d410cb46f 100644 --- a/src/nbin.h +++ b/src/nbin.h @@ -50,7 +50,7 @@ class NBin : protected Pointers { int **binhead_multi; NBin(class LAMMPS *); - ~NBin(); + ~NBin() override; void post_constructor(class NeighRequest *); virtual void copy_neighbor_info(); diff --git a/src/nbin_multi.h b/src/nbin_multi.h index cc58ee0649..ca2e66c28b 100644 --- a/src/nbin_multi.h +++ b/src/nbin_multi.h @@ -29,11 +29,11 @@ namespace LAMMPS_NS { class NBinMulti : public NBin { public: NBinMulti(class LAMMPS *); - ~NBinMulti() {} - void bin_atoms_setup(int); - void setup_bins(int); - void bin_atoms(); - double memory_usage(); + + void bin_atoms_setup(int) override; + void setup_bins(int) override; + void bin_atoms() override; + double memory_usage() override; }; } // namespace LAMMPS_NS diff --git a/src/nbin_standard.h b/src/nbin_standard.h index 405c7c88f1..ebd7d37024 100644 --- a/src/nbin_standard.h +++ b/src/nbin_standard.h @@ -29,11 +29,11 @@ namespace LAMMPS_NS { class NBinStandard : public NBin { public: NBinStandard(class LAMMPS *); - ~NBinStandard() {} - void bin_atoms_setup(int); - void setup_bins(int); - void bin_atoms(); - double memory_usage(); + + void bin_atoms_setup(int) override; + void setup_bins(int) override; + void bin_atoms() override; + double memory_usage() override; }; } // namespace LAMMPS_NS