clang-format

svalinn · Feb 21, 2024 · e0568c0 · e0568c0
1 parent 4142682
commit e0568c0
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 deletions.
diff --git a/.github/workflows/housekeeping.yml b/.github/workflows/housekeeping.yml
@@ -42,5 +42,15 @@ jobs:
             echo
             echo -e "\033[33mGit diff:\033[0m"
             git diff
+            echo
+            echo -e "\033[1;31mPlease fix the style guide and commit the result.\033[0m"
+            echo
+            echo "You can use the following command to format your code at once."
+            echo
+            echo "find src/ \\( -name \"*.hpp\" -o -name \"*.cpp\" -o -name \"*.hh\" -o -name \"*.cc\" -o -name \"*.h\" \\) \\"
+            echo "              \\( -not -path \"src/gtest*\" -not -path \"src/mcnp/mcnp?/Source/*\" -not -path \"src/pyne*\" \\)  \\"
+            echo "              -exec clang-format -style=file -i {} \\;"
+            echo 
+            echo "This command will automatically format your code according to the project's style guide."
             exit 1
           fi
diff --git a/src/dagmc/DagMC.hpp b/src/dagmc/DagMC.hpp
@@ -78,12 +78,10 @@ class DagMC {
         double overlap_tolerance = 0., double numerical_precision = .001,
         int verbosity = 1);
   // Deprecated Constructor
-  [
-      [deprecated("Replaced by DagMC(std::shared_ptr<Interface> mb_impl, ... "
-                  ")")]] DagMC(Interface* mb_impl,
-                               double overlap_tolerance = 0.,
-                               double numerical_precision = .001,
-                               int verbosity = 1);
+  [[deprecated(
+      "Replaced by DagMC(std::shared_ptr<Interface> mb_impl, ... "
+      ")")]] DagMC(Interface* mb_impl, double overlap_tolerance = 0.,
+                   double numerical_precision = .001, int verbosity = 1);
   // Destructor
   ~DagMC();
 

diff --git a/src/dagmc/tools/ray_fire_test.cpp b/src/dagmc/tools/ray_fire_test.cpp
@@ -31,7 +31,7 @@ extern "C" int getrusage(int, struct rusage*);
 using namespace moab;
 
 // define following macro for verbose debugging of random ray generation
-//#define DEBUG
+// #define DEBUG
 #if !defined(_MSC_VER) && !defined(__MINGW32__)
 void get_time_mem(double& tot_time, double& user_time, double& sys_time,
                   double& tot_mem);

diff --git a/src/geant4/DagSolid.cc b/src/geant4/DagSolid.cc
@@ -69,7 +69,7 @@ using namespace moab;
 
 #define plot true
 
-//#define G4SPECSDEBUG 1
+// #define G4SPECSDEBUG 1
 ///////////////////////////////////////////////////////////////////////////////
 //
 // Standard contructor has blank name and defines no facets.

diff --git a/src/geant4/app/include/ExN01UserScoreWriter.hh b/src/geant4/app/include/ExN01UserScoreWriter.hh
@@ -1,7 +1,7 @@
 #ifndef ExN01UserScoreWriter_h
 #define ExN01UserScoreWriter_h 1
 
-//#include "MBCore.hpp"
+// #include "MBCore.hpp"
 #include <vector>
 
 #include "G4VScoreWriter.hh"

diff --git a/src/tally/CellTally.cpp b/src/tally/CellTally.cpp
@@ -52,9 +52,9 @@ void CellTally::write_data(double num_histories) {
 
   std::cout << "cell id = " << cell_id << std::endl;
   std::cout << "type = "
-            << (expected_type == TallyEvent::COLLISION
-                    ? "collision "
-                    : expected_type == TallyEvent::TRACK ? "track " : "none");
+            << (expected_type == TallyEvent::COLLISION ? "collision "
+                : expected_type == TallyEvent::TRACK   ? "track "
+                                                       : "none");
   std::cout << std::endl;
 
   std::cout << "volume = " << cell_volume << std::endl << std::endl;