update clang format action version to avoid distutils issue (#525)

* update clang format action version to avoid distutils issue * clang format to 18 * more files updated for clang-format to version 18
AMReX-Combustion · Sep 4, 2024 · 1e7eb65 · 1e7eb65
1 parent 1be18ca
commit 1e7eb65
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 35 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,12 +18,12 @@ jobs:
       - name: Clone
         uses: actions/checkout@v4
       - name: Check formatting
-        uses: DoozyX/clang-format-lint-action@v0.16.2
+        uses: DoozyX/clang-format-lint-action@v0.18.2
         with:
           source: './Source ./Testing ./Mechanisms'
           exclude: '.'
           extensions: 'H,h,cpp'
-          clangFormatVersion: 16
+          clangFormatVersion: 18
 
   Codespell:
     needs: Formatting

diff --git a/Source/Radiation/POneSingle.H b/Source/Radiation/POneSingle.H
@@ -56,7 +56,7 @@ public:
       bcoef_(bcoef),
       robin_a_(robin_a),
       robin_b_(robin_b),
-      robin_f_(robin_f){};
+      robin_f_(robin_f) {};
 
   void solve()
   {

diff --git a/Source/Radiation/POneSingleEB.H b/Source/Radiation/POneSingleEB.H
@@ -62,7 +62,7 @@ public:
       bcoef_(bcoef),
       robin_a_(robin_a),
       robin_b_(robin_b),
-      robin_f_(robin_f){};
+      robin_f_(robin_f) {};
 
   void solve()
   {

diff --git a/Source/Reactions/ReactorCvodeUtils.H b/Source/Reactions/ReactorCvodeUtils.H
@@ -269,7 +269,7 @@ fKernelComputeAJchem(
   amrex::Real temp_pt = u_curr[NUM_SPECIES];
 
   const int consP = reactor_type == ReactorTypes::h_reactor_type;
-  amrex::GpuArray<amrex::Real, neqs* neqs> Jmat_pt = {0.0};
+  amrex::GpuArray<amrex::Real, neqs * neqs> Jmat_pt = {0.0};
   auto eos = pele::physics::PhysicsType::eos();
   eos.RTY2JAC(rho_pt, temp_pt, massfrac.arr, Jmat_pt.arr, consP);
 
@@ -318,7 +318,7 @@ fKernelDenseAJchem(
   amrex::Real temp_pt = u_curr[NUM_SPECIES];
 
   const int consP = reactor_type == ReactorTypes::h_reactor_type;
-  amrex::GpuArray<amrex::Real, neqs* neqs> Jmat_pt = {0.0};
+  amrex::GpuArray<amrex::Real, neqs * neqs> Jmat_pt = {0.0};
   auto eos = pele::physics::PhysicsType::eos();
   eos.RTY2JAC(rho_pt, temp_pt, massfrac.arr, Jmat_pt.arr, consP);
 

diff --git a/Source/Spray/BreakupSplash/ReitzKHRT.H b/Source/Spray/BreakupSplash/ReitzKHRT.H
@@ -169,7 +169,7 @@ updateBreakupKHRT(
       rad_part = rp;
       num_dens = np;
     } // if (rs < rad_part && We_g > We_crit)...
-  }   // if (!breakupRT)...
+  } // if (!breakupRT)...
   p.rdata(SprayComps::pstateDia) = 2. * rad_part;
   p.rdata(SprayComps::pstateNumDens) = num_dens;
   p.rdata(SprayComps::pstateN0) = N0;

diff --git a/Source/Spray/BreakupSplash/TABBreakup.H b/Source/Spray/BreakupSplash/TABBreakup.H
@@ -170,7 +170,7 @@ updateBreakupTAB(
         yn = ynp;
         ydotn = ydotnp;
       } // if (tbv < subdt)
-    }   // if (Wer + A <= 1)
+    } // if (Wer + A <= 1)
     if (curt + subdt > dt) {
       subdt = dt - curt;
     }

diff --git a/Source/Spray/SprayInjection.H b/Source/Spray/SprayInjection.H
@@ -296,7 +296,7 @@ SprayParticleContainer::uniformSprayInit(
           nparticles.pop_back();
         }
       } // if (which == MyProc)
