fix again

AMReX-Astro · Mar 25, 2024 · 0b549c6 · 0b549c6
1 parent 1476d4c
commit 0b549c6
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 15 deletions.
diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
@@ -12,10 +12,10 @@ jobs:
           git submodule update --init
           cd external/Microphysics
           git fetch; git checkout development
-          echo 'MICROPHYSICS_HOME=$(pwd)' > $GITHUB_ENV
+          echo "MICROPHYSICS_HOME=$(pwd)" >> $GITHUB_ENV
           cd ../amrex
           git fetch; git checkout development
-          echo 'AMREX_HOME=$(pwd)' > $GITHUB_ENV
+          echo "AMREX_HOME=$(pwd)" >> $GITHUB_ENV
           cd ../..
 
       - name: Install dependencies
@@ -24,6 +24,8 @@ jobs:
 
       - name: Compile flame_wave
         run: |
+          echo $AMREX_HOME
+          echo $MICROPHYSICS_HOME
           cd Exec/science/subchandra
           make USE_MPI=FALSE USE_CLANG_TIDY=TRUE CLANG_TIDY=clang-tidy-17 CLANG_TIDY_WARN_ERROR=TRUE -j 4
 
diff --git a/Exec/hydro_tests/Sedov/problem_initialize.H b/Exec/hydro_tests/Sedov/problem_initialize.H
@@ -22,10 +22,7 @@ void problem_initialize ()
         }
     }
 
-    Real xn_zone[NumSpec];
-    for (int n = 0; n < NumSpec; ++n) {
-        xn_zone[n] = 0.0_rt;
-    }
+    Real xn_zone[NumSpec] = {0.0};
     xn_zone[0] = 1.0_rt;
 
     eos_t eos_state;
@@ -96,17 +93,20 @@ void problem_initialize ()
         vctr = (4.0_rt / 3.0_rt) * M_PI * problem::r_init * problem::r_init * problem::r_init;
 
 #else
-
         amrex::Abort("Sedov problem unsupported in 3D axisymmetric geometry.");
-
 #endif
 
     }
     else if (coord_type == 2) {
 
+
+#if AMREX_SPACEDIM == 1
         // Must have AMREX_SPACEDIM == 1 for this coord_type.
 
         vctr = (4.0_rt / 3.0_rt) * M_PI * problem::r_init * problem::r_init * problem::r_init;
+#else
+        amrex::Abort("Sedov problem unsupported in 2-D or 3-D spherical geometry.");
+#endif
 
     }
 

diff --git a/Source/hydro/Castro_mol.cpp b/Source/hydro/Castro_mol.cpp
@@ -199,7 +199,7 @@ Castro::mol_ppm_reconstruct(const Box& bx,
 
 
 void
-Castro::mol_consup(const Box& bx,
+Castro::mol_consup(const Box& bx,  // NOLINT(readability-convert-member-functions-to-static)
 #ifdef SHOCK_VAR
                    Array4<Real const> const& shk,
 #endif

diff --git a/Source/hydro/trans.cpp b/Source/hydro/trans.cpp
@@ -64,7 +64,7 @@ Castro::trans_single(const Box& bx,
 
 
 void
-Castro::actual_trans_single(const Box& bx,
+Castro::actual_trans_single(const Box& bx,  // NOLINT(readability-convert-member-functions-to-static)
                             int idir_t, int idir_n, int d,
                             Array4<Real const> const& q_arr,
                             Array4<Real> const& qo_arr,
@@ -521,7 +521,7 @@ Castro::trans_final(const Box& bx,
 
 
 void
-Castro::actual_trans_final(const Box& bx,
+Castro::actual_trans_final(const Box& bx,  // NOLINT(readability-convert-member-functions-to-static)
                            int idir_n, int idir_t1, int idir_t2, int d,
                            Array4<Real const> const& q_arr,
                            Array4<Real> const& qo_arr,

diff --git a/Source/sources/Castro_sources.cpp b/Source/sources/Castro_sources.cpp
@@ -522,7 +522,7 @@ Castro::print_all_source_changes(Real dt, bool is_new)
 // and the hydro advance.
 
 advance_status
-Castro::pre_advance_operators (Real time, Real dt)
+Castro::pre_advance_operators (Real time, Real dt)  // NOLINT(readability-convert-member-functions-to-static)
 {
     amrex::ignore_unused(time);
     amrex::ignore_unused(dt);
@@ -560,7 +560,7 @@ Castro::pre_advance_operators (Real time, Real dt)
 // but before the hydro advance.
 
 advance_status
-Castro::pre_hydro_operators (Real time, Real dt)
+Castro::pre_hydro_operators (Real time, Real dt)  // NOLINT(readability-convert-member-functions-to-static)
 {
     amrex::ignore_unused(time);
     amrex::ignore_unused(dt);
@@ -585,7 +585,7 @@ Castro::pre_hydro_operators (Real time, Real dt)
 // but before the corrector sources.
 
 advance_status
-Castro::post_hydro_operators (Real time, Real dt)
+Castro::post_hydro_operators (Real time, Real dt)  // NOLINT(readability-convert-member-functions-to-static)
 {
     amrex::ignore_unused(time);
     amrex::ignore_unused(dt);
@@ -602,8 +602,11 @@ Castro::post_hydro_operators (Real time, Real dt)
 // Perform all operations that occur after the corrector sources.
 
 advance_status
-Castro::post_advance_operators (Real time, Real dt)
+Castro::post_advance_operators (Real time, Real dt)  // NOLINT(readability-convert-member-functions-to-static)
 {
+    amrex::ignore_unused(time);
+    amrex::ignore_unused(dt);
+
     advance_status status {};
 
 #ifndef TRUE_SDC