diff --git a/hoomd/mpcd/ATCollisionMethod.h b/hoomd/mpcd/ATCollisionMethod.h index 1913d15945..a507faf38a 100644 --- a/hoomd/mpcd/ATCollisionMethod.h +++ b/hoomd/mpcd/ATCollisionMethod.h @@ -55,13 +55,13 @@ class PYBIND11_EXPORT ATCollisionMethod : public mpcd::CollisionMethod std::shared_ptr m_T; //!< Temperature for thermostat //! Implementation of the collision rule - virtual void rule(uint64_t timestep); + virtual void rule(uint64_t timestep) override; //! Draw velocities for particles in each cell - virtual void drawVelocities(uint64_t timestep); + virtual void drawVelocities(uint64_t timestep) override; //! Apply the random velocities to particles in each cell - virtual void applyVelocities(); + virtual void applyVelocities() override; //! Attach callback signals void attachCallbacks(); diff --git a/hoomd/mpcd/ATCollisionMethodGPU.h b/hoomd/mpcd/ATCollisionMethodGPU.h index d9fad75826..fcf3a03b29 100644 --- a/hoomd/mpcd/ATCollisionMethodGPU.h +++ b/hoomd/mpcd/ATCollisionMethodGPU.h @@ -34,10 +34,10 @@ class PYBIND11_EXPORT ATCollisionMethodGPU : public mpcd::ATCollisionMethod protected: //! Draw velocities for particles in each cell on the GPU - virtual void drawVelocities(uint64_t timestep); + virtual void drawVelocities(uint64_t timestep) override; //! Apply the random velocities to particles in each cell on the GPU - virtual void applyVelocities(); + virtual void applyVelocities() override; private: std::shared_ptr> m_tuner_draw; //!< Tuner for drawing random velocities diff --git a/hoomd/mpcd/BounceBackNVE.h b/hoomd/mpcd/BounceBackNVE.h index f4af28356f..3ffb9917fe 100644 --- a/hoomd/mpcd/BounceBackNVE.h +++ b/hoomd/mpcd/BounceBackNVE.h @@ -46,10 +46,10 @@ class PYBIND11_EXPORT BounceBackNVE : public hoomd::md::IntegrationMethodTwoStep virtual ~BounceBackNVE(); //! Performs the first step of the integration - virtual void integrateStepOne(uint64_t timestep); + virtual void integrateStepOne(uint64_t timestep) override; //! Performs the second step of the integration - virtual void integrateStepTwo(uint64_t timestep); + virtual void integrateStepTwo(uint64_t timestep) override; //! Get the streaming geometry std::shared_ptr getGeometry() diff --git a/hoomd/mpcd/BounceBackNVEGPU.h b/hoomd/mpcd/BounceBackNVEGPU.h index b50f868284..e426749fa2 100644 --- a/hoomd/mpcd/BounceBackNVEGPU.h +++ b/hoomd/mpcd/BounceBackNVEGPU.h @@ -44,10 +44,10 @@ template class PYBIND11_EXPORT BounceBackNVEGPU : public BounceB } //! Performs the first step of the integration - virtual void integrateStepOne(uint64_t timestep); + virtual void integrateStepOne(uint64_t timestep) override; //! Performs the second step of the integration - virtual void integrateStepTwo(uint64_t timestep); + virtual void integrateStepTwo(uint64_t timestep) override; private: std::shared_ptr> m_tuner_1; diff --git a/hoomd/mpcd/BounceBackStreamingMethod.h b/hoomd/mpcd/BounceBackStreamingMethod.h index b80092ec92..7cc278487a 100644 --- a/hoomd/mpcd/BounceBackStreamingMethod.h +++ b/hoomd/mpcd/BounceBackStreamingMethod.h @@ -63,7 +63,7 @@ class PYBIND11_EXPORT BounceBackStreamingMethod : public mpcd::StreamingMethod } //! Implementation of the streaming rule - virtual void stream(uint64_t timestep); + virtual void stream(uint64_t timestep) override; //! Get the streaming geometry std::shared_ptr getGeometry() const @@ -90,7 +90,7 @@ class PYBIND11_EXPORT BounceBackStreamingMethod : public mpcd::StreamingMethod } //! Check that particles lie inside the geometry - virtual bool checkParticles(); + virtual bool checkParticles() override; protected: std::shared_ptr m_geom; //!< Streaming geometry diff --git a/hoomd/mpcd/BounceBackStreamingMethodGPU.h b/hoomd/mpcd/BounceBackStreamingMethodGPU.h index 735388d546..4929bb7de6 100644 --- a/hoomd/mpcd/BounceBackStreamingMethodGPU.h +++ b/hoomd/mpcd/BounceBackStreamingMethodGPU.h @@ -60,7 +60,7 @@ class PYBIND11_EXPORT BounceBackStreamingMethodGPU } //! Implementation of the streaming rule - virtual void stream(uint64_t timestep); + virtual void stream(uint64_t timestep) override; protected: std::shared_ptr> m_tuner; diff --git a/hoomd/mpcd/CellListGPU.h b/hoomd/mpcd/CellListGPU.h index 1e19514ac0..378e9d4e77 100644 --- a/hoomd/mpcd/CellListGPU.h +++ b/hoomd/mpcd/CellListGPU.h @@ -34,7 +34,7 @@ class PYBIND11_EXPORT CellListGPU : public mpcd::CellList protected: //! Compute the cell list of particles on the GPU - virtual void buildCellList(); + virtual void buildCellList() override; //! Callback to sort cell list on the GPU when particle data is sorted virtual void sort(uint64_t timestep, diff --git a/hoomd/mpcd/CellThermoComputeGPU.h b/hoomd/mpcd/CellThermoComputeGPU.h index cafd019931..5b7b1c270f 100644 --- a/hoomd/mpcd/CellThermoComputeGPU.h +++ b/hoomd/mpcd/CellThermoComputeGPU.h @@ -39,17 +39,17 @@ class PYBIND11_EXPORT CellThermoComputeGPU : public mpcd::CellThermoCompute protected: #ifdef ENABLE_MPI //! Begin the calculation of outer cell properties on the GPU - virtual void beginOuterCellProperties(); + virtual void beginOuterCellProperties() override; //! Finish the calculation of outer cell properties on the GPU - virtual void finishOuterCellProperties(); + virtual void finishOuterCellProperties() override; #endif // ENABLE_MPI //! Calculate the inner cell properties on the GPU - virtual void calcInnerCellProperties(); + virtual void calcInnerCellProperties() override; //! Compute the net properties from the cell properties - virtual void computeNetProperties(); + virtual void computeNetProperties() override; private: std::shared_ptr> m_begin_tuner; //!< Tuner for cell begin kernel diff --git a/hoomd/mpcd/CommunicatorGPU.h b/hoomd/mpcd/CommunicatorGPU.h index eea44542b2..cfe58a8af4 100644 --- a/hoomd/mpcd/CommunicatorGPU.h +++ b/hoomd/mpcd/CommunicatorGPU.h @@ -57,7 +57,7 @@ class PYBIND11_EXPORT CommunicatorGPU : public mpcd::Communicator //@{ //! Migrate particle data to local domain - virtual void migrateParticles(uint64_t timestep); + virtual void migrateParticles(uint64_t timestep) override; //@} //! Set maximum number of communication stages @@ -71,7 +71,7 @@ class PYBIND11_EXPORT CommunicatorGPU : public mpcd::Communicator protected: //! Set the communication flags for the particle data on the GPU - virtual void setCommFlags(const BoxDim& box); + virtual void setCommFlags(const BoxDim& box) override; private: /* General communication */ diff --git a/hoomd/mpcd/Integrator.h b/hoomd/mpcd/Integrator.h index 2c3a02fde9..f2925ec05e 100644 --- a/hoomd/mpcd/Integrator.h +++ b/hoomd/mpcd/Integrator.h @@ -40,13 +40,13 @@ class PYBIND11_EXPORT Integrator : public hoomd::md::IntegratorTwoStep virtual ~Integrator(); //! Take one timestep forward - virtual void update(uint64_t timestep); + virtual void update(uint64_t timestep) override; //! Change the timestep - virtual void setDeltaT(Scalar deltaT); + virtual void setDeltaT(Scalar deltaT) override; //! Prepare for the run - virtual void prepRun(uint64_t timestep); + virtual void prepRun(uint64_t timestep) override; //! Get the MPCD cell list shared by all methods std::shared_ptr getCellList() const diff --git a/hoomd/mpcd/ParallelPlateGeometryFiller.h b/hoomd/mpcd/ParallelPlateGeometryFiller.h index 09f7fc4a70..c6da666580 100644 --- a/hoomd/mpcd/ParallelPlateGeometryFiller.h +++ b/hoomd/mpcd/ParallelPlateGeometryFiller.h @@ -58,10 +58,10 @@ class PYBIND11_EXPORT ParallelPlateGeometryFiller : public mpcd::ManualVirtualPa unsigned int m_N_hi; //!< number of particles to fill above channel //! Compute the total number of particles to fill - virtual void computeNumFill(); + virtual void computeNumFill() override; //! Draw particles within the fill volume - virtual void drawParticles(uint64_t timestep); + virtual void drawParticles(uint64_t timestep) override; }; } // end namespace mpcd } // end namespace hoomd diff --git a/hoomd/mpcd/ParallelPlateGeometryFillerGPU.h b/hoomd/mpcd/ParallelPlateGeometryFillerGPU.h index 428c9279ad..b95a3ff6fa 100644 --- a/hoomd/mpcd/ParallelPlateGeometryFillerGPU.h +++ b/hoomd/mpcd/ParallelPlateGeometryFillerGPU.h @@ -34,7 +34,7 @@ class PYBIND11_EXPORT ParallelPlateGeometryFillerGPU : public mpcd::ParallelPlat protected: //! Draw particles within the fill volume on the GPU - virtual void drawParticles(uint64_t timestep); + virtual void drawParticles(uint64_t timestep) override; private: std::shared_ptr> m_tuner; //!< Autotuner for drawing particles diff --git a/hoomd/mpcd/PlanarPoreGeometryFiller.h b/hoomd/mpcd/PlanarPoreGeometryFiller.h index 611747f599..7e64cb2b3a 100644 --- a/hoomd/mpcd/PlanarPoreGeometryFiller.h +++ b/hoomd/mpcd/PlanarPoreGeometryFiller.h @@ -60,10 +60,10 @@ class PYBIND11_EXPORT PlanarPoreGeometryFiller : public mpcd::ManualVirtualParti GPUArray m_ranges; //!< Particle tag ranges for filling //! Compute the total number of particles to fill - virtual void computeNumFill(); + virtual void computeNumFill() override; //! Draw particles within the fill volume - virtual void drawParticles(uint64_t timestep); + virtual void drawParticles(uint64_t timestep) override; private: bool m_needs_recompute; diff --git a/hoomd/mpcd/PlanarPoreGeometryFillerGPU.h b/hoomd/mpcd/PlanarPoreGeometryFillerGPU.h index 8edc70611a..519cce860e 100644 --- a/hoomd/mpcd/PlanarPoreGeometryFillerGPU.h +++ b/hoomd/mpcd/PlanarPoreGeometryFillerGPU.h @@ -34,7 +34,7 @@ class PYBIND11_EXPORT PlanarPoreGeometryFillerGPU : public mpcd::PlanarPoreGeome protected: //! Draw particles within the fill volume on the GPU - virtual void drawParticles(uint64_t timestep); + virtual void drawParticles(uint64_t timestep) override; private: std::shared_ptr> m_tuner; //!< Autotuner for drawing particles diff --git a/hoomd/mpcd/RejectionVirtualParticleFiller.h b/hoomd/mpcd/RejectionVirtualParticleFiller.h index 4b6a8f06ac..025ffc0aef 100644 --- a/hoomd/mpcd/RejectionVirtualParticleFiller.h +++ b/hoomd/mpcd/RejectionVirtualParticleFiller.h @@ -70,7 +70,7 @@ class PYBIND11_EXPORT RejectionVirtualParticleFiller : public mpcd::VirtualParti } //! Fill the particles outside the confinement - virtual void fill(uint64_t timestep); + virtual void fill(uint64_t timestep) override; protected: std::shared_ptr m_geom; diff --git a/hoomd/mpcd/RejectionVirtualParticleFillerGPU.h b/hoomd/mpcd/RejectionVirtualParticleFillerGPU.h index 71985d6d15..fe5faad339 100644 --- a/hoomd/mpcd/RejectionVirtualParticleFillerGPU.h +++ b/hoomd/mpcd/RejectionVirtualParticleFillerGPU.h @@ -54,7 +54,7 @@ class PYBIND11_EXPORT RejectionVirtualParticleFillerGPU protected: //! Fill the volume outside the confinement - virtual void fill(uint64_t timestep); + virtual void fill(uint64_t timestep) override; private: GPUArray m_keep_particles; // Track whether particles are in/out of bounds for geometry diff --git a/hoomd/mpcd/SRDCollisionMethod.h b/hoomd/mpcd/SRDCollisionMethod.h index 12895514d4..fa55fc6247 100644 --- a/hoomd/mpcd/SRDCollisionMethod.h +++ b/hoomd/mpcd/SRDCollisionMethod.h @@ -95,7 +95,7 @@ class PYBIND11_EXPORT SRDCollisionMethod : public mpcd::CollisionMethod GPUVector m_factors; //!< Cell-level rescale factors //! Implementation of the collision rule - virtual void rule(uint64_t timestep); + virtual void rule(uint64_t timestep) override; //! Randomly draw cell rotation vectors virtual void drawRotationVectors(uint64_t timestep); diff --git a/hoomd/mpcd/SRDCollisionMethodGPU.h b/hoomd/mpcd/SRDCollisionMethodGPU.h index 960a577b98..7831915f1b 100644 --- a/hoomd/mpcd/SRDCollisionMethodGPU.h +++ b/hoomd/mpcd/SRDCollisionMethodGPU.h @@ -34,10 +34,10 @@ class PYBIND11_EXPORT SRDCollisionMethodGPU : public mpcd::SRDCollisionMethod protected: //! Randomly draw cell rotation vectors - virtual void drawRotationVectors(uint64_t timestep); + virtual void drawRotationVectors(uint64_t timestep) override; //! Apply rotation matrix to velocities - virtual void rotate(uint64_t timestep); + virtual void rotate(uint64_t timestep) override; private: std::shared_ptr> m_tuner_rotvec; //!< Tuner for drawing rotation vectors diff --git a/hoomd/mpcd/Sorter.h b/hoomd/mpcd/Sorter.h index 2f89f119e9..358c941952 100644 --- a/hoomd/mpcd/Sorter.h +++ b/hoomd/mpcd/Sorter.h @@ -49,7 +49,7 @@ class PYBIND11_EXPORT Sorter : public Tuner virtual ~Sorter(); //! Update the particle data order - virtual void update(uint64_t timestep); + virtual void update(uint64_t timestep) override; //! Set the cell list used for sorting virtual void setCellList(std::shared_ptr cl) diff --git a/hoomd/mpcd/SorterGPU.h b/hoomd/mpcd/SorterGPU.h index bedfeb60ad..e6e7265a57 100644 --- a/hoomd/mpcd/SorterGPU.h +++ b/hoomd/mpcd/SorterGPU.h @@ -42,10 +42,10 @@ class PYBIND11_EXPORT SorterGPU : public mpcd::Sorter std::shared_ptr> m_apply_tuner; //! Compute the sorting order at the current timestep on the GPU - virtual void computeOrder(uint64_t timestep); + virtual void computeOrder(uint64_t timestep) override; //! Apply the sorting order on the GPU - virtual void applyOrder() const; + virtual void applyOrder() const override; }; } // end namespace mpcd } // end namespace hoomd