more fixes

AMReX-Astro · Aug 29, 2024 · 3a955b8 · 3a955b8
1 parent 7351ada
commit 3a955b8
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 28 deletions.
diff --git a/Exec/radiation_tests/Rad2Tshock/problem_initialize.H b/Exec/radiation_tests/Rad2Tshock/problem_initialize.H
@@ -14,8 +14,8 @@ void problem_initialize ()
 
     eos_state.rho = problem::rho0;
     eos_state.T = problem::T0;
-    for (int n = 0; n < NumSpec; n++) {
-        eos_state.xn[n] = 0.0_rt;
+    for (auto & X : eos_state.xn) {
+        X = 0.0_rt;
     }
     eos_state.xn[0]  = 1.0_rt;
 

diff --git a/Exec/radiation_tests/Rad2Tshock/problem_initialize_rad_data.H b/Exec/radiation_tests/Rad2Tshock/problem_initialize_rad_data.H
@@ -12,6 +12,9 @@ void problem_initialize_rad_data (int i, int j, int k,
                                   const GeometryData& geomdata)
 {
 
+    amrex::ignore_unused(nugroup);
+    amrex::ignore_unused(dnugroup);
+
     const Real* dx = geomdata.CellSize();
     const Real* problo = geomdata.ProbLo();
 

diff --git a/Source/driver/Castro.cpp b/Source/driver/Castro.cpp
@@ -737,7 +737,7 @@ Castro::Castro (Amr&            papa,
       }
       radiation->regrid(level, grids, dmap);
 
-      rad_solver.reset(new RadSolve(parent, level, grids, dmap));
+      rad_solver = std::make_unique<RadSolve>(parent, level, grids, dmap);
     }
 #endif
 
@@ -751,7 +751,7 @@ Castro::Castro (Amr&            papa,
 Castro::~Castro ()  // NOLINT(modernize-use-equals-default)
 {
 #ifdef RADIATION
-    if (radiation != 0) {
+    if (radiation != nullptr) {
       //radiation->cleanup(level);
       radiation->close(level);
     }

diff --git a/Source/radiation/HypreMultiABec.H b/Source/radiation/HypreMultiABec.H
@@ -341,7 +341,9 @@ class CrseBndryAuxVar : public BndryAuxVarBase {
 /// @param ori
 /// @param i
 ///
-  int size (const amrex::Orientation ori, int i) const { return aux[ori][i].size(); }
+  int size (const amrex::Orientation ori, int i) const {
+      return static_cast<int>(aux[ori][i].size());
+  }
 
   AuxVarBox& operator() (const amrex::Orientation ori, int i, int j) {
     return *aux[ori][i][j];
@@ -403,6 +405,11 @@ class HypreMultiABec {
 
   virtual ~HypreMultiABec();
 
+  HypreMultiABec(const HypreMultiABec& src) = delete;
+  HypreMultiABec(const HypreMultiABec&& src) = delete;
+
+  HypreMultiABec operator=(const HypreMultiABec& src) = delete;
+  HypreMultiABec operator=(const HypreMultiABec&& src) = delete;
 
 ///
 /// @param level

diff --git a/Source/radiation/MGRadBndry.H b/Source/radiation/MGRadBndry.H
@@ -22,9 +22,6 @@ public:
              const int _ngroups,
              const amrex::Geometry& _geom);
 
-  ~MGRadBndry();
-
-
 ///
 /// @param phys_bc
 /// @param geom

diff --git a/Source/radiation/MGRadBndry.cpp b/Source/radiation/MGRadBndry.cpp
@@ -58,10 +58,6 @@ MGRadBndry::MGRadBndry(const BoxArray& _grids,
   }
 }
 
-MGRadBndry::~MGRadBndry()
-{
-}
-
 void MGRadBndry::init(const int _ngroups)
 {
   // obsolete implementation of the Marshak boundary condition requires

diff --git a/Source/radiation/RadBndry.H b/Source/radiation/RadBndry.H
@@ -28,8 +28,6 @@ public:
   RadBndry(const amrex::BoxArray& _grids, const amrex::DistributionMapping& _dmap,
            const amrex::Geometry& _geom, amrex::Real bv);
 
-  ~RadBndry();
-
 
 ///
 /// @param phys_bc

diff --git a/Source/radiation/RadBndry.cpp b/Source/radiation/RadBndry.cpp
@@ -65,10 +65,6 @@ RadBndry::RadBndry(const BoxArray& _grids, const DistributionMapping& _dmap,
   setBndryValues(bv);
 }
 
-RadBndry::~RadBndry()
-{
-}
-
 void RadBndry::init()
 {
   // obsolete implementation of the Marshak boundary condition requires

diff --git a/Source/radiation/Radiation.H b/Source/radiation/Radiation.H
@@ -191,11 +191,11 @@ public:
     return delta_T_rat_level[lev];
   }
 
-  amrex::Real deltaEnergyTol() {
+  [[nodiscard]] amrex::Real deltaEnergyTol() const {
     return delta_e_rat_dt_tol;
   }
 
-  amrex::Real deltaTTol() {
+  [[nodiscard]] amrex::Real deltaTTol() const {
     return delta_T_rat_dt_tol;
   }
 

diff --git a/Source/radiation/_interpbndry/RadBndryData.H b/Source/radiation/_interpbndry/RadBndryData.H
@@ -94,6 +94,21 @@ public:
 //@ManMemo: administrative functions
 //@ManDoc: default constructor
     RadBndryData() : amrex::BndryRegister() {};
+
+    ~RadBndryData() = default;
+
+    //
+    // Disabled!
+    //
+//@ManDoc: copy constructor
+    RadBndryData(const RadBndryData& src) = delete;
+//@ManDoc: copy operator
+    RadBndryData& operator = (const RadBndryData& src) = delete;
+//@ManDoc: move constructor
+    RadBndryData(const RadBndryData&& src) = delete;
+//@ManDoc: move operator
+    RadBndryData& operator = (const RadBndryData&& src) = delete;
+
 //@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);
@@ -167,14 +182,6 @@ public:
     }
 
 
-private:
-    //
-    // Disabled!
-    //
-//@ManDoc: copy constructor
-    RadBndryData(const RadBndryData& src);
-//@ManDoc: copy operator
-    RadBndryData& operator = (const RadBndryData& src);
 };
 
 #endif