From 44bc76606095280c88d74e3cc8a94351220ab7f0 Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Fri, 21 Jan 2022 16:58:32 -0500 Subject: [PATCH] Apply override to more classes --- src/ADIOS/dump_atom_adios.h | 8 ++-- src/ADIOS/dump_custom_adios.h | 8 ++-- src/ADIOS/reader_adios.h | 18 ++++---- src/ATC/fix_atc.h | 74 ++++++++++++++++---------------- src/H5MD/dump_h5md.h | 14 +++--- src/KOKKOS/fix_langevin_kokkos.h | 18 ++++---- src/PYTHON/fix_python_invoke.h | 8 ++-- src/PYTHON/fix_python_move.h | 16 +++---- src/PYTHON/pair_python.h | 12 +++--- src/PYTHON/python_impl.h | 18 ++++---- src/exceptions.h | 4 +- src/lmppython.h | 2 +- src/procmap.h | 2 +- 13 files changed, 100 insertions(+), 102 deletions(-) diff --git a/src/ADIOS/dump_atom_adios.h b/src/ADIOS/dump_atom_adios.h index 783abaf915..850c4dbf8e 100644 --- a/src/ADIOS/dump_atom_adios.h +++ b/src/ADIOS/dump_atom_adios.h @@ -30,12 +30,12 @@ class DumpAtomADIOS : public DumpAtom { public: DumpAtomADIOS(class LAMMPS *, int, char **); - virtual ~DumpAtomADIOS(); + ~DumpAtomADIOS() override; protected: - virtual void openfile(); - virtual void write(); - virtual void init_style(); + void openfile() override; + void write() override; + void init_style() override; private: DumpAtomADIOSInternal *internal; diff --git a/src/ADIOS/dump_custom_adios.h b/src/ADIOS/dump_custom_adios.h index ae327f0db5..fde46a0754 100644 --- a/src/ADIOS/dump_custom_adios.h +++ b/src/ADIOS/dump_custom_adios.h @@ -29,12 +29,12 @@ class DumpCustomADIOSInternal; class DumpCustomADIOS : public DumpCustom { public: DumpCustomADIOS(class LAMMPS *, int, char **); - virtual ~DumpCustomADIOS(); + ~DumpCustomADIOS() override; protected: - virtual void openfile(); - virtual void write(); - virtual void init_style(); + void openfile() override; + void write() override; + void init_style() override; private: DumpCustomADIOSInternal *internal; diff --git a/src/ADIOS/reader_adios.h b/src/ADIOS/reader_adios.h index 1d8f2a3773..e59c677489 100644 --- a/src/ADIOS/reader_adios.h +++ b/src/ADIOS/reader_adios.h @@ -34,18 +34,18 @@ class ReadADIOSInternal; class ReaderADIOS : public Reader { public: ReaderADIOS(class LAMMPS *); - virtual ~ReaderADIOS(); + ~ReaderADIOS() override; - virtual void settings(int, char **); + void settings(int, char **) override; - virtual int read_time(bigint &); - virtual void skip(); - virtual bigint read_header(double[3][3], int &, int &, int, int, int *, char **, int, int, int &, - int &, int &, int &); - virtual void read_atoms(int, int, double **); + int read_time(bigint &) override; + void skip() override; + bigint read_header(double[3][3], int &, int &, int, int, int *, char **, int, int, int &, + int &, int &, int &) override; + void read_atoms(int, int, double **) override; - virtual void open_file(const char *); - virtual void close_file(); + void open_file(const char *) override; + void close_file() override; private: int *fieldindex; // mapping of input fields to dump diff --git a/src/ATC/fix_atc.h b/src/ATC/fix_atc.h index 1b34604aa2..cf8c555cac 100644 --- a/src/ATC/fix_atc.h +++ b/src/ATC/fix_atc.h @@ -37,91 +37,91 @@ class FixATC : public Fix { public: /** constructor & destructor */ FixATC(class LAMMPS *, int, char **); - ~FixATC(); + ~FixATC() override; /** initialization functions */ - void init(); - void init_list(int id, NeighList *ptr); - void setup(int vflag); - void min_setup(int vflag); + void init() override; + void init_list(int id, NeighList *ptr) override; + void setup(int vflag) override; + void min_setup(int vflag) override; /** setmask: tell LAMMPS which fix methods to call */ - int setmask(); + int setmask() override; /** initial_integrate */ - void initial_integrate(int vflag); + void initial_integrate(int vflag) override; /** after first integrate phase */ - void post_integrate(); + void post_integrate() override; /** final_integrate */ - void final_integrate(); + void final_integrate() override; /** end of step for run or minimize */ - void end_of_step(); + void end_of_step() override; /** pre_exchange is used to modify fix-specific data and is called before domain->pbc() and comm->exchange(). */ - void setup_pre_exchange(); - void pre_exchange(); - void min_pre_exchange(); + void setup_pre_exchange() override; + void pre_exchange() override; + void min_pre_exchange() override; - double memory_usage(); - void grow_arrays(int); - void copy_arrays(int, int, int); + double memory_usage() override; + void grow_arrays(int) override; + void copy_arrays(int, int, int) override; /** pack_exchange called from atom_vec->pack_exchange() and packs fix-specific data for a given real (local) atom being sent to another processor. */ - int pack_exchange(int, double *); + int pack_exchange(int, double *) override; /** unpack_exchange called from atom_vec->unpack_exchange() and unpacks fix-specific data for a given real (local) atom received from another processor. */ - int unpack_exchange(int, double *); + int unpack_exchange(int, double *) override; /** pack_comm called from comm->forward_comm_fix and packs fix-specific data for a given ghost atom from exchange with another proc */ - int pack_forward_comm(int, int *, double *, int, int *); + int pack_forward_comm(int, int *, double *, int, int *) override; /** unpack_comm called from comm->forward_comm_fix and unpacks fix-specific data for a given ghost atom from exchange with another proc */ - void unpack_forward_comm(int, int, double *); + void unpack_forward_comm(int, int, double *) override; /** pre_neighbor is used to modify fix-specific data and is called before neighbor list is built in neighbor->build(). */ - void pre_neighbor(); - void setup_pre_neighbor(); + void pre_neighbor() override; + void setup_pre_neighbor() override; /** pre/post_force is used to modify fix-specific data and is before/after the various force computations. */ - void pre_force(int vflag); - void post_force(int vflag); + void pre_force(int vflag) override; + void post_force(int vflag) override; /** post_run is called after a run completes */ - void post_run(); + void post_run() override; /** min_pre_force is called before forces are calculated in minimize */ - void min_pre_force(int vflag); + void min_pre_force(int vflag) override; /** min_post_force is called after forces are calculated in minimize */ - void min_post_force(int vflag); + void min_post_force(int vflag) override; /** modify atc parameters (parser) */ - int modify_param(int narg, char **arg); + int modify_param(int narg, char **arg) override; /** calls ATC_Method to handle restarting/checkpointing */ /** these four methods are for writing per-atom quantities */ - int pack_restart(int, double *); - void unpack_restart(int, int); - int size_restart(int); - int maxsize_restart(); + int pack_restart(int, double *) override; + void unpack_restart(int, int) override; + int size_restart(int) override; + int maxsize_restart() override; /** these two methods are for writing all other quantities */ - void write_restart(FILE *); - void restart(char *); + void write_restart(FILE *) override; + void restart(char *) override; /** accessor function for ATC_Method class pointer */ const ATC::ATC_Method *atc() { return atc_; } @@ -130,9 +130,9 @@ class FixATC : public Fix { LAMMPS *lammps_; /** functions for "thermo" output */ - virtual double compute_scalar(); - virtual double compute_vector(int n); - virtual double compute_array(int irow, int icol); + double compute_scalar() override; + double compute_vector(int n) override; + double compute_array(int irow, int icol) override; double dtv, dtf; ATC::ATC_Method *atc_; }; diff --git a/src/H5MD/dump_h5md.h b/src/H5MD/dump_h5md.h index 5e3f3f8279..7caf7f9583 100644 --- a/src/H5MD/dump_h5md.h +++ b/src/H5MD/dump_h5md.h @@ -29,7 +29,7 @@ namespace LAMMPS_NS { class DumpH5MD : public Dump { public: DumpH5MD(class LAMMPS *, int, char **); - virtual ~DumpH5MD(); + ~DumpH5MD() override; private: int natoms, ntotal; @@ -57,12 +57,12 @@ class DumpH5MD : public Dump { int *dump_charge; int every_charge; - void init_style(); - int modify_param(int, char **); - void openfile(); - void write_header(bigint); - void pack(tagint *); - void write_data(int, double *); + void init_style() override; + int modify_param(int, char **) override; + void openfile() override; + void write_header(bigint) override; + void pack(tagint *) override; + void write_data(int, double *) override; void write_frame(); void write_fixed_frame(); diff --git a/src/KOKKOS/fix_langevin_kokkos.h b/src/KOKKOS/fix_langevin_kokkos.h index ffd5a17da5..3bb076b561 100644 --- a/src/KOKKOS/fix_langevin_kokkos.h +++ b/src/KOKKOS/fix_langevin_kokkos.h @@ -72,17 +72,17 @@ namespace LAMMPS_NS { class FixLangevinKokkos : public FixLangevin { public: FixLangevinKokkos(class LAMMPS *, int, char **); - ~FixLangevinKokkos(); + ~FixLangevinKokkos() override; void cleanup_copy(); - void init(); - void initial_integrate(int); - void post_force(int); - void reset_dt(); - void grow_arrays(int); - void copy_arrays(int i, int j, int delflag); - double compute_scalar(); - void end_of_step(); + void init() override; + void initial_integrate(int) override; + void post_force(int) override; + void reset_dt() override; + void grow_arrays(int) override; + void copy_arrays(int i, int j, int delflag) override; + double compute_scalar() override; + void end_of_step() override; KOKKOS_INLINE_FUNCTION void initial_integrate_item(int) const; diff --git a/src/PYTHON/fix_python_invoke.h b/src/PYTHON/fix_python_invoke.h index a60b6e5f69..3396fe05d8 100644 --- a/src/PYTHON/fix_python_invoke.h +++ b/src/PYTHON/fix_python_invoke.h @@ -28,10 +28,10 @@ namespace LAMMPS_NS { class FixPythonInvoke : public Fix { public: FixPythonInvoke(class LAMMPS *, int, char **); - virtual ~FixPythonInvoke(); - int setmask(); - virtual void end_of_step(); - virtual void post_force(int); + ~FixPythonInvoke() override; + int setmask() override; + void end_of_step() override; + void post_force(int) override; private: void *lmpPtr; diff --git a/src/PYTHON/fix_python_move.h b/src/PYTHON/fix_python_move.h index fa2a275579..d861e98801 100644 --- a/src/PYTHON/fix_python_move.h +++ b/src/PYTHON/fix_python_move.h @@ -37,15 +37,15 @@ namespace LAMMPS_NS { class FixPythonMove : public Fix { public: FixPythonMove(LAMMPS *lmp, int narg, char **arg); - virtual ~FixPythonMove(); + ~FixPythonMove() override; - int setmask(); - virtual void init(); - virtual void initial_integrate(int); - virtual void final_integrate(); - virtual void initial_integrate_respa(int, int, int); - virtual void final_integrate_respa(int, int); - virtual void reset_dt(); + int setmask() override; + void init() override; + void initial_integrate(int) override; + void final_integrate() override; + void initial_integrate_respa(int, int, int) override; + void final_integrate_respa(int, int) override; + void reset_dt() override; protected: void *py_move; diff --git a/src/PYTHON/pair_python.h b/src/PYTHON/pair_python.h index bb202b8cc5..d2366620c8 100644 --- a/src/PYTHON/pair_python.h +++ b/src/PYTHON/pair_python.h @@ -37,12 +37,12 @@ namespace LAMMPS_NS { class PairPython : public Pair { public: PairPython(class LAMMPS *); - virtual ~PairPython(); - virtual void compute(int, int); - void settings(int, char **); - void coeff(int, char **); - double init_one(int, int); - double single(int, int, int, int, double, double, double, double &); + ~PairPython() override; + void compute(int, int) override; + void settings(int, char **) override; + void coeff(int, char **) override; + double init_one(int, int) override; + double single(int, int, int, int, double, double, double, double &) override; protected: double cut_global; diff --git a/src/PYTHON/python_impl.h b/src/PYTHON/python_impl.h index fe14862186..90726023c0 100644 --- a/src/PYTHON/python_impl.h +++ b/src/PYTHON/python_impl.h @@ -23,15 +23,15 @@ class PythonImpl : protected Pointers, public PythonInterface { public: PythonImpl(class LAMMPS *); - ~PythonImpl(); - void command(int, char **); - void invoke_function(int, char *); - int find(const char *); - int variable_match(const char *, const char *, int); - char *long_string(int); - int execute_string(char *); - int execute_file(char *); - bool has_minimum_version(int major, int minor); + ~PythonImpl() override; + void command(int, char **) override; + void invoke_function(int, char *) override; + int find(const char *) override; + int variable_match(const char *, const char *, int) override; + char *long_string(int) override; + int execute_string(char *) override; + int execute_file(char *) override; + bool has_minimum_version(int major, int minor) override; static void finalize(); private: diff --git a/src/exceptions.h b/src/exceptions.h index 1c9d8c8daf..f10f4ecf89 100644 --- a/src/exceptions.h +++ b/src/exceptions.h @@ -26,9 +26,7 @@ class LAMMPSException : public std::exception { LAMMPSException(const std::string &msg) : message(msg) {} - ~LAMMPSException() noexcept {} - - virtual const char *what() const noexcept { return message.c_str(); } + const char *what() const noexcept override { return message.c_str(); } }; class LAMMPSAbortException : public LAMMPSException { diff --git a/src/lmppython.h b/src/lmppython.h index 3f0ebecae5..e923b38808 100644 --- a/src/lmppython.h +++ b/src/lmppython.h @@ -34,7 +34,7 @@ class PythonInterface { class Python : protected Pointers { public: Python(class LAMMPS *); - ~Python(); + ~Python() override; void command(int, char **); void invoke_function(int, char *); diff --git a/src/procmap.h b/src/procmap.h index 8cbf805f5a..f1ad4afc24 100644 --- a/src/procmap.h +++ b/src/procmap.h @@ -21,7 +21,7 @@ namespace LAMMPS_NS { class ProcMap : protected Pointers { public: ProcMap(class LAMMPS *); - ~ProcMap() {} + void onelevel_grid(int, int *, int *, int, int, int *, int *); void twolevel_grid(int, int *, int *, int, int *, int *, int, int, int *, int *); void numa_grid(int, int *, int *, int *);