diff --git a/src/CG-SDK/angle_sdk.h b/src/CG-SDK/angle_sdk.h
index 880f086be4..0db35444bf 100644
--- a/src/CG-SDK/angle_sdk.h
+++ b/src/CG-SDK/angle_sdk.h
@@ -27,15 +27,15 @@ namespace LAMMPS_NS {
 class AngleSDK : public Angle {
  public:
   AngleSDK(class LAMMPS *);
-  virtual ~AngleSDK();
-  virtual void compute(int, int);
-  void coeff(int, char **);
-  void init_style();
-  double equilibrium_angle(int);
-  void write_restart(FILE *);
-  void read_restart(FILE *);
-  void write_data(FILE *);
-  double single(int, int, int, int);
+  ~AngleSDK() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  void init_style() override;
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  void write_data(FILE *) override;
+  double single(int, int, int, int) override;
 
  protected:
   double *k, *theta0;
diff --git a/src/CLASS2/angle_class2.h b/src/CLASS2/angle_class2.h
index 9af64ac754..9c33e2c265 100644
--- a/src/CLASS2/angle_class2.h
+++ b/src/CLASS2/angle_class2.h
@@ -27,14 +27,14 @@ namespace LAMMPS_NS {
 class AngleClass2 : public Angle {
  public:
   AngleClass2(class LAMMPS *);
-  virtual ~AngleClass2();
-  virtual void compute(int, int);
-  virtual void coeff(int, char **);
-  double equilibrium_angle(int);
-  virtual void write_restart(FILE *);
-  void read_restart(FILE *);
-  void write_data(FILE *);
-  double single(int, int, int, int);
+  ~AngleClass2() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  void write_data(FILE *) override;
+  double single(int, int, int, int) override;
 
  protected:
   double *theta0, *k2, *k3, *k4;
diff --git a/src/DIPOLE/angle_dipole.h b/src/DIPOLE/angle_dipole.h
index d94315c5aa..d65ae84e20 100644
--- a/src/DIPOLE/angle_dipole.h
+++ b/src/DIPOLE/angle_dipole.h
@@ -27,15 +27,15 @@ namespace LAMMPS_NS {
 class AngleDipole : public Angle {
  public:
   AngleDipole(class LAMMPS *);
-  virtual ~AngleDipole();
-  virtual void compute(int, int);
-  virtual void init_style();
-  virtual void coeff(int, char **);
-  virtual double equilibrium_angle(int);
-  virtual void write_restart(FILE *);
-  virtual void read_restart(FILE *);
-  virtual void write_data(FILE *);
-  virtual double single(int, int, int, int);
+  ~AngleDipole() override;
+  void compute(int, int) override;
+  void init_style() override;
+  void coeff(int, char **) override;
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  void write_data(FILE *) override;
+  double single(int, int, int, int) override;
 
  protected:
   double *k, *gamma0;
diff --git a/src/EXTRA-MOLECULE/angle_cosine_delta.h b/src/EXTRA-MOLECULE/angle_cosine_delta.h
index ce5b001073..fda3821beb 100644
--- a/src/EXTRA-MOLECULE/angle_cosine_delta.h
+++ b/src/EXTRA-MOLECULE/angle_cosine_delta.h
@@ -27,8 +27,8 @@ namespace LAMMPS_NS {
 class AngleCosineDelta : public AngleCosineSquared {
  public:
   AngleCosineDelta(class LAMMPS *);
-  virtual void compute(int, int);
-  double single(int, int, int, int);
+  void compute(int, int) override;
+  double single(int, int, int, int) override;
 };
 
 }    // namespace LAMMPS_NS
diff --git a/src/EXTRA-MOLECULE/angle_cosine_periodic.h b/src/EXTRA-MOLECULE/angle_cosine_periodic.h
index e5c9673b78..52404b885d 100644
--- a/src/EXTRA-MOLECULE/angle_cosine_periodic.h
+++ b/src/EXTRA-MOLECULE/angle_cosine_periodic.h
@@ -27,14 +27,14 @@ namespace LAMMPS_NS {
 class AngleCosinePeriodic : public Angle {
  public:
   AngleCosinePeriodic(class LAMMPS *);
-  virtual ~AngleCosinePeriodic();
-  virtual void compute(int, int);
-  void coeff(int, char **);
-  double equilibrium_angle(int);
-  void write_restart(FILE *);
-  void read_restart(FILE *);
-  void write_data(FILE *);
-  double single(int, int, int, int);
+  ~AngleCosinePeriodic() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  void write_data(FILE *) override;
+  double single(int, int, int, int) override;
 
  protected:
   double *k;
diff --git a/src/EXTRA-MOLECULE/angle_cosine_shift.h b/src/EXTRA-MOLECULE/angle_cosine_shift.h
index 038d31e501..f52c532bba 100644
--- a/src/EXTRA-MOLECULE/angle_cosine_shift.h
+++ b/src/EXTRA-MOLECULE/angle_cosine_shift.h
@@ -27,14 +27,14 @@ namespace LAMMPS_NS {
 class AngleCosineShift : public Angle {
  public:
   AngleCosineShift(class LAMMPS *);
-  virtual ~AngleCosineShift();
-  virtual void compute(int, int);
-  void coeff(int, char **);
-  double equilibrium_angle(int);
-  void write_restart(FILE *);
-  void read_restart(FILE *);
-  void write_data(FILE *);
-  double single(int, int, int, int);
+  ~AngleCosineShift() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  void write_data(FILE *) override;
+  double single(int, int, int, int) override;
 
  protected:
   double *k;
diff --git a/src/EXTRA-MOLECULE/angle_cosine_shift_exp.h b/src/EXTRA-MOLECULE/angle_cosine_shift_exp.h
index 6ebbb1185b..f372d9bc30 100644
--- a/src/EXTRA-MOLECULE/angle_cosine_shift_exp.h
+++ b/src/EXTRA-MOLECULE/angle_cosine_shift_exp.h
@@ -27,14 +27,14 @@ namespace LAMMPS_NS {
 class AngleCosineShiftExp : public Angle {
  public:
   AngleCosineShiftExp(class LAMMPS *);
-  virtual ~AngleCosineShiftExp();
-  virtual void compute(int, int);
-  void coeff(int, char **);
-  double equilibrium_angle(int);
-  void write_restart(FILE *);
-  void read_restart(FILE *);
-  void write_data(FILE *);
-  double single(int, int, int, int);
+  ~AngleCosineShiftExp() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  void write_data(FILE *) override;
+  double single(int, int, int, int) override;
 
  protected:
   bool *doExpansion;
diff --git a/src/EXTRA-MOLECULE/angle_fourier.h b/src/EXTRA-MOLECULE/angle_fourier.h
index daaab5351f..84859fc216 100644
--- a/src/EXTRA-MOLECULE/angle_fourier.h
+++ b/src/EXTRA-MOLECULE/angle_fourier.h
@@ -27,14 +27,14 @@ namespace LAMMPS_NS {
 class AngleFourier : public Angle {
  public:
   AngleFourier(class LAMMPS *);
-  virtual ~AngleFourier();
-  virtual void compute(int, int);
-  void coeff(int, char **);
-  double equilibrium_angle(int);
-  void write_restart(FILE *);
-  void read_restart(FILE *);
-  void write_data(FILE *);
-  virtual double single(int, int, int, int);
+  ~AngleFourier() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  void write_data(FILE *) override;
+  double single(int, int, int, int) override;
 
  protected:
   double *k, *C0, *C1, *C2;
diff --git a/src/EXTRA-MOLECULE/angle_fourier_simple.h b/src/EXTRA-MOLECULE/angle_fourier_simple.h
index 815ed99109..d66f32f13f 100644
--- a/src/EXTRA-MOLECULE/angle_fourier_simple.h
+++ b/src/EXTRA-MOLECULE/angle_fourier_simple.h
@@ -27,14 +27,14 @@ namespace LAMMPS_NS {
 class AngleFourierSimple : public Angle {
  public:
   AngleFourierSimple(class LAMMPS *);
-  virtual ~AngleFourierSimple();
-  virtual void compute(int, int);
-  void coeff(int, char **);
-  double equilibrium_angle(int);
-  void write_restart(FILE *);
-  void read_restart(FILE *);
-  void write_data(FILE *);
-  virtual double single(int, int, int, int);
+  ~AngleFourierSimple() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  void write_data(FILE *) override;
+  double single(int, int, int, int) override;
 
  protected:
   double *k, *C, *N;
diff --git a/src/EXTRA-MOLECULE/angle_gaussian.h b/src/EXTRA-MOLECULE/angle_gaussian.h
index 654872205f..76c7552c31 100644
--- a/src/EXTRA-MOLECULE/angle_gaussian.h
+++ b/src/EXTRA-MOLECULE/angle_gaussian.h
@@ -27,14 +27,14 @@ namespace LAMMPS_NS {
 class AngleGaussian : public Angle {
  public:
   AngleGaussian(class LAMMPS *);
-  virtual ~AngleGaussian();
-  virtual void compute(int, int);
-  virtual void coeff(int, char **);
-  double equilibrium_angle(int);
-  void write_restart(FILE *);
-  virtual void read_restart(FILE *);
-  void write_data(FILE *);
-  double single(int, int, int, int);
+  ~AngleGaussian() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  void write_data(FILE *) override;
+  double single(int, int, int, int) override;
 
  protected:
   int *nterms;
diff --git a/src/EXTRA-MOLECULE/angle_quartic.h b/src/EXTRA-MOLECULE/angle_quartic.h
index 0d352fac52..1253ec2f0f 100644
--- a/src/EXTRA-MOLECULE/angle_quartic.h
+++ b/src/EXTRA-MOLECULE/angle_quartic.h
@@ -27,14 +27,14 @@ namespace LAMMPS_NS {
 class AngleQuartic : public Angle {
  public:
   AngleQuartic(class LAMMPS *);
-  virtual ~AngleQuartic();
-  virtual void compute(int, int);
-  void coeff(int, char **);
-  double equilibrium_angle(int);
-  void write_restart(FILE *);
-  void read_restart(FILE *);
-  void write_data(FILE *);
-  double single(int, int, int, int);
+  ~AngleQuartic() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  void write_data(FILE *) override;
+  double single(int, int, int, int) override;
 
  protected:
   double *k2, *k3, *k4, *theta0;
diff --git a/src/INTEL/angle_charmm_intel.h b/src/INTEL/angle_charmm_intel.h
index 942ac942a1..6758602843 100644
--- a/src/INTEL/angle_charmm_intel.h
+++ b/src/INTEL/angle_charmm_intel.h
@@ -33,9 +33,9 @@ namespace LAMMPS_NS {
 class AngleCharmmIntel : public AngleCharmm {
  public:
   AngleCharmmIntel(class LAMMPS *);
-  virtual ~AngleCharmmIntel();
-  virtual void compute(int, int);
-  virtual void init_style();
+  ~AngleCharmmIntel() override;
+  void compute(int, int) override;
+  void init_style() override;
 
  protected:
   FixIntel *fix;
diff --git a/src/INTEL/angle_harmonic_intel.h b/src/INTEL/angle_harmonic_intel.h
index 10bdcd9546..650e5363a3 100644
--- a/src/INTEL/angle_harmonic_intel.h
+++ b/src/INTEL/angle_harmonic_intel.h
@@ -33,9 +33,9 @@ namespace LAMMPS_NS {
 class AngleHarmonicIntel : public AngleHarmonic {
  public:
   AngleHarmonicIntel(class LAMMPS *);
-  virtual ~AngleHarmonicIntel();
-  virtual void compute(int, int);
-  virtual void init_style();
+  ~AngleHarmonicIntel() override;
+  void compute(int, int) override;
+  void init_style() override;
 
  protected:
   FixIntel *fix;
diff --git a/src/KOKKOS/angle_charmm_kokkos.h b/src/KOKKOS/angle_charmm_kokkos.h
index 73f2e7447c..b74b1e2886 100644
--- a/src/KOKKOS/angle_charmm_kokkos.h
+++ b/src/KOKKOS/angle_charmm_kokkos.h
@@ -38,10 +38,10 @@ class AngleCharmmKokkos : public AngleCharmm {
   typedef EV_FLOAT value_type;
 
   AngleCharmmKokkos(class LAMMPS *);
-  virtual ~AngleCharmmKokkos();
-  void compute(int, int);
-  void coeff(int, char **);
-  void read_restart(FILE *);
+  ~AngleCharmmKokkos() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  void read_restart(FILE *) override;
 
   template<int NEWTON_BOND, int EVFLAG>
   KOKKOS_INLINE_FUNCTION
@@ -82,7 +82,7 @@ class AngleCharmmKokkos : public AngleCharmm {
   typename AT::t_ffloat_1d d_k_ub;
   typename AT::t_ffloat_1d d_r_ub;
 
-  void allocate();
+  void allocate() override;
 };
 
 }
diff --git a/src/KOKKOS/angle_class2_kokkos.h b/src/KOKKOS/angle_class2_kokkos.h
index 26b147e1b1..e708b0ebad 100644
--- a/src/KOKKOS/angle_class2_kokkos.h
+++ b/src/KOKKOS/angle_class2_kokkos.h
@@ -40,10 +40,10 @@ class AngleClass2Kokkos : public AngleClass2 {
   typedef EV_FLOAT value_type;
 
   AngleClass2Kokkos(class LAMMPS *);
-  virtual ~AngleClass2Kokkos();
-  void compute(int, int);
-  void coeff(int, char **);
-  void read_restart(FILE *);
+  ~AngleClass2Kokkos() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  void read_restart(FILE *) override;
 
   template<int NEWTON_BOND, int EVFLAG>
   KOKKOS_INLINE_FUNCTION
diff --git a/src/KOKKOS/angle_cosine_kokkos.h b/src/KOKKOS/angle_cosine_kokkos.h
index e23fe622a7..0235c087b0 100644
--- a/src/KOKKOS/angle_cosine_kokkos.h
+++ b/src/KOKKOS/angle_cosine_kokkos.h
@@ -39,10 +39,10 @@ class AngleCosineKokkos : public AngleCosine {
   typedef EV_FLOAT value_type;
 
   AngleCosineKokkos(class LAMMPS *);
-  virtual ~AngleCosineKokkos();
-  void compute(int, int);
-  void coeff(int, char **);
-  void read_restart(FILE *);
+  ~AngleCosineKokkos() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  void read_restart(FILE *) override;
 
   template<int NEWTON_BOND, int EVFLAG>
   KOKKOS_INLINE_FUNCTION
@@ -78,7 +78,7 @@ class AngleCosineKokkos : public AngleCosine {
   typename ArrayTypes<DeviceType>::tdual_ffloat_1d k_k;
   typename ArrayTypes<DeviceType>::t_ffloat_1d d_k;
 
-  void allocate();
+  void allocate() override;
 };
 
 }
diff --git a/src/KOKKOS/angle_harmonic_kokkos.h b/src/KOKKOS/angle_harmonic_kokkos.h
index f32aca6044..1c1f0b1830 100644
--- a/src/KOKKOS/angle_harmonic_kokkos.h
+++ b/src/KOKKOS/angle_harmonic_kokkos.h
@@ -39,10 +39,10 @@ class AngleHarmonicKokkos : public AngleHarmonic {
   typedef EV_FLOAT value_type;
 
   AngleHarmonicKokkos(class LAMMPS *);
-  virtual ~AngleHarmonicKokkos();
-  void compute(int, int);
-  void coeff(int, char **);
-  void read_restart(FILE *);
+  ~AngleHarmonicKokkos() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  void read_restart(FILE *) override;
 
   template<int NEWTON_BOND, int EVFLAG>
   KOKKOS_INLINE_FUNCTION
@@ -81,7 +81,7 @@ class AngleHarmonicKokkos : public AngleHarmonic {
   typename ArrayTypes<DeviceType>::t_ffloat_1d d_k;
   typename ArrayTypes<DeviceType>::t_ffloat_1d d_theta0;
 
-  void allocate();
+  void allocate() override;
 };
 
 }
diff --git a/src/MOFFF/angle_class2_p6.h b/src/MOFFF/angle_class2_p6.h
index fcefa99eb2..b4f2e9ff6a 100644
--- a/src/MOFFF/angle_class2_p6.h
+++ b/src/MOFFF/angle_class2_p6.h
@@ -27,14 +27,14 @@ namespace LAMMPS_NS {
 class AngleClass2P6 : public Angle {
  public:
   AngleClass2P6(class LAMMPS *);
-  virtual ~AngleClass2P6();
-  virtual void compute(int, int);
-  void coeff(int, char **);
-  double equilibrium_angle(int);
-  void write_restart(FILE *);
-  void read_restart(FILE *);
-  void write_data(FILE *);
-  double single(int, int, int, int);
+  ~AngleClass2P6() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  void write_data(FILE *) override;
+  double single(int, int, int, int) override;
 
  protected:
   double *theta0, *k2, *k3, *k4, *k5, *k6;
diff --git a/src/MOFFF/angle_cosine_buck6d.h b/src/MOFFF/angle_cosine_buck6d.h
index 44d47ea39d..268ae71141 100644
--- a/src/MOFFF/angle_cosine_buck6d.h
+++ b/src/MOFFF/angle_cosine_buck6d.h
@@ -27,15 +27,15 @@ namespace LAMMPS_NS {
 class AngleCosineBuck6d : public Angle {
  public:
   AngleCosineBuck6d(class LAMMPS *);
-  virtual ~AngleCosineBuck6d();
-  virtual void compute(int, int);
-  void coeff(int, char **);
-  void init_style();
-  double equilibrium_angle(int);
-  void write_restart(FILE *);
-  void read_restart(FILE *);
-  void write_data(FILE *);
-  double single(int, int, int, int);
+  ~AngleCosineBuck6d() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  void init_style() override;
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  void write_data(FILE *) override;
+  double single(int, int, int, int) override;
 
  protected:
   double *k, *th0;
diff --git a/src/MOLECULE/angle_charmm.h b/src/MOLECULE/angle_charmm.h
index 72bae696cb..f864573ce7 100644
--- a/src/MOLECULE/angle_charmm.h
+++ b/src/MOLECULE/angle_charmm.h
@@ -27,14 +27,14 @@ namespace LAMMPS_NS {
 class AngleCharmm : public Angle {
  public:
   AngleCharmm(class LAMMPS *);
-  virtual ~AngleCharmm();
-  virtual void compute(int, int);
-  virtual void coeff(int, char **);
-  double equilibrium_angle(int);
-  void write_restart(FILE *);
-  virtual void read_restart(FILE *);
-  void write_data(FILE *);
-  double single(int, int, int, int);
+  ~AngleCharmm() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  void write_data(FILE *) override;
+  double single(int, int, int, int) override;
 
  protected:
   double *k, *theta0, *k_ub, *r_ub;
diff --git a/src/MOLECULE/angle_cosine.h b/src/MOLECULE/angle_cosine.h
index 2c7b0ddbc4..19b6222c87 100644
--- a/src/MOLECULE/angle_cosine.h
+++ b/src/MOLECULE/angle_cosine.h
@@ -27,14 +27,14 @@ namespace LAMMPS_NS {
 class AngleCosine : public Angle {
  public:
   AngleCosine(class LAMMPS *);
-  virtual ~AngleCosine();
-  virtual void compute(int, int);
-  virtual void coeff(int, char **);
-  double equilibrium_angle(int);
-  void write_restart(FILE *);
-  virtual void read_restart(FILE *);
-  void write_data(FILE *);
-  double single(int, int, int, int);
+  ~AngleCosine() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  void write_data(FILE *) override;
+  double single(int, int, int, int) override;
 
  protected:
   double *k;
diff --git a/src/MOLECULE/angle_cosine_squared.h b/src/MOLECULE/angle_cosine_squared.h
index d36aac64dd..d8f282ac47 100644
--- a/src/MOLECULE/angle_cosine_squared.h
+++ b/src/MOLECULE/angle_cosine_squared.h
@@ -27,14 +27,14 @@ namespace LAMMPS_NS {
 class AngleCosineSquared : public Angle {
  public:
   AngleCosineSquared(class LAMMPS *);
-  virtual ~AngleCosineSquared();
-  virtual void compute(int, int);
-  void coeff(int, char **);
-  double equilibrium_angle(int);
-  void write_restart(FILE *);
-  void read_restart(FILE *);
-  void write_data(FILE *);
-  virtual double single(int, int, int, int);
+  ~AngleCosineSquared() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  void write_data(FILE *) override;
+  double single(int, int, int, int) override;
 
  protected:
   double *k, *theta0;
diff --git a/src/MOLECULE/angle_harmonic.h b/src/MOLECULE/angle_harmonic.h
index e722f7d065..718ac4bd0a 100644
--- a/src/MOLECULE/angle_harmonic.h
+++ b/src/MOLECULE/angle_harmonic.h
@@ -27,14 +27,14 @@ namespace LAMMPS_NS {
 class AngleHarmonic : public Angle {
  public:
   AngleHarmonic(class LAMMPS *);
-  virtual ~AngleHarmonic();
-  virtual void compute(int, int);
-  virtual void coeff(int, char **);
-  double equilibrium_angle(int);
-  void write_restart(FILE *);
-  virtual void read_restart(FILE *);
-  void write_data(FILE *);
-  double single(int, int, int, int);
+  ~AngleHarmonic() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  void write_data(FILE *) override;
+  double single(int, int, int, int) override;
 
  protected:
   double *k, *theta0;
diff --git a/src/MOLECULE/angle_table.h b/src/MOLECULE/angle_table.h
index 6b95cb6a23..83a53ecdd5 100644
--- a/src/MOLECULE/angle_table.h
+++ b/src/MOLECULE/angle_table.h
@@ -27,16 +27,16 @@ namespace LAMMPS_NS {
 class AngleTable : public Angle {
  public:
   AngleTable(class LAMMPS *);
-  virtual ~AngleTable();
-  virtual void compute(int, int);
-  void settings(int, char **);
-  void coeff(int, char **);
-  double equilibrium_angle(int);
-  void write_restart(FILE *);
-  void read_restart(FILE *);
-  void write_restart_settings(FILE *);
-  void read_restart_settings(FILE *);
-  double single(int, int, int, int);
+  ~AngleTable() override;
+  void compute(int, int) override;
+  void settings(int, char **) override;
+  void coeff(int, char **) override;
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  void write_restart_settings(FILE *) override;
+  void read_restart_settings(FILE *) override;
+  double single(int, int, int, int) override;
 
  protected:
   int tabstyle, tablength;
diff --git a/src/OPENMP/angle_charmm_omp.h b/src/OPENMP/angle_charmm_omp.h
index 80e3777071..f478dfdc89 100644
--- a/src/OPENMP/angle_charmm_omp.h
+++ b/src/OPENMP/angle_charmm_omp.h
@@ -33,7 +33,7 @@ class AngleCharmmOMP : public AngleCharmm, public ThrOMP {
 
  public:
   AngleCharmmOMP(class LAMMPS *lmp);
-  virtual void compute(int, int);
+  void compute(int, int) override;
 
  private:
   template <int EVFLAG, int EFLAG, int NEWTON_BOND>
diff --git a/src/OPENMP/angle_class2_omp.h b/src/OPENMP/angle_class2_omp.h
index 03ab80ce23..a9753c2e6b 100644
--- a/src/OPENMP/angle_class2_omp.h
+++ b/src/OPENMP/angle_class2_omp.h
@@ -33,7 +33,7 @@ class AngleClass2OMP : public AngleClass2, public ThrOMP {
 
  public:
   AngleClass2OMP(class LAMMPS *lmp);
-  virtual void compute(int, int);
+  void compute(int, int) override;
 
  private:
   template <int EVFLAG, int EFLAG, int NEWTON_BOND>
diff --git a/src/OPENMP/angle_cosine_delta_omp.h b/src/OPENMP/angle_cosine_delta_omp.h
index 5cd17c5c17..e5e70a24f9 100644
--- a/src/OPENMP/angle_cosine_delta_omp.h
+++ b/src/OPENMP/angle_cosine_delta_omp.h
@@ -33,7 +33,7 @@ class AngleCosineDeltaOMP : public AngleCosineDelta, public ThrOMP {
 
  public:
   AngleCosineDeltaOMP(class LAMMPS *lmp);
-  virtual void compute(int, int);
+  void compute(int, int) override;
 
  private:
   template <int EVFLAG, int EFLAG, int NEWTON_BOND>
diff --git a/src/OPENMP/angle_cosine_omp.h b/src/OPENMP/angle_cosine_omp.h
index a02f5340ff..25d07fc565 100644
--- a/src/OPENMP/angle_cosine_omp.h
+++ b/src/OPENMP/angle_cosine_omp.h
@@ -33,7 +33,7 @@ class AngleCosineOMP : public AngleCosine, public ThrOMP {
 
  public:
   AngleCosineOMP(class LAMMPS *lmp);
-  virtual void compute(int, int);
+  void compute(int, int) override;
 
  private:
   template <int EVFLAG, int EFLAG, int NEWTON_BOND>
diff --git a/src/OPENMP/angle_cosine_periodic_omp.h b/src/OPENMP/angle_cosine_periodic_omp.h
index 30507be888..45a02cf2c4 100644
--- a/src/OPENMP/angle_cosine_periodic_omp.h
+++ b/src/OPENMP/angle_cosine_periodic_omp.h
@@ -33,7 +33,7 @@ class AngleCosinePeriodicOMP : public AngleCosinePeriodic, public ThrOMP {
 
  public:
   AngleCosinePeriodicOMP(class LAMMPS *lmp);
-  virtual void compute(int, int);
+  void compute(int, int) override;
 
  private:
   template <int EVFLAG, int EFLAG, int NEWTON_BOND>
diff --git a/src/OPENMP/angle_cosine_shift_exp_omp.h b/src/OPENMP/angle_cosine_shift_exp_omp.h
index e8003e6168..b394e7e529 100644
--- a/src/OPENMP/angle_cosine_shift_exp_omp.h
+++ b/src/OPENMP/angle_cosine_shift_exp_omp.h
@@ -33,7 +33,7 @@ class AngleCosineShiftExpOMP : public AngleCosineShiftExp, public ThrOMP {
 
  public:
   AngleCosineShiftExpOMP(class LAMMPS *lmp);
-  virtual void compute(int, int);
+  void compute(int, int) override;
 
  private:
   template <int EVFLAG, int EFLAG, int NEWTON_BOND>
diff --git a/src/OPENMP/angle_cosine_shift_omp.h b/src/OPENMP/angle_cosine_shift_omp.h
index 2502534c28..073f5288f3 100644
--- a/src/OPENMP/angle_cosine_shift_omp.h
+++ b/src/OPENMP/angle_cosine_shift_omp.h
@@ -33,7 +33,7 @@ class AngleCosineShiftOMP : public AngleCosineShift, public ThrOMP {
 
  public:
   AngleCosineShiftOMP(class LAMMPS *lmp);
-  virtual void compute(int, int);
+  void compute(int, int) override;
 
  private:
   template <int EVFLAG, int EFLAG, int NEWTON_BOND>
diff --git a/src/OPENMP/angle_cosine_squared_omp.h b/src/OPENMP/angle_cosine_squared_omp.h
index 028fe66be3..50b22fe5e4 100644
--- a/src/OPENMP/angle_cosine_squared_omp.h
+++ b/src/OPENMP/angle_cosine_squared_omp.h
@@ -33,7 +33,7 @@ class AngleCosineSquaredOMP : public AngleCosineSquared, public ThrOMP {
 
  public:
   AngleCosineSquaredOMP(class LAMMPS *lmp);
-  virtual void compute(int, int);
+  void compute(int, int) override;
 
  private:
   template <int EVFLAG, int EFLAG, int NEWTON_BOND>
diff --git a/src/OPENMP/angle_dipole_omp.h b/src/OPENMP/angle_dipole_omp.h
index fd3376d80f..ddd7aac6ea 100644
--- a/src/OPENMP/angle_dipole_omp.h
+++ b/src/OPENMP/angle_dipole_omp.h
@@ -33,7 +33,7 @@ class AngleDipoleOMP : public AngleDipole, public ThrOMP {
 
  public:
   AngleDipoleOMP(class LAMMPS *lmp);
-  virtual void compute(int, int);
+  void compute(int, int) override;
 
  private:
   template <int EFLAG> void eval(int ifrom, int ito, ThrData *const thr);
diff --git a/src/OPENMP/angle_fourier_omp.h b/src/OPENMP/angle_fourier_omp.h
index 94ea79aaa0..9a5964df49 100644
--- a/src/OPENMP/angle_fourier_omp.h
+++ b/src/OPENMP/angle_fourier_omp.h
@@ -33,7 +33,7 @@ class AngleFourierOMP : public AngleFourier, public ThrOMP {
 
  public:
   AngleFourierOMP(class LAMMPS *lmp);
-  virtual void compute(int, int);
+  void compute(int, int) override;
 
  private:
   template <int EVFLAG, int EFLAG, int NEWTON_BOND>
diff --git a/src/OPENMP/angle_fourier_simple_omp.h b/src/OPENMP/angle_fourier_simple_omp.h
index 43893732d3..db96dbfb86 100644
--- a/src/OPENMP/angle_fourier_simple_omp.h
+++ b/src/OPENMP/angle_fourier_simple_omp.h
@@ -33,7 +33,7 @@ class AngleFourierSimpleOMP : public AngleFourierSimple, public ThrOMP {
 
  public:
   AngleFourierSimpleOMP(class LAMMPS *lmp);
-  virtual void compute(int, int);
+  void compute(int, int) override;
 
  private:
   template <int EVFLAG, int EFLAG, int NEWTON_BOND>
diff --git a/src/OPENMP/angle_harmonic_omp.h b/src/OPENMP/angle_harmonic_omp.h
index 4e292deed9..8c6cc39f7a 100644
--- a/src/OPENMP/angle_harmonic_omp.h
+++ b/src/OPENMP/angle_harmonic_omp.h
@@ -33,7 +33,7 @@ class AngleHarmonicOMP : public AngleHarmonic, public ThrOMP {
 
  public:
   AngleHarmonicOMP(class LAMMPS *lmp);
-  virtual void compute(int, int);
+  void compute(int, int) override;
 
  private:
   template <int EVFLAG, int EFLAG, int NEWTON_BOND>
diff --git a/src/OPENMP/angle_quartic_omp.h b/src/OPENMP/angle_quartic_omp.h
index a2bb6666ea..7953891d55 100644
--- a/src/OPENMP/angle_quartic_omp.h
+++ b/src/OPENMP/angle_quartic_omp.h
@@ -33,7 +33,7 @@ class AngleQuarticOMP : public AngleQuartic, public ThrOMP {
 
  public:
   AngleQuarticOMP(class LAMMPS *lmp);
-  virtual void compute(int, int);
+  void compute(int, int) override;
 
  private:
   template <int EVFLAG, int EFLAG, int NEWTON_BOND>
diff --git a/src/OPENMP/angle_sdk_omp.h b/src/OPENMP/angle_sdk_omp.h
index 1c32222488..c4d12787f9 100644
--- a/src/OPENMP/angle_sdk_omp.h
+++ b/src/OPENMP/angle_sdk_omp.h
@@ -33,7 +33,7 @@ class AngleSDKOMP : public AngleSDK, public ThrOMP {
 
  public:
   AngleSDKOMP(class LAMMPS *lmp);
-  virtual void compute(int, int);
+  void compute(int, int) override;
 
  private:
   template <int EVFLAG, int EFLAG, int NEWTON_BOND>
diff --git a/src/OPENMP/angle_table_omp.h b/src/OPENMP/angle_table_omp.h
index 1e8a55c56a..585e40a934 100644
--- a/src/OPENMP/angle_table_omp.h
+++ b/src/OPENMP/angle_table_omp.h
@@ -33,7 +33,7 @@ class AngleTableOMP : public AngleTable, public ThrOMP {
 
  public:
   AngleTableOMP(class LAMMPS *lmp);
-  virtual void compute(int, int);
+  void compute(int, int) override;
 
  private:
   template <int EVFLAG, int EFLAG, int NEWTON_BOND>
diff --git a/src/YAFF/angle_cross.h b/src/YAFF/angle_cross.h
index a23aea3f38..c2cb07b143 100644
--- a/src/YAFF/angle_cross.h
+++ b/src/YAFF/angle_cross.h
@@ -27,14 +27,14 @@ namespace LAMMPS_NS {
 class AngleCross : public Angle {
  public:
   AngleCross(class LAMMPS *);
-  virtual ~AngleCross();
-  virtual void compute(int, int);
-  void coeff(int, char **);
-  double equilibrium_angle(int);
-  void write_restart(FILE *);
-  void read_restart(FILE *);
-  void write_data(FILE *);
-  double single(int, int, int, int);
+  ~AngleCross() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  void write_data(FILE *) override;
+  double single(int, int, int, int) override;
 
  protected:
   double *kss, *kbs0, *kbs1, *r00, *r01, *theta0;
diff --git a/src/YAFF/angle_mm3.h b/src/YAFF/angle_mm3.h
index c61823813e..18ff0a59fc 100644
--- a/src/YAFF/angle_mm3.h
+++ b/src/YAFF/angle_mm3.h
@@ -27,14 +27,14 @@ namespace LAMMPS_NS {
 class AngleMM3 : public Angle {
  public:
   AngleMM3(class LAMMPS *);
-  virtual ~AngleMM3();
-  virtual void compute(int, int);
-  void coeff(int, char **);
-  double equilibrium_angle(int);
-  void write_restart(FILE *);
-  void read_restart(FILE *);
-  void write_data(FILE *);
-  double single(int, int, int, int);
+  ~AngleMM3() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  void write_data(FILE *) override;
+  double single(int, int, int, int) override;
 
  protected:
   double *theta0, *k2;
diff --git a/src/angle_deprecated.h b/src/angle_deprecated.h
index ba94e0ef10..70e834bf9e 100644
--- a/src/angle_deprecated.h
+++ b/src/angle_deprecated.h
@@ -27,15 +27,14 @@ namespace LAMMPS_NS {
 class AngleDeprecated : public Angle {
  public:
   AngleDeprecated(class LAMMPS *lmp) : Angle(lmp) {}
-  virtual ~AngleDeprecated() {}
 
-  virtual void compute(int, int) {}
-  virtual void settings(int, char **);
-  virtual void coeff(int, char **) {}
-  virtual double equilibrium_angle(int) { return 0.0; }
-  virtual void write_restart(FILE *) {}
-  virtual void read_restart(FILE *) {}
-  virtual double single(int, int, int, int) { return 0.0; }
+  void compute(int, int) override {}
+  void settings(int, char **) override;
+  void coeff(int, char **) override {}
+  double equilibrium_angle(int) override { return 0.0; }
+  void write_restart(FILE *) override {}
+  void read_restart(FILE *) override {}
+  double single(int, int, int, int) override { return 0.0; }
 };
 
 }    // namespace LAMMPS_NS
diff --git a/src/angle_hybrid.h b/src/angle_hybrid.h
index f0286af6f5..1deb9a6a14 100644
--- a/src/angle_hybrid.h
+++ b/src/angle_hybrid.h
@@ -31,16 +31,16 @@ class AngleHybrid : public Angle {
   char **keywords;    // keyword for each Angle style
 
   AngleHybrid(class LAMMPS *);
-  ~AngleHybrid();
-  void compute(int, int);
-  void settings(int, char **);
-  void coeff(int, char **);
-  void init_style();
-  double equilibrium_angle(int);
-  void write_restart(FILE *);
-  void read_restart(FILE *);
-  double single(int, int, int, int);
-  double memory_usage();
+  ~AngleHybrid() override;
+  void compute(int, int) override;
+  void settings(int, char **) override;
+  void coeff(int, char **) override;
+  void init_style() override;
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  double single(int, int, int, int) override;
+  double memory_usage() override;
 
  private:
   int *map;    // which style each angle type points to
diff --git a/src/angle_zero.h b/src/angle_zero.h
index c41fc1a6ff..47bc4aac4f 100644
--- a/src/angle_zero.h
+++ b/src/angle_zero.h
@@ -27,17 +27,17 @@ namespace LAMMPS_NS {
 class AngleZero : public Angle {
  public:
   AngleZero(class LAMMPS *);
-  virtual ~AngleZero();
-  virtual void compute(int, int);
-  virtual void coeff(int, char **);
-  virtual void settings(int, char **);
+  ~AngleZero() override;
+  void compute(int, int) override;
+  void coeff(int, char **) override;
+  void settings(int, char **) override;
 
-  double equilibrium_angle(int);
-  void write_restart(FILE *);
-  void read_restart(FILE *);
-  void write_data(FILE *);
+  double equilibrium_angle(int) override;
+  void write_restart(FILE *) override;
+  void read_restart(FILE *) override;
+  void write_data(FILE *) override;
 
-  double single(int, int, int, int);
+  double single(int, int, int, int) override;
 
  protected:
   double *theta0;