Merge branch 'fix-reduction-formatting' into 'master'

Reformat reduction macros See merge request OPAL/Libraries/ippl!159
IPPL-framework · Mar 15, 2023 · d2e380e · d2e380e
2 parents 8595707 + 2faaa55
commit d2e380e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.clang-format b/.clang-format
@@ -21,4 +21,4 @@ IndentGotoLabels: false
 NamespaceIndentation: All 
 PackConstructorInitializers: Never
 ReflowComments: true
-StatementMacros: ['DefineUnaryOperation', 'DefineBinaryOperation']
+StatementMacros: ['DefineUnaryOperation', 'DefineBinaryOperation', 'DefineReduction', 'DefineParticleReduction']
diff --git a/src/Field/BareField.hpp b/src/Field/BareField.hpp
@@ -168,8 +168,8 @@ namespace ippl {
     }
 
     DefineReduction(Sum, sum, valL += myVal, MPI_SUM)
-        DefineReduction(Max, max, if (myVal > valL) valL = myVal, MPI_MAX)
-            DefineReduction(Min, min, if (myVal < valL) valL = myVal, MPI_MIN)
-                DefineReduction(Prod, prod, valL *= myVal, MPI_PROD)
+    DefineReduction(Max, max, if (myVal > valL) valL = myVal, MPI_MAX)
+    DefineReduction(Min, min, if (myVal < valL) valL = myVal, MPI_MIN)
+    DefineReduction(Prod, prod, valL *= myVal, MPI_PROD)
 
 }  // namespace ippl
diff --git a/src/Particle/ParticleAttrib.hpp b/src/Particle/ParticleAttrib.hpp
@@ -252,7 +252,7 @@ namespace ippl {
     }
 
     DefineParticleReduction(Sum, sum, valL += myVal, MPI_SUM)
-        DefineParticleReduction(Max, max, if (myVal > valL) valL = myVal, MPI_MAX)
-            DefineParticleReduction(Min, min, if (myVal < valL) valL = myVal, MPI_MIN)
-                DefineParticleReduction(Prod, prod, valL *= myVal, MPI_PROD)
+    DefineParticleReduction(Max, max, if (myVal > valL) valL = myVal, MPI_MAX)
+    DefineParticleReduction(Min, min, if (myVal < valL) valL = myVal, MPI_MIN)
+    DefineParticleReduction(Prod, prod, valL *= myVal, MPI_PROD)
 }  // namespace ippl