From a696f9a4205f1e4f5dc71b37ee5b91d634a254bb Mon Sep 17 00:00:00 2001 From: Alan Dayton <6393677+adayton1@users.noreply.github.com> Date: Thu, 22 Aug 2024 15:30:03 -0700 Subject: [PATCH] Fix clang compiler warnings (#301) * Fix warnings about inconsistent use of override * Clean up axom includes --- src/DEM/LinearSpringDEM.hh | 4 ++-- .../CircularPlaneSolidBoundary.hh | 2 +- .../ClippedSphereSolidBoundary.hh | 2 +- .../SolidBoundary/CylinderSolidBoundary.hh | 2 +- .../InfinitePlaneSolidBoundary.hh | 2 +- .../RectangularPlaneSolidBoundary.hh | 2 +- src/DEM/SolidBoundary/SphereSolidBoundary.hh | 2 +- src/ExternalForce/PointPotential.hh | 2 +- src/FileIO/SidreFileIO.cc | 3 ++- src/FileIO/SidreFileIO.hh | 8 ++++++++ src/Geometry/GeomPolyhedron.cc | 15 +++++++------- src/Geometry/GeomPolyhedron.hh | 7 ++----- src/Gravity/PolyGravity.hh | 12 +++++------ src/Gravity/TreeGravity.hh | 14 ++++++------- src/Material/HelmholtzEquationOfState.hh | 18 ++++++++--------- src/Material/IsothermalEquationOfState.hh | 20 +++++++++---------- src/Material/PolytropicEquationOfState.hh | 20 +++++++++---------- src/Porosity/PorosityModel.hh | 2 +- src/RK/HVolumePolicy.hh | 2 +- ...mpatibleFaceSpecificThermalEnergyPolicy.hh | 2 +- src/SVPH/SVPHFacetedHydroBase.hh | 2 +- src/SolidMaterial/ANEOS.hh | 18 ++++++++--------- src/SolidMaterial/GruneisenEquationOfState.hh | 18 ++++++++--------- .../LinearPolynomialEquationOfState.hh | 18 ++++++++--------- src/SolidMaterial/MurnaghanEquationOfState.hh | 18 ++++++++--------- src/SolidMaterial/OsborneEquationOfState.hh | 18 ++++++++--------- src/SolidMaterial/TillotsonEquationOfState.hh | 14 ++++++------- 27 files changed, 126 insertions(+), 121 deletions(-) diff --git a/src/DEM/LinearSpringDEM.hh b/src/DEM/LinearSpringDEM.hh index 6ac98bbcd..60462e65b 100644 --- a/src/DEM/LinearSpringDEM.hh +++ b/src/DEM/LinearSpringDEM.hh @@ -174,8 +174,8 @@ public: //**************************************************************************** // Methods required for restarting. virtual std::string label() const override { return "LinearSpringDEM" ; } - virtual void dumpState(FileIO& file, const std::string& pathName) const; - virtual void restoreState(const FileIO& file, const std::string& pathName); + virtual void dumpState(FileIO& file, const std::string& pathName) const override; + virtual void restoreState(const FileIO& file, const std::string& pathName) override; //**************************************************************************** private: //--------------------------- Private Interface ---------------------------// diff --git a/src/DEM/SolidBoundary/CircularPlaneSolidBoundary.hh b/src/DEM/SolidBoundary/CircularPlaneSolidBoundary.hh index 173321759..9b9a674f4 100644 --- a/src/DEM/SolidBoundary/CircularPlaneSolidBoundary.hh +++ b/src/DEM/SolidBoundary/CircularPlaneSolidBoundary.hh @@ -53,7 +53,7 @@ public: const Vector& velocity() const; void velocity(const Vector& value); - virtual std::string label() const { return "CircularPlaneSolidBoundary" ; } + virtual std::string label() const override { return "CircularPlaneSolidBoundary" ; } virtual void dumpState(FileIO& file, const std::string& pathName) const override; virtual void restoreState(const FileIO& file, const std::string& pathName) override; diff --git a/src/DEM/SolidBoundary/ClippedSphereSolidBoundary.hh b/src/DEM/SolidBoundary/ClippedSphereSolidBoundary.hh index 2e479685e..3614d3ad7 100644 --- a/src/DEM/SolidBoundary/ClippedSphereSolidBoundary.hh +++ b/src/DEM/SolidBoundary/ClippedSphereSolidBoundary.hh @@ -60,7 +60,7 @@ public: void setClipIntersectionRadius(); - virtual std::string label() const { return "ClippedSphereSolidBoundary" ; } + virtual std::string label() const override { return "ClippedSphereSolidBoundary" ; } virtual void dumpState(FileIO& file, const std::string& pathName) const override; virtual void restoreState(const FileIO& file, const std::string& pathName) override; protected: diff --git a/src/DEM/SolidBoundary/CylinderSolidBoundary.hh b/src/DEM/SolidBoundary/CylinderSolidBoundary.hh index 7da17e8d8..14ab303ff 100644 --- a/src/DEM/SolidBoundary/CylinderSolidBoundary.hh +++ b/src/DEM/SolidBoundary/CylinderSolidBoundary.hh @@ -57,7 +57,7 @@ public: const Vector& velocity() const; void velocity(const Vector& value); - virtual std::string label() const { return "CylinderSolidBoundary" ; } + virtual std::string label() const override { return "CylinderSolidBoundary" ; } virtual void dumpState(FileIO& file, const std::string& pathName) const override; virtual void restoreState(const FileIO& file, const std::string& pathName) override; diff --git a/src/DEM/SolidBoundary/InfinitePlaneSolidBoundary.hh b/src/DEM/SolidBoundary/InfinitePlaneSolidBoundary.hh index 2c80a5be6..406a0c75e 100644 --- a/src/DEM/SolidBoundary/InfinitePlaneSolidBoundary.hh +++ b/src/DEM/SolidBoundary/InfinitePlaneSolidBoundary.hh @@ -48,7 +48,7 @@ public: const Vector& velocity() const; void velocity(const Vector& value); - virtual std::string label() const { return "InfinitePlaneSolidBoundary" ; } + virtual std::string label() const override { return "InfinitePlaneSolidBoundary" ; } virtual void dumpState(FileIO& file, const std::string& pathName) const override; virtual void restoreState(const FileIO& file, const std::string& pathName) override; diff --git a/src/DEM/SolidBoundary/RectangularPlaneSolidBoundary.hh b/src/DEM/SolidBoundary/RectangularPlaneSolidBoundary.hh index 62c75e917..9a8f5d4fc 100644 --- a/src/DEM/SolidBoundary/RectangularPlaneSolidBoundary.hh +++ b/src/DEM/SolidBoundary/RectangularPlaneSolidBoundary.hh @@ -54,7 +54,7 @@ public: const Vector& velocity() const; void velocity(const Vector& value); - virtual std::string label() const { return "RectangularPlaneSolidBoundary" ; } + virtual std::string label() const override { return "RectangularPlaneSolidBoundary" ; } virtual void dumpState(FileIO& file, const std::string& pathName) const override; virtual void restoreState(const FileIO& file, const std::string& pathName) override; diff --git a/src/DEM/SolidBoundary/SphereSolidBoundary.hh b/src/DEM/SolidBoundary/SphereSolidBoundary.hh index c6a932e48..020e6c03b 100644 --- a/src/DEM/SolidBoundary/SphereSolidBoundary.hh +++ b/src/DEM/SolidBoundary/SphereSolidBoundary.hh @@ -54,7 +54,7 @@ public: const RotationType& angularVelocity() const; void angularVelocity(const RotationType& value); - virtual std::string label() const { return "SphereSolidBoundary" ; } + virtual std::string label() const override { return "SphereSolidBoundary" ; } virtual void dumpState(FileIO& file, const std::string& pathName) const override; virtual void restoreState(const FileIO& file, const std::string& pathName) override; diff --git a/src/ExternalForce/PointPotential.hh b/src/ExternalForce/PointPotential.hh index 112308836..d003f0a2d 100644 --- a/src/ExternalForce/PointPotential.hh +++ b/src/ExternalForce/PointPotential.hh @@ -101,7 +101,7 @@ public: //**************************************************************************** // Methods required for restarting. - virtual std::string label() const { return "PointPotential"; } + virtual std::string label() const override { return "PointPotential"; } virtual void dumpState(FileIO& file, const std::string& pathName) const; virtual void restoreState(const FileIO& file, const std::string& pathName); //**************************************************************************** diff --git a/src/FileIO/SidreFileIO.cc b/src/FileIO/SidreFileIO.cc index 767eb621f..c53cbc507 100644 --- a/src/FileIO/SidreFileIO.cc +++ b/src/FileIO/SidreFileIO.cc @@ -4,7 +4,8 @@ // Created by Mikhail Zakharchanka, 11/4/2021 //----------------------------------------------------------------------------// #include "SidreFileIO.hh" -#include "axom/core/Path.hpp" + +#include "axom/sidre.hpp" namespace Spheral { diff --git a/src/FileIO/SidreFileIO.hh b/src/FileIO/SidreFileIO.hh index 03529b9be..50260fe47 100644 --- a/src/FileIO/SidreFileIO.hh +++ b/src/FileIO/SidreFileIO.hh @@ -10,6 +10,14 @@ #include +// Forward declarations +namespace axom { + namespace sidre { + class DataStore; + class Group; + } +} + namespace Spheral { diff --git a/src/Geometry/GeomPolyhedron.cc b/src/Geometry/GeomPolyhedron.cc index 868f61e8f..e1c97a76d 100644 --- a/src/Geometry/GeomPolyhedron.cc +++ b/src/Geometry/GeomPolyhedron.cc @@ -17,9 +17,14 @@ #include "Utilities/pointInPolyhedron.hh" #include "Utilities/safeInv.hh" -#include -#include +#include "axom/mint.hpp" + #include +#include +#include +#include +#include + using std::vector; using std::map; using std::pair; @@ -35,12 +40,6 @@ extern "C" { #include "Utilities/Timer.hh" -#include -#include -#include -#include -#include - namespace Spheral { //------------------------------------------------------------------------------ diff --git a/src/Geometry/GeomPolyhedron.hh b/src/Geometry/GeomPolyhedron.hh index 427760b90..e41243bcd 100644 --- a/src/Geometry/GeomPolyhedron.hh +++ b/src/Geometry/GeomPolyhedron.hh @@ -12,13 +12,10 @@ #include "GeomTensor.hh" #include "GeomFacet3d.hh" -#include "axom/config.hpp" // compile time definitions -#include "axom/core.hpp" // for execution_space traits -#include "axom/mint.hpp" // for mint classes and functions -#include "axom/quest.hpp" // axom surface queries (containment) +#include "axom/quest.hpp" #include -#include +#include namespace Spheral { diff --git a/src/Gravity/PolyGravity.hh b/src/Gravity/PolyGravity.hh index 8efead254..4129cac7e 100644 --- a/src/Gravity/PolyGravity.hh +++ b/src/Gravity/PolyGravity.hh @@ -53,7 +53,7 @@ public: //! We augment the generic body force state. virtual void registerState(DataBase& dataBase, - State& state); + State& state) override; //! This is the derivative method that all BodyForce classes must provide. virtual @@ -61,13 +61,13 @@ public: const Scalar /*dt*/, const DataBase& dataBase, const State& state, - StateDerivatives& derivs) const; + StateDerivatives& derivs) const override; //! Vote on the timestep. This uses a velocity-limiting rule. virtual TimeStepType dt(const DataBase& /*dataBase*/, const State& state, const StateDerivatives& /*derivs*/, - const Scalar /*currentTime*/) const; + const Scalar /*currentTime*/) const override; // An optional hook to initialize once when the problem is starting up. // Typically this is used to size arrays once all the materials and NodeLists have @@ -84,10 +84,10 @@ public: StateDerivatives& derivs) override; //! This package opts out of building connectivity. - virtual bool requireConnectivity() const { return false; } + virtual bool requireConnectivity() const override { return false; } //! Return the total energy contribution due to the gravitational potential. - virtual Scalar extraEnergy() const; + virtual Scalar extraEnergy() const override; //! Return the gravitational potential created by the particle distribution. const FieldList& potential() const; @@ -117,7 +117,7 @@ public: //**************************************************************************** // Methods required for restarting. - virtual std::string label() const { return "PolyGravity"; } + virtual std::string label() const override { return "PolyGravity"; } virtual void dumpState(FileIO& file, const std::string& pathName) const; virtual void restoreState(const FileIO& file, const std::string& pathName); //**************************************************************************** diff --git a/src/Gravity/TreeGravity.hh b/src/Gravity/TreeGravity.hh index 151dddac8..b1c594a49 100644 --- a/src/Gravity/TreeGravity.hh +++ b/src/Gravity/TreeGravity.hh @@ -54,7 +54,7 @@ public: //! We augment the generic body force state. virtual void registerState(DataBase& dataBase, - State& state); + State& state) override; //! This is the derivative method that all BodyForce classes must provide. virtual @@ -62,13 +62,13 @@ public: const Scalar /*dt*/, const DataBase& dataBase, const State& state, - StateDerivatives& derivs) const; + StateDerivatives& derivs) const override; //! Vote on the timestep. This uses a velocity-limiting rule. virtual TimeStepType dt(const DataBase& /*dataBase*/, const State& state, const StateDerivatives& /*derivs*/, - const Scalar /*currentTime*/) const; + const Scalar /*currentTime*/) const override; // An optional hook to initialize once when the problem is starting up. // Typically this is used to size arrays once all the materials and NodeLists have @@ -89,13 +89,13 @@ public: const Scalar /*dt*/, const DataBase& dataBase, State& state, - StateDerivatives& /*derivs*/); + StateDerivatives& /*derivs*/) override; //! This package opts out of building connectivity. - virtual bool requireConnectivity() const { return false; } + virtual bool requireConnectivity() const override { return false; } //! Return the total energy contribution due to the gravitational potential. - virtual Scalar extraEnergy() const; + virtual Scalar extraEnergy() const override; //! Return the gravitational potential created by the particle distribution. const FieldList& potential() const; @@ -133,7 +133,7 @@ public: //**************************************************************************** // Methods required for restarting. - virtual std::string label() const { return "TreeGravity"; } + virtual std::string label() const override { return "TreeGravity"; } virtual void dumpState(FileIO& file, const std::string& pathName) const; virtual void restoreState(const FileIO& file, const std::string& pathName); //**************************************************************************** diff --git a/src/Material/HelmholtzEquationOfState.hh b/src/Material/HelmholtzEquationOfState.hh index a0d37c83b..2841e8ce2 100644 --- a/src/Material/HelmholtzEquationOfState.hh +++ b/src/Material/HelmholtzEquationOfState.hh @@ -39,7 +39,7 @@ public: // We require any equation of state to define the following properties. virtual void setPressure(Field& Pressure, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setPressureAndDerivs(Field& Pressure, // set pressure Field& dPdu, // set (\partial P)/(\partial u) (specific thermal energy) @@ -49,31 +49,31 @@ public: virtual void setTemperature(Field& temperature, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setSpecificThermalEnergy(Field& specificThermalEnergy, const Field& massDensity, - const Field& temperature) const; + const Field& temperature) const override; virtual void setSpecificHeat(Field& specificHeat, const Field& massDensity, - const Field& temperature) const; + const Field& temperature) const override; virtual void setSoundSpeed(Field& soundSpeed, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setGammaField(Field& gamma, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setBulkModulus(Field& bulkModulus, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setEntropy(Field& entropy, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; // Some of the following methods are disabled virtual Scalar pressure(const Scalar /*massDensity*/, @@ -109,7 +109,7 @@ public: bool getUpdateStatus() const; void setUpdateStatus(bool bSet); - virtual bool valid() const; + virtual bool valid() const override; private: //--------------------------- Private Interface ---------------------------// diff --git a/src/Material/IsothermalEquationOfState.hh b/src/Material/IsothermalEquationOfState.hh index bd6cac3e9..0e77d1b8d 100644 --- a/src/Material/IsothermalEquationOfState.hh +++ b/src/Material/IsothermalEquationOfState.hh @@ -33,7 +33,7 @@ public: // We require any equation of state to define the following properties. virtual void setPressure(Field& Pressure, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setPressureAndDerivs(Field& Pressure, // set pressure Field& dPdu, // set (\partial P)/(\partial u) (specific thermal energy) @@ -43,31 +43,31 @@ public: virtual void setTemperature(Field& temperature, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setSpecificThermalEnergy(Field& specificThermalEnergy, const Field& massDensity, - const Field& temperature) const; + const Field& temperature) const override; virtual void setSpecificHeat(Field& specificHeat, const Field& massDensity, - const Field& temperature) const; + const Field& temperature) const override; virtual void setSoundSpeed(Field& soundSpeed, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setGammaField(Field& gamma, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setBulkModulus(Field& bulkModulus, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setEntropy(Field& entropy, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; // We also want the equivalent functions for individual calculations. Scalar pressure(const Scalar massDensity, @@ -96,9 +96,9 @@ public: // Access the member data. Scalar K() const; - virtual Scalar molecularWeight() const; + virtual Scalar molecularWeight() const override; - virtual bool valid() const; + virtual bool valid() const override; private: //--------------------------- Private Interface ---------------------------// diff --git a/src/Material/PolytropicEquationOfState.hh b/src/Material/PolytropicEquationOfState.hh index 00c19e80e..290ef543d 100644 --- a/src/Material/PolytropicEquationOfState.hh +++ b/src/Material/PolytropicEquationOfState.hh @@ -34,7 +34,7 @@ public: // We require any equation of state to define the following properties. virtual void setPressure(Field& Pressure, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setPressureAndDerivs(Field& Pressure, // set pressure Field& dPdu, // set (\partial P)/(\partial u) (specific thermal energy) @@ -44,31 +44,31 @@ public: virtual void setTemperature(Field& temperature, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setSpecificThermalEnergy(Field& specificThermalEnergy, const Field& massDensity, - const Field& temperature) const; + const Field& temperature) const override; virtual void setSpecificHeat(Field& specificHeat, const Field& massDensity, - const Field& temperature) const; + const Field& temperature) const override; virtual void setSoundSpeed(Field& soundSpeed, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setGammaField(Field& gamma, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setBulkModulus(Field& bulkModulus, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setEntropy(Field& entropy, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; // We also want the equivalent functions for individual calculations. Scalar pressure(const Scalar massDensity, @@ -99,9 +99,9 @@ public: Scalar polytropicConstant() const; Scalar polytropicIndex() const; Scalar gamma() const; - virtual Scalar molecularWeight() const; + virtual Scalar molecularWeight() const override; - virtual bool valid() const; + virtual bool valid() const override; private: //--------------------------- Private Interface ---------------------------// diff --git a/src/Porosity/PorosityModel.hh b/src/Porosity/PorosityModel.hh index 2ea27873a..7b70472ce 100644 --- a/src/Porosity/PorosityModel.hh +++ b/src/Porosity/PorosityModel.hh @@ -58,7 +58,7 @@ public: // Register the derivatives/change fields for updating state. virtual void registerDerivatives(DataBase& dataBase, - StateDerivatives& derivs); + StateDerivatives& derivs) override; // Do any required one-time initializations on problem start up. virtual void initializeProblemStartup(DataBase& dataBase) override; diff --git a/src/RK/HVolumePolicy.hh b/src/RK/HVolumePolicy.hh index f0046b6be..678d67b58 100644 --- a/src/RK/HVolumePolicy.hh +++ b/src/RK/HVolumePolicy.hh @@ -43,7 +43,7 @@ public: const double /*dt*/) override {} // Equivalence. - virtual bool operator==(const UpdatePolicyBase& rhs) const; + virtual bool operator==(const UpdatePolicyBase& rhs) const override; private: //--------------------------- Private Interface ---------------------------// diff --git a/src/SVPH/CompatibleFaceSpecificThermalEnergyPolicy.hh b/src/SVPH/CompatibleFaceSpecificThermalEnergyPolicy.hh index 068bae861..dfa41a085 100644 --- a/src/SVPH/CompatibleFaceSpecificThermalEnergyPolicy.hh +++ b/src/SVPH/CompatibleFaceSpecificThermalEnergyPolicy.hh @@ -51,7 +51,7 @@ public: const double dt) override; // Equivalence. - virtual bool operator==(const UpdatePolicyBase& rhs) const; + virtual bool operator==(const UpdatePolicyBase& rhs) const override; private: //--------------------------- Private Interface ---------------------------// diff --git a/src/SVPH/SVPHFacetedHydroBase.hh b/src/SVPH/SVPHFacetedHydroBase.hh index ebdc3a407..5e839168a 100644 --- a/src/SVPH/SVPHFacetedHydroBase.hh +++ b/src/SVPH/SVPHFacetedHydroBase.hh @@ -201,7 +201,7 @@ public: //**************************************************************************** // Methods required for restarting. - virtual std::string label() const { return "SVPHFacetedHydroBase"; } + virtual std::string label() const override { return "SVPHFacetedHydroBase"; } virtual void dumpState(FileIO& file, const std::string& pathName) const; virtual void restoreState(const FileIO& file, const std::string& pathName); //**************************************************************************** diff --git a/src/SolidMaterial/ANEOS.hh b/src/SolidMaterial/ANEOS.hh index bce0af594..bc38efaa5 100644 --- a/src/SolidMaterial/ANEOS.hh +++ b/src/SolidMaterial/ANEOS.hh @@ -53,7 +53,7 @@ public: // We require any equation of state to define the following properties. virtual void setPressure(Field& Pressure, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setPressureAndDerivs(Field& Pressure, // set pressure Field& dPdu, // set (\partial P)/(\partial u) (specific thermal energy) @@ -63,31 +63,31 @@ public: virtual void setTemperature(Field& temperature, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setSpecificThermalEnergy(Field& specificThermalEnergy, const Field& massDensity, - const Field& temperature) const; + const Field& temperature) const override; virtual void setSpecificHeat(Field& specificHeat, const Field& massDensity, - const Field& temperature) const; + const Field& temperature) const override; virtual void setSoundSpeed(Field& soundSpeed, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setGammaField(Field& gamma, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setBulkModulus(Field& bulkModulus, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setEntropy(Field& entropy, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; // We also want the equivalent functions for individual calculations. Scalar pressure(const Scalar massDensity, @@ -120,7 +120,7 @@ public: const Scalar specificThermalEnergy) const; // The valid method. - virtual bool valid() const; + virtual bool valid() const override; // Access local variables used to lookup eps based on T. int materialNumber() const; diff --git a/src/SolidMaterial/GruneisenEquationOfState.hh b/src/SolidMaterial/GruneisenEquationOfState.hh index 7679d15b7..c37d0b8e9 100644 --- a/src/SolidMaterial/GruneisenEquationOfState.hh +++ b/src/SolidMaterial/GruneisenEquationOfState.hh @@ -50,7 +50,7 @@ public: // We require any equation of state to define the following methods for Fields. virtual void setPressure(Field& Pressure, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setPressureAndDerivs(Field& Pressure, // set pressure Field& dPdu, // set (\partial P)/(\partial u) (specific thermal energy) @@ -60,31 +60,31 @@ public: virtual void setTemperature(Field& temperature, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setSpecificThermalEnergy(Field& specificThermalEnergy, const Field& massDensity, - const Field& temperature) const; + const Field& temperature) const override; virtual void setSpecificHeat(Field& specificHeat, const Field& massDensity, - const Field& temperature) const; + const Field& temperature) const override; virtual void setSoundSpeed(Field& soundSpeed, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setGammaField(Field& gamma, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setBulkModulus(Field& bulkModulus, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setEntropy(Field& entropy, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; // We also want the equivalent functions for individual calculations. std::tuple pressureAndDerivs(const Scalar massDensity, @@ -139,7 +139,7 @@ public: const Scalar specificThermalEnergy) const; // Equations of state should have a valid test. - virtual bool valid() const; + virtual bool valid() const override; private: //--------------------------- Private Interface ---------------------------// diff --git a/src/SolidMaterial/LinearPolynomialEquationOfState.hh b/src/SolidMaterial/LinearPolynomialEquationOfState.hh index 7bd18c3ca..2b81539c7 100644 --- a/src/SolidMaterial/LinearPolynomialEquationOfState.hh +++ b/src/SolidMaterial/LinearPolynomialEquationOfState.hh @@ -53,7 +53,7 @@ public: // We require any equation of state to define the following properties. virtual void setPressure(Field& Pressure, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setPressureAndDerivs(Field& Pressure, // set pressure Field& dPdu, // set (\partial P)/(\partial u) (specific thermal energy) @@ -63,31 +63,31 @@ public: virtual void setTemperature(Field& temperature, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setSpecificThermalEnergy(Field& specificThermalEnergy, const Field& massDensity, - const Field& temperature) const; + const Field& temperature) const override; virtual void setSpecificHeat(Field& specificHeat, const Field& massDensity, - const Field& temperature) const; + const Field& temperature) const override; virtual void setSoundSpeed(Field& soundSpeed, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setGammaField(Field& gamma, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setBulkModulus(Field& bulkModulus, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setEntropy(Field& entropy, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; // We also want the equivalent functions for individual calculations. std::tuple pressureAndDerivs(const Scalar massDensity, @@ -137,7 +137,7 @@ public: double computeDPDrho(const Scalar massDensity, const Scalar specificThermalEnergy) const; - virtual bool valid() const; + virtual bool valid() const override; private: //--------------------------- Private Interface ---------------------------// diff --git a/src/SolidMaterial/MurnaghanEquationOfState.hh b/src/SolidMaterial/MurnaghanEquationOfState.hh index b65d520ad..95974664a 100644 --- a/src/SolidMaterial/MurnaghanEquationOfState.hh +++ b/src/SolidMaterial/MurnaghanEquationOfState.hh @@ -42,7 +42,7 @@ public: // We require any equation of state to define the following properties. virtual void setPressure(Field& Pressure, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setPressureAndDerivs(Field& Pressure, // set pressure Field& dPdu, // set (\partial P)/(\partial u) (specific thermal energy) @@ -52,31 +52,31 @@ public: virtual void setTemperature(Field& temperature, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setSpecificThermalEnergy(Field& specificThermalEnergy, const Field& massDensity, - const Field& temperature) const; + const Field& temperature) const override; virtual void setSpecificHeat(Field& specificHeat, const Field& massDensity, - const Field& temperature) const; + const Field& temperature) const override; virtual void setSoundSpeed(Field& soundSpeed, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setGammaField(Field& gamma, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setBulkModulus(Field& bulkModulus, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setEntropy(Field& entropy, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; // We also want the equivalent functions for individual calculations. Scalar pressure(const Scalar massDensity, @@ -116,7 +116,7 @@ public: double computeDPDrho(const Scalar massDensity, const Scalar specificThermalEnergy) const; - virtual bool valid() const; + virtual bool valid() const override; private: //--------------------------- Private Interface ---------------------------// diff --git a/src/SolidMaterial/OsborneEquationOfState.hh b/src/SolidMaterial/OsborneEquationOfState.hh index 27433b70f..8d91081e2 100644 --- a/src/SolidMaterial/OsborneEquationOfState.hh +++ b/src/SolidMaterial/OsborneEquationOfState.hh @@ -52,7 +52,7 @@ public: // We require any equation of state to define the following methods for Fields. virtual void setPressure(Field& pressure, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setPressureAndDerivs(Field& Pressure, // set pressure Field& dPdu, // set (\partial P)/(\partial u) (specific thermal energy) @@ -62,31 +62,31 @@ public: virtual void setTemperature(Field& temperature, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setSpecificThermalEnergy(Field& specificThermalEnergy, const Field& massDensity, - const Field& temperature) const; + const Field& temperature) const override; virtual void setSpecificHeat(Field& specificHeat, const Field& massDensity, - const Field& temperature) const; + const Field& temperature) const override; virtual void setSoundSpeed(Field& soundSpeed, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setGammaField(Field& gamma, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setBulkModulus(Field& bulkModulus, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setEntropy(Field& entropy, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; // Access the member data. double a1() const; @@ -123,7 +123,7 @@ public: const double specificThermalEnergy) const; // Equations of state should have a valid test. - virtual bool valid() const; + virtual bool valid() const override; private: //--------------------------- Private Interface ---------------------------// diff --git a/src/SolidMaterial/TillotsonEquationOfState.hh b/src/SolidMaterial/TillotsonEquationOfState.hh index 136073170..b9d3d5911 100644 --- a/src/SolidMaterial/TillotsonEquationOfState.hh +++ b/src/SolidMaterial/TillotsonEquationOfState.hh @@ -65,31 +65,31 @@ public: virtual void setTemperature(Field& temperature, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setSpecificThermalEnergy(Field& specificThermalEnergy, const Field& massDensity, - const Field& temperature) const; + const Field& temperature) const override; virtual void setSpecificHeat(Field& specificHeat, const Field& massDensity, - const Field& temperature) const; + const Field& temperature) const override; virtual void setSoundSpeed(Field& soundSpeed, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setGammaField(Field& gamma, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setBulkModulus(Field& bulkModulus, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; virtual void setEntropy(Field& entropy, const Field& massDensity, - const Field& specificThermalEnergy) const; + const Field& specificThermalEnergy) const override; // Access the member data. double etamin_solid() const;