Skip to content

Commit a696f9a

Browse files
adayton1adayton1
authored
Fix clang compiler warnings (#301)
* Fix warnings about inconsistent use of override * Clean up axom includes
1 parent 1abb8bc commit a696f9a

27 files changed

+126
-121
lines changed

‎src/DEM/LinearSpringDEM.hh

+2-2
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ public:
174174
//****************************************************************************
175175
// Methods required for restarting.
176176
virtual std::string label() const override { return "LinearSpringDEM" ; }
177-
virtual void dumpState(FileIO& file, const std::string& pathName) const;
178-
virtual void restoreState(const FileIO& file, const std::string& pathName);
177+
virtual void dumpState(FileIO& file, const std::string& pathName) const override;
178+
virtual void restoreState(const FileIO& file, const std::string& pathName) override;
179179
//****************************************************************************
180180
private:
181181
//--------------------------- Private Interface ---------------------------//

‎src/DEM/SolidBoundary/CircularPlaneSolidBoundary.hh

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public:
5353
const Vector& velocity() const;
5454
void velocity(const Vector& value);
5555

56-
virtual std::string label() const { return "CircularPlaneSolidBoundary" ; }
56+
virtual std::string label() const override { return "CircularPlaneSolidBoundary" ; }
5757
virtual void dumpState(FileIO& file, const std::string& pathName) const override;
5858
virtual void restoreState(const FileIO& file, const std::string& pathName) override;
5959

‎src/DEM/SolidBoundary/ClippedSphereSolidBoundary.hh

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public:
6060

6161
void setClipIntersectionRadius();
6262

63-
virtual std::string label() const { return "ClippedSphereSolidBoundary" ; }
63+
virtual std::string label() const override { return "ClippedSphereSolidBoundary" ; }
6464
virtual void dumpState(FileIO& file, const std::string& pathName) const override;
6565
virtual void restoreState(const FileIO& file, const std::string& pathName) override;
6666
protected:

‎src/DEM/SolidBoundary/CylinderSolidBoundary.hh

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public:
5757
const Vector& velocity() const;
5858
void velocity(const Vector& value);
5959

60-
virtual std::string label() const { return "CylinderSolidBoundary" ; }
60+
virtual std::string label() const override { return "CylinderSolidBoundary" ; }
6161
virtual void dumpState(FileIO& file, const std::string& pathName) const override;
6262
virtual void restoreState(const FileIO& file, const std::string& pathName) override;
6363

‎src/DEM/SolidBoundary/InfinitePlaneSolidBoundary.hh

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public:
4848
const Vector& velocity() const;
4949
void velocity(const Vector& value);
5050

51-
virtual std::string label() const { return "InfinitePlaneSolidBoundary" ; }
51+
virtual std::string label() const override { return "InfinitePlaneSolidBoundary" ; }
5252
virtual void dumpState(FileIO& file, const std::string& pathName) const override;
5353
virtual void restoreState(const FileIO& file, const std::string& pathName) override;
5454

‎src/DEM/SolidBoundary/RectangularPlaneSolidBoundary.hh

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public:
5454
const Vector& velocity() const;
5555
void velocity(const Vector& value);
5656

57-
virtual std::string label() const { return "RectangularPlaneSolidBoundary" ; }
57+
virtual std::string label() const override { return "RectangularPlaneSolidBoundary" ; }
5858
virtual void dumpState(FileIO& file, const std::string& pathName) const override;
5959
virtual void restoreState(const FileIO& file, const std::string& pathName) override;
6060

‎src/DEM/SolidBoundary/SphereSolidBoundary.hh

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public:
5454
const RotationType& angularVelocity() const;
5555
void angularVelocity(const RotationType& value);
5656

57-
virtual std::string label() const { return "SphereSolidBoundary" ; }
57+
virtual std::string label() const override { return "SphereSolidBoundary" ; }
5858
virtual void dumpState(FileIO& file, const std::string& pathName) const override;
5959
virtual void restoreState(const FileIO& file, const std::string& pathName) override;
6060

‎src/ExternalForce/PointPotential.hh

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public:
101101

102102
//****************************************************************************
103103
// Methods required for restarting.
104-
virtual std::string label() const { return "PointPotential"; }
104+
virtual std::string label() const override { return "PointPotential"; }
105105
virtual void dumpState(FileIO& file, const std::string& pathName) const;
106106
virtual void restoreState(const FileIO& file, const std::string& pathName);
107107
//****************************************************************************

‎src/FileIO/SidreFileIO.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
// Created by Mikhail Zakharchanka, 11/4/2021
55
//----------------------------------------------------------------------------//
66
#include "SidreFileIO.hh"
7-
#include "axom/core/Path.hpp"
7+
8+
#include "axom/sidre.hpp"
89

910
namespace Spheral
1011
{

‎src/FileIO/SidreFileIO.hh

+8
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@
1010

1111
#include <vector>
1212

13+
// Forward declarations
14+
namespace axom {
15+
namespace sidre {
16+
class DataStore;
17+
class Group;
18+
}
19+
}
20+
1321
namespace Spheral
1422
{
1523

‎src/Geometry/GeomPolyhedron.cc

+7-8
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,14 @@
1717
#include "Utilities/pointInPolyhedron.hh"
1818
#include "Utilities/safeInv.hh"
1919

20-
#include <vector>
21-
#include <map>
20+
#include "axom/mint.hpp"
21+
2222
#include <algorithm>
23+
#include <iterator>
24+
#include <limits>
25+
#include <map>
26+
#include <vector>
27+
2328
using std::vector;
2429
using std::map;
2530
using std::pair;
@@ -35,12 +40,6 @@ extern "C" {
3540

3641
#include "Utilities/Timer.hh"
3742

38-
#include <algorithm>
39-
#include <numeric>
40-
#include <map>
41-
#include <limits>
42-
#include <iterator>
43-
4443
namespace Spheral {
4544

4645
//------------------------------------------------------------------------------

‎src/Geometry/GeomPolyhedron.hh

+2-5
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@
1212
#include "GeomTensor.hh"
1313
#include "GeomFacet3d.hh"
1414

15-
#include "axom/config.hpp" // compile time definitions
16-
#include "axom/core.hpp" // for execution_space traits
17-
#include "axom/mint.hpp" // for mint classes and functions
18-
#include "axom/quest.hpp" // axom surface queries (containment)
15+
#include "axom/quest.hpp"
1916

2017
#include <vector>
21-
#include <memory>
18+
#include <utility>
2219

2320
namespace Spheral {
2421

‎src/Gravity/PolyGravity.hh

+6-6
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,21 @@ public:
5353

5454
//! We augment the generic body force state.
5555
virtual void registerState(DataBase<Dimension>& dataBase,
56-
State<Dimension>& state);
56+
State<Dimension>& state) override;
5757

5858
//! This is the derivative method that all BodyForce classes must provide.
5959
virtual
6060
void evaluateDerivatives(const Scalar /*time*/,
6161
const Scalar /*dt*/,
6262
const DataBase<Dimension>& dataBase,
6363
const State<Dimension>& state,
64-
StateDerivatives<Dimension>& derivs) const;
64+
StateDerivatives<Dimension>& derivs) const override;
6565

6666
//! Vote on the timestep. This uses a velocity-limiting rule.
6767
virtual TimeStepType dt(const DataBase<Dimension>& /*dataBase*/,
6868
const State<Dimension>& state,
6969
const StateDerivatives<Dimension>& /*derivs*/,
70-
const Scalar /*currentTime*/) const;
70+
const Scalar /*currentTime*/) const override;
7171

7272
// An optional hook to initialize once when the problem is starting up.
7373
// Typically this is used to size arrays once all the materials and NodeLists have
@@ -84,10 +84,10 @@ public:
8484
StateDerivatives<Dimension>& derivs) override;
8585

8686
//! This package opts out of building connectivity.
87-
virtual bool requireConnectivity() const { return false; }
87+
virtual bool requireConnectivity() const override { return false; }
8888

8989
//! Return the total energy contribution due to the gravitational potential.
90-
virtual Scalar extraEnergy() const;
90+
virtual Scalar extraEnergy() const override;
9191

9292
//! Return the gravitational potential created by the particle distribution.
9393
const FieldList<Dimension, Scalar>& potential() const;
@@ -117,7 +117,7 @@ public:
117117

118118
//****************************************************************************
119119
// Methods required for restarting.
120-
virtual std::string label() const { return "PolyGravity"; }
120+
virtual std::string label() const override { return "PolyGravity"; }
121121
virtual void dumpState(FileIO& file, const std::string& pathName) const;
122122
virtual void restoreState(const FileIO& file, const std::string& pathName);
123123
//****************************************************************************

‎src/Gravity/TreeGravity.hh

+7-7
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,21 @@ public:
5454

5555
//! We augment the generic body force state.
5656
virtual void registerState(DataBase<Dimension>& dataBase,
57-
State<Dimension>& state);
57+
State<Dimension>& state) override;
5858

5959
//! This is the derivative method that all BodyForce classes must provide.
6060
virtual
6161
void evaluateDerivatives(const Scalar /*time*/,
6262
const Scalar /*dt*/,
6363
const DataBase<Dimension>& dataBase,
6464
const State<Dimension>& state,
65-
StateDerivatives<Dimension>& derivs) const;
65+
StateDerivatives<Dimension>& derivs) const override;
6666

