diff --git a/Exec/radiation_tests/Rad2Tshock/problem_initialize_state_data.H b/Exec/radiation_tests/Rad2Tshock/problem_initialize_state_data.H index 96fe4057e0..c5e67920a5 100644 --- a/Exec/radiation_tests/Rad2Tshock/problem_initialize_state_data.H +++ b/Exec/radiation_tests/Rad2Tshock/problem_initialize_state_data.H @@ -16,7 +16,7 @@ void problem_initialize_state_data (int i, int j, int k, // Provides the simulation to be run in the x,y,or z direction // where length direction is the length side in a square prism - Real length_cell; + Real length_cell{}; if (problem::idir == 1) { length_cell = problo[0] + dx[0] * (static_cast(i) + 0.5_rt); } else if (problem::idir == 2) { diff --git a/Source/radiation/HypreABec.H b/Source/radiation/HypreABec.H index 10cc5e96f6..b41f641427 100644 --- a/Source/radiation/HypreABec.H +++ b/Source/radiation/HypreABec.H @@ -33,6 +33,10 @@ class HypreABec { ~HypreABec(); + HypreABec(const HypreABec& a) = delete; + HypreABec(const HypreABec&& a) = delete; + HypreABec& operator= (const HypreABec& a) = delete; + HypreABec& operator= (const HypreABec&& a) = delete; /// /// @param v @@ -48,10 +52,10 @@ class HypreABec { /// void setScalars(amrex::Real alpha, amrex::Real beta); - amrex::Real getAlpha() const { + [[nodiscard]] amrex::Real getAlpha() const { return alpha; } - amrex::Real getBeta() const { + [[nodiscard]] amrex::Real getBeta() const { return beta; } diff --git a/Source/radiation/HypreExtMultiABec.H b/Source/radiation/HypreExtMultiABec.H index 911b2ca657..3290fc06f4 100644 --- a/Source/radiation/HypreExtMultiABec.H +++ b/Source/radiation/HypreExtMultiABec.H @@ -23,13 +23,17 @@ class HypreExtMultiABec : public HypreMultiABec { a2coefs(fine_level+1), ccoefs( fine_level+1), d1coefs(fine_level+1), - d2coefs(fine_level+1), - alpha2(0.0), gamma(0.0), delta1(0.0), delta2(0.0) - { - } + d2coefs(fine_level+1) + {} ~HypreExtMultiABec(); + HypreExtMultiABec(const HypreExtMultiABec& src) = delete; + HypreExtMultiABec(const HypreExtMultiABec&& src) = delete; + + HypreExtMultiABec& operator= (const HypreExtMultiABec& src) = delete; + HypreExtMultiABec& operator= (const HypreExtMultiABec&& src) = delete; + amrex::Real& a2Multiplier() { return alpha2; } @@ -134,7 +138,7 @@ class HypreExtMultiABec : public HypreMultiABec { amrex::Vector > > ccoefs; ///< face-based, 2 component amrex::Vector > > d1coefs; ///< cell-based but directional amrex::Vector > > d2coefs; ///< face-based - amrex::Real alpha2, gamma, delta1, delta2; ///< multipliers for the above + amrex::Real alpha2{}, gamma{}, delta1{}, delta2{}; ///< multipliers for the above }; #endif diff --git a/Source/radiation/HypreMultiABec.H b/Source/radiation/HypreMultiABec.H index 0a39aec47f..51a936a273 100644 --- a/Source/radiation/HypreMultiABec.H +++ b/Source/radiation/HypreMultiABec.H @@ -21,38 +21,34 @@ class AuxVar { class Connex { public: - Connex() { - other = NULL; - } + Connex() : + other(nullptr) + {} /// /// @param p /// @param r /// - Connex(AuxVar* p, amrex::Real r) { - val = r; - other = p; - } + Connex(AuxVar* p, amrex::Real r) : + val(r), other(p) + {} /// /// @param lev /// @param iv /// @param r /// - Connex(int lev, const amrex::IntVect& iv, amrex::Real r) { - val = r; - index = iv; - level = lev; - other = NULL; - } + Connex(int lev, const amrex::IntVect& iv, amrex::Real r) : + val(r), index(iv), level(lev), other(nullptr) + {} /// /// @param c /// - bool same_target(const Connex& c) { - return ((other != NULL) + [[nodiscard]] bool same_target(const Connex& c) const { + return ((other != nullptr) ? (other == c.other) - : (c.other == NULL && level == c.level && index == c.index)); + : (c.other == nullptr && level == c.level && index == c.index)); } amrex::Real val; @@ -63,8 +59,7 @@ class AuxVar { public: - AuxVar() : secondary_flag(0) { - } + AuxVar() = default; /// @@ -72,7 +67,7 @@ class AuxVar { /// @param r /// void push(AuxVar* p, amrex::Real r) { - a.push_back(Connex(p,r)); + a.emplace_back(p, r); } @@ -82,7 +77,7 @@ class AuxVar { /// @param r /// void push(int lev, const amrex::IntVect& iv, amrex::Real r) { - a.push_back(Connex(lev,iv,r)); + a.emplace_back(lev, iv, r); } @@ -95,7 +90,7 @@ class AuxVar { /// @param p->secondary_flag /// if (p->secondary_flag == 0) { // don't count the same secondary twice - a.push_back(Connex(p,1.0)); + a.emplace_back(p, 1.0); p->secondary_flag = 1; } } @@ -104,7 +99,7 @@ class AuxVar { return a.empty(); } - bool secondary() { + [[nodiscard]] bool secondary() const { return secondary_flag; } @@ -128,7 +123,7 @@ class AuxVar { protected: std::list a; - int secondary_flag; + int secondary_flag{}; }; /// @@ -149,7 +144,7 @@ class AuxVarBox { /// @param bx /// AuxVarBox(const amrex::Box& bx) : domain(bx) { - int numpts = domain.numPts(); + auto numpts = domain.numPts(); dptr = new AuxVar[numpts]; } @@ -163,7 +158,7 @@ class AuxVarBox { return dptr[domain.index(p)]; } - const amrex::Box& box() const { + [[nodiscard]] const amrex::Box& box() const { return domain; } @@ -422,10 +417,10 @@ class HypreMultiABec { const amrex::DistributionMapping& _dmap, amrex::IntVect _crse_ratio); - int crseLevel() { + [[nodiscard]] int crseLevel() const { return crse_level; } - int fineLevel() { + [[nodiscard]] int fineLevel() const { return fine_level; } @@ -501,10 +496,10 @@ class HypreMultiABec { /// void setScalars(amrex::Real alpha, amrex::Real beta); - amrex::Real getAlpha() const { + [[nodiscard]] amrex::Real getAlpha() const { return alpha; } - amrex::Real getBeta() const { + [[nodiscard]] amrex::Real getBeta() const { return beta; } diff --git a/Source/radiation/NGBndry.H b/Source/radiation/NGBndry.H index 0fccdaa3c3..e90c1faef2 100644 --- a/Source/radiation/NGBndry.H +++ b/Source/radiation/NGBndry.H @@ -22,16 +22,10 @@ class NGBndry : public RadInterpBndryData public: NGBndry(const amrex::BoxArray& _grids, const amrex::DistributionMapping& _dmap, int _ncomp, const amrex::Geometry& _geom) : - -/// -/// @param _grids -/// @param _dmap -/// @param _ncomp -/// @param _geom -/// RadInterpBndryData(_grids,_dmap,_ncomp,_geom) { } + /// /// @param bc /// @param phys_bc_mode @@ -51,7 +45,7 @@ public: /// /// @param _face /// - virtual int mixedBndry(const amrex::Orientation& _face) const { + virtual int mixedBndry(const amrex::Orientation& /* _face */) const { return 0; } @@ -62,13 +56,6 @@ protected: /// amrex::Vector< std::unique_ptr > > bctypearray[2*AMREX_SPACEDIM]; - -/// -/// @param src -/// -private: - NGBndry(const NGBndry& src); - NGBndry& operator=(const NGBndry& src); }; /// diff --git a/Source/radiation/RadBndry.H b/Source/radiation/RadBndry.H index 2f137f4e72..5f2e60e58c 100644 --- a/Source/radiation/RadBndry.H +++ b/Source/radiation/RadBndry.H @@ -110,7 +110,7 @@ public: /// NGBndry* operator()(const amrex::BoxArray& _grids, const amrex::DistributionMapping& _dmap, - int _ncomp, + int /* _ncomp */, const amrex::Geometry& _geom) const { return new RadBndry(_grids, _dmap, _geom); } diff --git a/Source/radiation/RadSolve.H b/Source/radiation/RadSolve.H index d85c6dee43..2fb694ab03 100644 --- a/Source/radiation/RadSolve.H +++ b/Source/radiation/RadSolve.H @@ -29,7 +29,6 @@ class RadSolve { RadSolve (amrex::Amr* Parent, int level, const amrex::BoxArray& grids, const amrex::DistributionMapping& dmap); - ~RadSolve () {} /// /// query runtime parameters diff --git a/Source/radiation/Radiation.H b/Source/radiation/Radiation.H index 58be11061a..027f78e13e 100644 --- a/Source/radiation/Radiation.H +++ b/Source/radiation/Radiation.H @@ -111,8 +111,6 @@ public: /// @param restart /// Radiation(amrex::Amr* Parent, class Castro* castro, int restart = 0); - ~Radiation() { } - /// /// @param level diff --git a/Source/radiation/_interpbndry/RadBndryData.H b/Source/radiation/_interpbndry/RadBndryData.H index 3df1041532..bd823f1512 100644 --- a/Source/radiation/_interpbndry/RadBndryData.H +++ b/Source/radiation/_interpbndry/RadBndryData.H @@ -97,8 +97,7 @@ public: //@ManDoc: constructor specifying number of components and box of physical domain (cell-centered) RadBndryData(const amrex::BoxArray& _grids, const amrex::DistributionMapping& _dmap, int _ncomp, const ProxyGeometry& geom); -//@ManDoc: destructor - virtual ~RadBndryData(); + //@ManDoc: allocate bndry fabs along given face void define(const amrex::BoxArray& _grids, const amrex::DistributionMapping& _dmap, int _ncomp, const ProxyGeometry& geom); @@ -179,4 +178,3 @@ private: }; #endif - diff --git a/Source/radiation/_interpbndry/RadBndryData.cpp b/Source/radiation/_interpbndry/RadBndryData.cpp index 850a36e797..0439f707dc 100644 --- a/Source/radiation/_interpbndry/RadBndryData.cpp +++ b/Source/radiation/_interpbndry/RadBndryData.cpp @@ -32,10 +32,6 @@ RadBndryData::RadBndryData(const BoxArray& _grids, const DistributionMapping& _d // (*this) = src; // } -RadBndryData::~RadBndryData() -{ -} - std::ostream& operator << (std::ostream& os, const RadBndryData &mgb) { const BoxArray& grds = mgb.boxes(); @@ -129,4 +125,3 @@ RadBndryData::define(const BoxArray& _grids, const DistributionMapping& _dmap, } } } -