Cleanup

ewquon · Sep 16, 2024 · 5be622e · 5be622e
1 parent 993a392
commit 5be622e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/Exec/RegTests/WitchOfAgnesi/ERF_prob.cpp b/Exec/RegTests/WitchOfAgnesi/ERF_prob.cpp
@@ -48,12 +48,11 @@ Problem::init_custom_pert (
     Array4<Real const> const& /*mf_v*/,
     const SolverChoice& sc)
 {
-    const int khi = geomdata.Domain().bigEnd()[2];
+    //const int khi = geomdata.Domain().bigEnd()[2];
+    //AMREX_ALWAYS_ASSERT(bx.length()[2] == khi+1);
 
     const bool use_moisture = (sc.moisture_type != MoistureType::None);
 
-    //AMREX_ALWAYS_ASSERT(bx.length()[2] == khi+1);
-
     ParallelFor(bx, [=] AMREX_GPU_DEVICE(int i, int j, int k) noexcept
     {
         // Set scalar = 0 everywhere

diff --git a/Source/Prob/ERF_init_rayleigh_damping.H b/Source/Prob/ERF_init_rayleigh_damping.H
@@ -7,8 +7,8 @@
 void
 erf_init_rayleigh (amrex::Vector<amrex::Vector<amrex::Real> >& rayleigh_ptrs,
                    amrex::Geometry const& geom,
-                   std::unique_ptr<amrex::MultiFab>& z_phys_nd,
-                   amrex::Real zdamp) override
+                   std::unique_ptr<amrex::MultiFab>& /*z_phys_nd*/,
+                   amrex::Real /*zdamp*/) override
 {
     const int khi = geom.Domain().bigEnd()[2];
     for (int k = 0; k <= khi; k++)

diff --git a/Source/TimeIntegration/ERF_advance_dycore.cpp b/Source/TimeIntegration/ERF_advance_dycore.cpp
@@ -71,8 +71,6 @@ void ERF::advance_dycore(int level,
 
     Vector<Real*> d_rayleigh_ptrs_at_lev;
     d_rayleigh_ptrs_at_lev.resize(Rayleigh::nvars);
-    bool rayleigh_damp_any = (solverChoice.rayleigh_damp_U ||solverChoice.rayleigh_damp_V ||
-                              solverChoice.rayleigh_damp_W ||solverChoice.rayleigh_damp_T);
     d_rayleigh_ptrs_at_lev[Rayleigh::ubar]     = solverChoice.rayleigh_damp_U   ? d_rayleigh_ptrs[level][Rayleigh::ubar].data() : nullptr;
     d_rayleigh_ptrs_at_lev[Rayleigh::vbar]     = solverChoice.rayleigh_damp_V   ? d_rayleigh_ptrs[level][Rayleigh::vbar].data() : nullptr;
     d_rayleigh_ptrs_at_lev[Rayleigh::wbar]     = solverChoice.rayleigh_damp_W   ? d_rayleigh_ptrs[level][Rayleigh::wbar].data() : nullptr;