6767
//! Vote on the timestep. This uses a velocity-limiting rule.
6868
virtual TimeStepType dt(const DataBase<Dimension>& /*dataBase*/,
6969
const State<Dimension>& state,
7070
const StateDerivatives<Dimension>& /*derivs*/,
71-
const Scalar /*currentTime*/) const;
71+
const Scalar /*currentTime*/) const override;
7272

7373
// An optional hook to initialize once when the problem is starting up.
7474
// Typically this is used to size arrays once all the materials and NodeLists have
@@ -89,13 +89,13 @@ public:
8989
const Scalar /*dt*/,
9090
const DataBase<Dimension>& dataBase,
9191
State<Dimension>& state,
92-
StateDerivatives<Dimension>& /*derivs*/);
92+
StateDerivatives<Dimension>& /*derivs*/) override;
9393

9494
//! This package opts out of building connectivity.
95-
virtual bool requireConnectivity() const { return false; }
95+
virtual bool requireConnectivity() const override { return false; }
9696

9797
//! Return the total energy contribution due to the gravitational potential.
98-
virtual Scalar extraEnergy() const;
98+
virtual Scalar extraEnergy() const override;
9999

100100
//! Return the gravitational potential created by the particle distribution.
101101
const FieldList<Dimension, Scalar>& potential() const;
@@ -133,7 +133,7 @@ public:
133133