-    }   // for (int which ...
+    } // for (int which ...
     for (auto& kv : host_particles) {
       auto grid = kv.first.first;
       auto tile = kv.first.second;

diff --git a/Source/Spray/SprayParticles.cpp b/Source/Spray/SprayParticles.cpp
@@ -480,8 +480,8 @@ SprayParticleContainer::updateParticles(
               p.id() = -1;
             }
           } // End of subcycle loop
-        }   // End of p.id() > 0 check
-      });   // End of loop over particles
+        } // End of p.id() > 0 check
+      }); // End of loop over particles
       if (make_new_drops) {
         Gpu::copy(
           Gpu::deviceToHost, N_SB_d.begin(), N_SB_d.end(), N_SB_h.begin());

diff --git a/Source/Transport/TransportParams.H b/Source/Transport/TransportParams.H
@@ -60,14 +60,14 @@ struct TransParm<EOSType, SimpleTransport>
   amrex::GpuArray<amrex::Real, NUM_SPECIES> dip = {0.0};
   amrex::GpuArray<amrex::Real, NUM_SPECIES> pol = {0.0};
   amrex::GpuArray<amrex::Real, NUM_SPECIES> zrot = {0.0};
-  amrex::GpuArray<amrex::Real, NUM_SPECIES* NUM_FIT> fitmu = {0.0};
-  amrex::GpuArray<amrex::Real, NUM_SPECIES* NUM_FIT> fitlam = {0.0};
-  amrex::GpuArray<amrex::Real, NUM_SPECIES* NUM_SPECIES* NUM_FIT> fitdbin = {
+  amrex::GpuArray<amrex::Real, NUM_SPECIES * NUM_FIT> fitmu = {0.0};
+  amrex::GpuArray<amrex::Real, NUM_SPECIES * NUM_FIT> fitlam = {0.0};
+  amrex::GpuArray<amrex::Real, NUM_SPECIES * NUM_SPECIES * NUM_FIT> fitdbin = {
     0.0};
   bool use_soret = false;
   int numLite = 3;
   amrex::GpuArray<int, 3> liteSpec = {0};
-  amrex::GpuArray<amrex::Real, NUM_SPECIES* NUM_FIT* 3> fittdrat = {0.0};
+  amrex::GpuArray<amrex::Real, NUM_SPECIES * NUM_FIT * 3> fittdrat = {0.0};
   amrex::GpuArray<int, NUM_SPECIES> nlin = {0};
 };
 
@@ -82,22 +82,22 @@ struct TransParm<eos::SRK, SimpleTransport>
   amrex::GpuArray<amrex::Real, NUM_SPECIES> pol = {0.0};
   amrex::GpuArray<amrex::Real, NUM_SPECIES> zrot = {0.0};
 
-  amrex::GpuArray<amrex::Real, NUM_SPECIES* NUM_FIT> fitmu = {0.0};
-  amrex::GpuArray<amrex::Real, NUM_SPECIES* NUM_FIT> fitlam = {0.0};
-  amrex::GpuArray<amrex::Real, NUM_SPECIES* NUM_SPECIES* NUM_FIT> fitdbin = {
+  amrex::GpuArray<amrex::Real, NUM_SPECIES * NUM_FIT> fitmu = {0.0};
+  amrex::GpuArray<amrex::Real, NUM_SPECIES * NUM_FIT> fitlam = {0.0};
+  amrex::GpuArray<amrex::Real, NUM_SPECIES * NUM_SPECIES * NUM_FIT> fitdbin = {
     0.0};
   bool use_soret = false;
   int numLite = 10;
   amrex::GpuArray<int, 10> liteSpec = {0};
-  amrex::GpuArray<amrex::Real, NUM_SPECIES* NUM_FIT* 10> fittdrat = {0.0};
+  amrex::GpuArray<amrex::Real, NUM_SPECIES * NUM_FIT * 10> fittdrat = {0.0};
   amrex::GpuArray<int, NUM_SPECIES> nlin = {0};
   amrex::GpuArray<amrex::Real, 10 * 4> Afac = {0.0};
   amrex::GpuArray<amrex::Real, 7 * 4> Bfac = {0.0};
-  amrex::GpuArray<amrex::Real, NUM_SPECIES* NUM_SPECIES> sqrtT2ij = {0.0};
-  amrex::GpuArray<amrex::Real, NUM_SPECIES* NUM_SPECIES> sqrtEpsilonij = {0.0};
-  amrex::GpuArray<amrex::Real, NUM_SPECIES* NUM_SPECIES> sqrtMWij = {0.0};
-  amrex::GpuArray<amrex::Real, NUM_SPECIES* NUM_SPECIES> sqrtKappaij = {0.0};
-  amrex::GpuArray<amrex::Real, NUM_SPECIES* NUM_SPECIES* NUM_SPECIES>
+  amrex::GpuArray<amrex::Real, NUM_SPECIES * NUM_SPECIES> sqrtT2ij = {0.0};
+  amrex::GpuArray<amrex::Real, NUM_SPECIES * NUM_SPECIES> sqrtEpsilonij = {0.0};
+  amrex::GpuArray<amrex::Real, NUM_SPECIES * NUM_SPECIES> sqrtMWij = {0.0};
+  amrex::GpuArray<amrex::Real, NUM_SPECIES * NUM_SPECIES> sqrtKappaij = {0.0};
+  amrex::GpuArray<amrex::Real, NUM_SPECIES * NUM_SPECIES * NUM_SPECIES>
     Upsilonijk = {0.0};
   amrex::GpuArray<amrex::Real, NUM_SPECIES> Kappai = {0.0};
   amrex::GpuArray<amrex::Real, NUM_SPECIES> omega = {0.0};

diff --git a/Source/Utility/Diagnostics/DiagConditional.cpp b/Source/Utility/Diagnostics/DiagConditional.cpp
@@ -340,13 +340,11 @@ DiagConditional::writeAverageDataToFile(
       widths[3 + 2 * f] =
         std::max(width, static_cast<int>(m_fieldNames[f].length()) + 5);
       condFile << std::left << std::setw(widths[3 + 2 * f])
-               << m_fieldNames[f] + "_Avg"
-               << " ";
+               << m_fieldNames[f] + "_Avg" << " ";
       widths[4 + 2 * f] =
         std::max(width, static_cast<int>(m_fieldNames[f].length()) + 7);
       condFile << std::left << std::setw(widths[4 + 2 * f])
-               << m_fieldNames[f] + "_StdDev"
-               << " ";
+               << m_fieldNames[f] + "_StdDev" << " ";
     }
     condFile << "\n";
 
@@ -408,8 +406,7 @@ DiagConditional::writeIntegralDataToFile(
       widths[1 + f] =
         std::max(width, static_cast<int>(m_fieldNames[f].length()) + 5);
       condFile << std::left << std::setw(widths[1 + f])
-               << m_fieldNames[f] + "_Int"
-               << " ";
+               << m_fieldNames[f] + "_Int" << " ";
     }
     condFile << "\n";
 
@@ -459,8 +456,7 @@ DiagConditional::writeSumDataToFile(
       widths[1 + f] =
         std::max(width, static_cast<int>(m_fieldNames[f].length()) + 5);
       condFile << std::left << std::setw(widths[1 + f])
-               << m_fieldNames[f] + "_Sum"
-               << " ";
+               << m_fieldNames[f] + "_Sum" << " ";
     }
     condFile << "\n";
 

diff --git a/Source/Utility/Diagnostics/DiagPDF.cpp b/Source/Utility/Diagnostics/DiagPDF.cpp
@@ -210,8 +210,7 @@ DiagPDF::writePDFToFile(
     widths[0] = std::max(width, static_cast<int>(m_fieldName.length()) + 1);
     widths[1] = std::max(width, static_cast<int>(m_fieldName.length()) + 5);
     pdfFile << std::setw(widths[0]) << m_fieldName << " "
-            << std::setw(widths[1]) << m_fieldName + "_PDF"
-            << "\n";
+            << std::setw(widths[1]) << m_fieldName + "_PDF" << "\n";
 
     for (int i{0}; i < a_pdf.size(); ++i) {
       pdfFile << std::setw(widths[0]) << std::setprecision(prec)

diff --git a/Support/ceptr/pyproject.toml b/Support/ceptr/pyproject.toml
@@ -30,7 +30,7 @@ pep8-naming = "^0.12.1"
 flake8-docstrings = "^1.7.0"
 flake8-use-fstring = "^1.4"
 flynt = "^0.77"
-clang-format = "==17.0.6"
+clang-format = "==18.1.8"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]