some more progress

Author: zingale

.clang-tidy

@@ -13,13 +13,13 @@ Checks: >
        -cppcoreguidelines-init-variables,
        -cppcoreguidelines-interfaces-global-init,
        -cppcoreguidelines-macro-usage,
-       -cppcoreguidelines-no-malloc,
        -cppcoreguidelines-non-private-member-variables-in-classes,
        -cppcoreguidelines-owning-memory,
        -cppcoreguidelines-pro-*,
      misc-*,
        -misc-const-correctness,
        -misc-include-cleaner,
+       -misc-use-internal-linkage,
        -misc-non-private-member-variables-in-classes,
        -misc-no-recursion,
      modernize-*,

Source/BaseStateGeometry.cpp

@@ -48,7 +48,7 @@ void BaseStateGeometry::Init(const int max_radial_level_in,
     // compute center(:)
     if (octant) {
         for (auto i = 0; i < 3; ++i) {
-            if (!(spherical && AMREX_SPACEDIM == 3 && probLo[i] == 0.0)) {
+            if (!(spherical && AMREX_SPACEDIM == 3 && probLo[i] == 0.0)) {  // NOLINT(misc-redundant-expression)
                 Abort("ERROR: octant requires spherical with prob_lo = 0.0");
             }
             center[i] = 0.0;

Source/MaestroAverage.cpp

@@ -38,7 +38,7 @@ void Maestro::Average(const Vector<MultiFab>& phi, BaseState<Real>& phibar,
             // compute number of cells at any given height for each level
             if (AMREX_SPACEDIM == 2) {
                 ncell(lev) = domainBox.bigEnd(0) + 1;
-            } else if (AMREX_SPACEDIM == 3) {
+            } else if (AMREX_SPACEDIM == 3) {  // NOLINT(misc-redundant-expression)
                 ncell(lev) =
                     (domainBox.bigEnd(0) + 1) * (domainBox.bigEnd(1) + 1);
             }

Source/MaestroEvolve.cpp

@@ -14,9 +14,11 @@ void Maestro::Evolve() {
     amrex::Print() << amrex::Font::Bold << amrex::FGColor::Green << "Beginning main evolution" << amrex::ResetDisplay << std::endl;
 
     // check to make sure spherical is only used for 3d
-    if (spherical && AMREX_SPACEDIM != 3) {
+#if AMREX_SPACEDIM < 3
+    if (spherical) {
         Abort("spherical = 1 and dm != 3");
     }
+#endif
 
     // index for diag array buffer
     int diag_index = 0;

Source/PhysBCFunctMaestro.H

@@ -4,10 +4,14 @@
 #include <AMReX_PhysBCFunct.H>
 
 extern "C" {
-typedef void (*BndryFuncDefaultMaestro)(
-    const amrex::Array4<amrex::Real>& scal, const amrex::Box& bx,
-    const amrex::Box& domainBox, const amrex::Real* dx, const amrex::BCRec bcs,
-    const amrex::Real* gridlo, const int comp);
+using BndryFuncDefaultMaestro =
+    void (*)(const amrex::Array4<amrex::Real>& scal,
+             const amrex::Box& bx,
+             const amrex::Box& domainBox,
+             const amrex::Real* dx,
+             const amrex::BCRec bcs,
+             const amrex::Real* gridlo,
+             const int comp);
 }
 
 /// This version calls function working on array

Util/model_parser/ModelParser.H

@@ -11,11 +11,11 @@
 /// Define Real vector types for CUDA-compatability. If `AMREX_USE_CUDA`, then
 /// this will be stored in CUDA managed memory.
 #ifdef AMREX_USE_CUDA
-typedef amrex::Gpu::ManagedVector<amrex::Real> RealVector;
-typedef amrex::Gpu::ManagedVector<int> IntVector;
+using RealVector = amrex::Gpu::ManagedVector<amrex::Real>;
+using IntVector = amrex::Gpu::ManagedVector<int>;
 #else
-typedef amrex::Vector<amrex::Real> RealVector;
-typedef amrex::Vector<int> IntVector;
+using RealVector = amrex::Vector<amrex::Real>;
+using IntVector = amrex::Vector<int>;
 #endif
 
 class ModelParser {