134134
//****************************************************************************
135135
// Methods required for restarting.
136-
virtual std::string label() const { return "TreeGravity"; }
136+
virtual std::string label() const override { return "TreeGravity"; }
137137
virtual void dumpState(FileIO& file, const std::string& pathName) const;
138138
virtual void restoreState(const FileIO& file, const std::string& pathName);
139139
//****************************************************************************

‎src/Material/HelmholtzEquationOfState.hh

+9-9
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public:
3939
// We require any equation of state to define the following properties.
4040
virtual void setPressure(Field<Dimension, Scalar>& Pressure,
4141
const Field<Dimension, Scalar>& massDensity,
42-
const Field<Dimension, Scalar>& specificThermalEnergy) const;
42+
const Field<Dimension, Scalar>& specificThermalEnergy) const override;
4343

4444
virtual void setPressureAndDerivs(Field<Dimension, Scalar>& Pressure, // set pressure
4545
Field<Dimension, Scalar>& dPdu, // set (\partial P)/(\partial u) (specific thermal energy)
@@ -49,31 +49,31 @@ public:
4949

5050
virtual void setTemperature(Field<Dimension, Scalar>& temperature,
5151
const Field<Dimension, Scalar>& massDensity,
52-
const Field<Dimension, Scalar>& specificThermalEnergy) const;
52+
const Field<Dimension, Scalar>& specificThermalEnergy) const override;
5353

5454
virtual void setSpecificThermalEnergy(Field<Dimension, Scalar>& specificThermalEnergy,
5555
const Field<Dimension, Scalar>& massDensity,
56-
const Field<Dimension, Scalar>& temperature) const;
56+
const Field<Dimension, Scalar>& temperature) const override;
5757

5858
virtual void setSpecificHeat(Field<Dimension, Scalar>& specificHeat,
5959
const Field<Dimension, Scalar>& massDensity,
60-
const Field<Dimension, Scalar>& temperature) const;
60+
const Field<Dimension, Scalar>& temperature) const override;
6161

6262
virtual void setSoundSpeed(Field<Dimension, Scalar>& soundSpeed,
6363
const Field<Dimension, Scalar>& massDensity,
64-
const Field<Dimension, Scalar>& specificThermalEnergy) const;
64+
const Field<Dimension, Scalar>& specificThermalEnergy) const override;
6565

6666
virtual void setGammaField(Field<Dimension, Scalar>& gamma,
6767
const Field<Dimension, Scalar>& massDensity,
68-
const Field<Dimension, Scalar>& specificThermalEnergy) const;
68+
const Field<Dimension, Scalar>& specificThermalEnergy) const override;
6969

