From 575bab99e2331f5c23a24c25deeff33b125ceee4 Mon Sep 17 00:00:00 2001 From: Weiqun Zhang Date: Sun, 17 Mar 2024 15:53:15 -0700 Subject: [PATCH] Clang-Tidy 17: bugprone-switch-missing-default-case --- Src/AmrCore/AMReX_Interp_2D_C.H | 1 + Src/AmrCore/AMReX_Interp_3D_C.H | 1 + Src/Base/AMReX_BLBackTrace.cpp | 1 + Src/Base/AMReX_CoordSys.cpp | 12 ++++++++++++ Src/Base/AMReX_FilCC_1D_C.H | 2 ++ Src/Base/AMReX_FilCC_2D_C.H | 4 ++++ Src/Base/AMReX_FilCC_3D_C.H | 6 ++++++ Src/Base/AMReX_FilFC_1D_C.H | 2 ++ Src/Base/AMReX_FilFC_2D_C.H | 4 ++++ Src/Base/AMReX_FilFC_3D_C.H | 6 ++++++ Src/Base/AMReX_MultiFabUtil_2D_C.H | 4 ++++ Src/Base/AMReX_MultiFabUtil_3D_C.H | 4 ++++ Src/Base/AMReX_MultiFabUtil_nd_C.H | 2 ++ Src/EB/AMReX_EB2.cpp | 2 +- 14 files changed, 50 insertions(+), 1 deletion(-) diff --git a/Src/AmrCore/AMReX_Interp_2D_C.H b/Src/AmrCore/AMReX_Interp_2D_C.H index 20f8b1c3a0f..a47f265011d 100644 --- a/Src/AmrCore/AMReX_Interp_2D_C.H +++ b/Src/AmrCore/AMReX_Interp_2D_C.H @@ -128,6 +128,7 @@ facediv_face_interp (int ci, int cj, int /*ck*/, break; } + default : { break; } } } diff --git a/Src/AmrCore/AMReX_Interp_3D_C.H b/Src/AmrCore/AMReX_Interp_3D_C.H index daa19f6d5e3..709b44761d0 100644 --- a/Src/AmrCore/AMReX_Interp_3D_C.H +++ b/Src/AmrCore/AMReX_Interp_3D_C.H @@ -204,6 +204,7 @@ facediv_face_interp (int ci, int cj, int ck, break; } + default : { break; } } } diff --git a/Src/Base/AMReX_BLBackTrace.cpp b/Src/Base/AMReX_BLBackTrace.cpp index ce0a78bcff5..65d7f266946 100644 --- a/Src/Base/AMReX_BLBackTrace.cpp +++ b/Src/Base/AMReX_BLBackTrace.cpp @@ -70,6 +70,7 @@ BLBackTrace::handler(int s) case SIGABRT: amrex::ErrorStream() << "SIGABRT\n"; break; + default: break; } #if defined(AMREX_BACKTRACE_SUPPORTED) || defined(AMREX_TINY_PROFILING) diff --git a/Src/Base/AMReX_CoordSys.cpp b/Src/Base/AMReX_CoordSys.cpp index 888d2cc10c9..757af532cc5 100644 --- a/Src/Base/AMReX_CoordSys.cpp +++ b/Src/Base/AMReX_CoordSys.cpp @@ -482,6 +482,8 @@ CoordSys::AreaLo (const IntVect& point, int dir) const noexcept // NOLINT(readab { case 0: return dx[1]; case 1: return dx[0]; + default: + AMREX_ASSERT(0); } return 0._rt; // to silent compiler warning case RZ: @@ -490,6 +492,8 @@ CoordSys::AreaLo (const IntVect& point, int dir) const noexcept // NOLINT(readab { case 0: return Real(TWOPI)*dx[1]*xlo[0]; case 1: return ((xlo[0]+dx[0])*(xlo[0]+dx[0])-xlo[0]*xlo[0])*static_cast(0.5*TWOPI); + default: + AMREX_ASSERT(0); } return 0._rt; // to silent compiler warning default: @@ -502,6 +506,8 @@ CoordSys::AreaLo (const IntVect& point, int dir) const noexcept // NOLINT(readab case 0: return dx[1]*dx[2]; case 1: return dx[0]*dx[2]; case 2: return dx[1]*dx[0]; + default: + AMREX_ASSERT(0); } #endif return 0; @@ -520,6 +526,8 @@ CoordSys::AreaHi (const IntVect& point, int dir) const noexcept // NOLINT(readab { case 0: return dx[1]; case 1: return dx[0]; + default: + AMREX_ASSERT(0); } return 0._rt; // to silent compiler warning case RZ: @@ -528,6 +536,8 @@ CoordSys::AreaHi (const IntVect& point, int dir) const noexcept // NOLINT(readab { case 0: return Real(TWOPI)*dx[1]*xhi[0]; case 1: return (xhi[0]*xhi[0]-(xhi[0]-dx[0])*(xhi[0]-dx[0]))*static_cast(TWOPI*0.5); + default: + AMREX_ASSERT(0); } return 0._rt; // to silent compiler warning default: @@ -540,6 +550,8 @@ CoordSys::AreaHi (const IntVect& point, int dir) const noexcept // NOLINT(readab case 0: return dx[1]*dx[2]; case 1: return dx[0]*dx[2]; case 2: return dx[1]*dx[0]; + default: + AMREX_ASSERT(0); } #endif return 0._rt; diff --git a/Src/Base/AMReX_FilCC_1D_C.H b/Src/Base/AMReX_FilCC_1D_C.H index 5f21541432c..4021e4b52a0 100644 --- a/Src/Base/AMReX_FilCC_1D_C.H +++ b/Src/Base/AMReX_FilCC_1D_C.H @@ -69,6 +69,7 @@ struct FilccCell q(i,0,0,n) = -q(2*ilo-i-1,0,0,n); break; } + default: { break; } } } else if (i > ihi) @@ -111,6 +112,7 @@ struct FilccCell q(i,0,0,n) = -q(2*ihi-i+1,0,0,n); break; } + default: { break; } } } } diff --git a/Src/Base/AMReX_FilCC_2D_C.H b/Src/Base/AMReX_FilCC_2D_C.H index 79f65156d48..80b92929724 100644 --- a/Src/Base/AMReX_FilCC_2D_C.H +++ b/Src/Base/AMReX_FilCC_2D_C.H @@ -74,6 +74,7 @@ struct FilccCell q(i,j,0,n) = -q(2*ilo-i-1,j,0,n); break; } + default: { break; } } } else if (i > ihi) @@ -116,6 +117,7 @@ struct FilccCell q(i,j,0,n) = -q(2*ihi-i+1,j,0,n); break; } + default: { break; } } } @@ -159,6 +161,7 @@ struct FilccCell q(i,j,0,n) = -q(i,2*jlo-j-1,0,n); break; } + default: { break; } } } else if (j > jhi) @@ -201,6 +204,7 @@ struct FilccCell q(i,j,0,n) = -q(i,2*jhi-j+1,0,n); break; } + default: { break; } } } } diff --git a/Src/Base/AMReX_FilCC_3D_C.H b/Src/Base/AMReX_FilCC_3D_C.H index 6a2e3dccfcf..f311045c0a1 100644 --- a/Src/Base/AMReX_FilCC_3D_C.H +++ b/Src/Base/AMReX_FilCC_3D_C.H @@ -73,6 +73,7 @@ struct FilccCell q(i,j,k,n) = -q(2*ilo-i-1,j,k,n); break; } + default: { break; } } } else if (i > ihi) @@ -115,6 +116,7 @@ struct FilccCell q(i,j,k,n) = -q(2*ihi-i+1,j,k,n); break; } + default: { break; } } } @@ -158,6 +160,7 @@ struct FilccCell q(i,j,k,n) = -q(i,2*jlo-j-1,k,n); break; } + default: { break; } } } else if (j > jhi) @@ -200,6 +203,7 @@ struct FilccCell q(i,j,k,n) = -q(i,2*jhi-j+1,k,n); break; } + default: { break; } } } @@ -243,6 +247,7 @@ struct FilccCell q(i,j,k,n) = -q(i,j,2*klo-k-1,n); break; } + default: { break; } } } else if (k > khi) @@ -285,6 +290,7 @@ struct FilccCell q(i,j,k,n) = -q(i,j,2*khi-k+1,n); break; } + default: { break; } } } } diff --git a/Src/Base/AMReX_FilFC_1D_C.H b/Src/Base/AMReX_FilFC_1D_C.H index 43e3a1d41d0..31fe69f7fa0 100644 --- a/Src/Base/AMReX_FilFC_1D_C.H +++ b/Src/Base/AMReX_FilFC_1D_C.H @@ -66,6 +66,7 @@ struct FilfcFace q(i,0,0,n) = -q(2*ilo-i,0,0,n); break; } + default: { break; } } } else if (i == ihi) @@ -106,6 +107,7 @@ struct FilfcFace q(i,0,0,n) = -q(2*ihi-i,0,0,n); break; } + default: { break; } } } } diff --git a/Src/Base/AMReX_FilFC_2D_C.H b/Src/Base/AMReX_FilFC_2D_C.H index 0185386392a..df76a2de23b 100644 --- a/Src/Base/AMReX_FilFC_2D_C.H +++ b/Src/Base/AMReX_FilFC_2D_C.H @@ -74,6 +74,7 @@ struct FilfcFace : -q(2*ilo-i-1,j,0,n); break; } + default: { break; } } } else if (i == ihi) @@ -118,6 +119,7 @@ struct FilfcFace : -q(2*ihi-i+1,j,0,n); break; } + default: { break; } } } @@ -163,6 +165,7 @@ struct FilfcFace : -q(i,2*jlo-j-1,0,n); break; } + default: { break; } } } else if (j == jhi) @@ -207,6 +210,7 @@ struct FilfcFace : -q(i,2*jhi-j+1,0,n); break; } + default: { break; } } } } diff --git a/Src/Base/AMReX_FilFC_3D_C.H b/Src/Base/AMReX_FilFC_3D_C.H index 76c49fdc86a..1628131caae 100644 --- a/Src/Base/AMReX_FilFC_3D_C.H +++ b/Src/Base/AMReX_FilFC_3D_C.H @@ -77,6 +77,7 @@ struct FilfcFace : -q(2*ilo-i-1,j,k,n); break; } + default: { break; } } } if (i == ihi) @@ -121,6 +122,7 @@ struct FilfcFace : -q(2*ihi-i+1,j,k,n); break; } + default: { break; } } } @@ -166,6 +168,7 @@ struct FilfcFace : -q(i,2*jlo-j-1,k,n); break; } + default: { break; } } } else if (j == jhi) @@ -210,6 +213,7 @@ struct FilfcFace : -q(i,2*jhi-j+1,k,n); break; } + default: { break; } } } @@ -255,6 +259,7 @@ struct FilfcFace : -q(i,j,2*klo-k-1,n); break; } + default: { break; } } } if (k == khi) @@ -299,6 +304,7 @@ struct FilfcFace : -q(i,j,2*khi-k+1,n); break; } + default: { break; } } } } diff --git a/Src/Base/AMReX_MultiFabUtil_2D_C.H b/Src/Base/AMReX_MultiFabUtil_2D_C.H index 3cb97db8e2d..0a55ba0540a 100644 --- a/Src/Base/AMReX_MultiFabUtil_2D_C.H +++ b/Src/Base/AMReX_MultiFabUtil_2D_C.H @@ -120,6 +120,7 @@ void amrex_avgdown_faces (Box const& bx, Array4 const& crse, } break; } + default: { break; } } } @@ -157,6 +158,7 @@ void amrex_avgdown_faces (int i, int j, int, int n, Array4 const& crse, crse(i,j,0,n+ccomp) = c * facInv; break; } + default: { break; } } } @@ -206,6 +208,7 @@ void amrex_avgdown_edges (Box const& bx, Array4 const& crse, } break; } + default: { break; } } } @@ -242,6 +245,7 @@ void amrex_avgdown_edges (int i, int j, int, int n, Array4 const& crse, crse(i,j,0,n+ccomp) = c * facInv; break; } + default: { break; } } } diff --git a/Src/Base/AMReX_MultiFabUtil_3D_C.H b/Src/Base/AMReX_MultiFabUtil_3D_C.H index 0cc12ff1aba..5945e7e511b 100644 --- a/Src/Base/AMReX_MultiFabUtil_3D_C.H +++ b/Src/Base/AMReX_MultiFabUtil_3D_C.H @@ -164,6 +164,7 @@ void amrex_avgdown_faces (Box const& bx, Array4 const& crse, } break; } + default: { break; } } } @@ -214,6 +215,7 @@ void amrex_avgdown_faces (int i, int j, int k, int n, Array4 const& crse, crse(i,j,k,n+ccomp) = c * facInv; break; } + default: { break; } } } @@ -287,6 +289,7 @@ void amrex_avgdown_edges (Box const& bx, Array4 const& crse, } break; } + default: { break; } } } @@ -333,6 +336,7 @@ void amrex_avgdown_edges (int i, int j, int k, int n, Array4 const& crse, crse(i,j,k,n+ccomp) = c * facInv; break; } + default: { break; } } } diff --git a/Src/Base/AMReX_MultiFabUtil_nd_C.H b/Src/Base/AMReX_MultiFabUtil_nd_C.H index 3956e818316..cffec43d2f1 100644 --- a/Src/Base/AMReX_MultiFabUtil_nd_C.H +++ b/Src/Base/AMReX_MultiFabUtil_nd_C.H @@ -39,6 +39,7 @@ void amrex_fill_slice_interp (Box const& bx, Array4 slice, break; case 2: khi = 1; + default: { break; } } } else { switch (dir) @@ -51,6 +52,7 @@ void amrex_fill_slice_interp (Box const& bx, Array4 slice, break; case 2: klo = -1; + default: { break; } } } diff --git a/Src/EB/AMReX_EB2.cpp b/Src/EB/AMReX_EB2.cpp index ba4c1c3ec07..87ecb9c4392 100644 --- a/Src/EB/AMReX_EB2.cpp +++ b/Src/EB/AMReX_EB2.cpp @@ -260,7 +260,7 @@ BuildFromChkptFile (std::string const& fname, max_coarsening_level, ngrow, build_coarse_level_by_coarsening, a_extend_domain_face)); -} +} // NOLINT(clang-analyzer-cplusplus.NewDeleteLeaks) namespace { int comp_max_crse_level (Box cdomain, const Box& domain)