7070
virtual void setBulkModulus(Field<Dimension, Scalar>& bulkModulus,
7171
const Field<Dimension, Scalar>& massDensity,
72-
const Field<Dimension, Scalar>& specificThermalEnergy) const;
72+
const Field<Dimension, Scalar>& specificThermalEnergy) const override;
7373

7474
virtual void setEntropy(Field<Dimension, Scalar>& entropy,
7575
const Field<Dimension, Scalar>& massDensity,
76-
const Field<Dimension, Scalar>& specificThermalEnergy) const;
76+
const Field<Dimension, Scalar>& specificThermalEnergy) const override;
7777

7878
// Some of the following methods are disabled
7979
virtual Scalar pressure(const Scalar /*massDensity*/,
@@ -109,7 +109,7 @@ public:
109109
bool getUpdateStatus() const;
110110
void setUpdateStatus(bool bSet);
111111

112-
virtual bool valid() const;
112+
virtual bool valid() const override;
113113

114114
private:
115115
//--------------------------- Private Interface ---------------------------//

‎src/Material/IsothermalEquationOfState.hh

+10-10
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public:
3333
// We require any equation of state to define the following properties.
3434
virtual void setPressure(Field<Dimension, Scalar>& Pressure,
3535
const Field<Dimension, Scalar>& massDensity,
36-
const Field<Dimension, Scalar>& specificThermalEnergy) const;
36+
const Field<Dimension, Scalar>& specificThermalEnergy) const override;
3737

3838
virtual void setPressureAndDerivs(Field<Dimension, Scalar>& Pressure, // set pressure
3939
Field<Dimension, Scalar>& dPdu, // set (\partial P)/(\partial u) (specific thermal energy)
@@ -43,31 +43,31 @@ public:
4343

4444
virtual void setTemperature(Field<Dimension, Scalar>& temperature,
4545
const Field<Dimension, Scalar>& massDensity,
46-
const Field<Dimension, Scalar>& specificThermalEnergy) const;
46+
const Field<Dimension, Scalar>& specificThermalEnergy) const override;
4747

4848
virtual void setSpecificThermalEnergy(Field<Dimension, Scalar>& specificThermalEnergy,
4949
const Field<Dimension, Scalar>& massDensity,
50-
const Field<Dimension, Scalar>& temperature) const;
50+
const Field<Dimension, Scalar>& temperature) const override;
5151

5252
virtual void setSpecificHeat(Field<Dimension, Scalar>& specificHeat,
5353
const Field<Dimension, Scalar>& massDensity,
54-
const Field<Dimension, Scalar>& temperature) const;
54+
const Field<Dimension, Scalar>& temperature) const override;
5555

5656
virtual void setSoundSpeed(Field<Dimension, Scalar>& soundSpeed,
5757
const Field<Dimension, Scalar>& massDensity,
58-
const Field<Dimension, Scalar>& specificThermalEnergy) const;
58+
const Field<Dimension, Scalar>& specificThermalEnergy) const override;
5959

6060
virtual void setGammaField(Field<Dimension, Scalar>& gamma,
6161
const Field<Dimension, Scalar>& massDensity,
62-
const Field<Dimension, Scalar>& specificThermalEnergy) const;
62+
const Field<Dimension, Scalar>& specificThermalEnergy) const override;
6363

6464
virtual void setBulkModulus(Field<Dimension, Scalar>& bulkModulus,
6565
const Field<Dimension, Scalar>& massDensity,
66-
const Field<Dimension, Scalar>& specificThermalEnergy) const;
66+
const Field<Dimension, Scalar>& specificThermalEnergy) const override;
6767

6868
virtual void setEntropy(Field<Dimension, Scalar>& entropy,
6969
const Field<Dimension, Scalar>& massDensity,
70-
const Field<Dimension, Scalar>& specificThermalEnergy) const;
70+
const Field<Dimension, Scalar>& specificThermalEnergy) const override;
7171

7272
// We also want the equivalent functions for individual calculations.
7373
Scalar pressure(const Scalar massDensity,
@@ -96,9 +96,9 @@ public:
9696

9797
// Access the member data.
9898
Scalar K() const;
99-
virtual Scalar molecularWeight() const;
99+
virtual Scalar molecularWeight() const override;
100100

101-
virtual bool valid() const;
101+
virtual bool valid() const override;
102102

103103
private:
104104
//--------------------------- Private Interface ---------------------------//

0 commit comments

Comments
 (0)