STYLE: adjust range check in Foam::factorial (FULLDEBUG)

STYLE: consistent use of $(LIB_SRC) in Make/options
2022-09-07 10:52:11 +02:00 · 2022-09-07 10:52:11 +02:00 · 097008544c
commit 097008544c
parent 0b37234804
20 changed files with 28 additions and 28 deletions
--- a/applications/solvers/combustion/fireFoam/Make/options
+++ b/applications/solvers/combustion/fireFoam/Make/options
@ -1,8 +1,8 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I${LIB_SRC}/meshTools/lnInclude \
-    -I${LIB_SRC}/sampling/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
--- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options
+++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
@ -1,7 +1,7 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I${LIB_SRC}/meshTools/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
--- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
@ -2,10 +2,10 @@ EXE_INC = \
    -I../reactingParcelFoam \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I${LIB_SRC}/meshTools/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-    -I${LIB_SRC}/sampling/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options
@ -2,8 +2,8 @@ EXE_INC = \
    -I.. \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I${LIB_SRC}/sampling/lnInclude \
-    -I${LIB_SRC}/meshTools/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
@ -1,7 +1,7 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I${LIB_SRC}/meshTools/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
--- a/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options
@ -2,7 +2,7 @@ EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
    -I$(LIB_SRC)/fvOptions/lnInclude \
-    -I${LIB_SRC}/meshTools/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
--- a/applications/solvers/lagrangian/sprayFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/Make/options
@ -2,8 +2,8 @@ EXE_INC = \
    -I../reactingParcelFoam \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I${LIB_SRC}/meshTools/lnInclude \
-    -I${LIB_SRC}/sampling/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
--- a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options
@ -4,8 +4,8 @@ EXE_INC = \
    -I../../reactingParcelFoam \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I${LIB_SRC}/meshTools/lnInclude \
-    -I${LIB_SRC}/sampling/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
--- a/applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options
@ -2,7 +2,7 @@ EXE_INC = \
    -I$(FOAM_SOLVERS)/lagrangian/reactingParcelFoam/simpleReactingParcelFoam \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I${LIB_SRC}/meshTools/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
--- a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options
@ -4,8 +4,8 @@ EXE_INC = \
    -I../../../compressible/rhoPimpleFoam \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I${LIB_SRC}/meshTools/lnInclude \
-    -I${LIB_SRC}/sampling/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
    -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
--- a/applications/test/Hashing1/Make/options
+++ b/applications/test/Hashing1/Make/options
@ -1,3 +1,3 @@
-EXE_INC = ${c++LESSWARN}
+EXE_INC = $(c++LESSWARN)

 /* EXE_LIBS = */
--- a/applications/test/Hashing2/Make/options
+++ b/applications/test/Hashing2/Make/options
@ -1,3 +1,3 @@
-EXE_INC = ${c++LESSWARN}
+EXE_INC = $(c++LESSWARN)

 /* EXE_LIBS = */
--- a/applications/test/HashingSpeed/Make/options
+++ b/applications/test/HashingSpeed/Make/options
@ -1,3 +1,3 @@
-EXE_INC = ${c++LESSWARN}
+EXE_INC = $(c++LESSWARN)

 /* EXE_LIBS = */
--- a/applications/test/faceHashing/Make/options
+++ b/applications/test/faceHashing/Make/options
@ -1,3 +1,3 @@
-EXE_INC = ${c++LESSWARN}
+EXE_INC = $(c++LESSWARN)

 /* EXE_LIBS = */
--- a/applications/test/fieldTypes/Make/options
+++ b/applications/test/fieldTypes/Make/options
@ -1,7 +1,7 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteArea/lnInclude \
-    -I${LIB_SRC}/finiteVolume/lnInclude \
-    -I${LIB_SRC}/meshTools/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude

 EXE_LIBS = \
    -lfiniteArea \
--- a/applications/test/openmp/Make/options
+++ b/applications/test/openmp/Make/options
@ -1,4 +1,4 @@
-EXE_INC = ${COMP_OPENMP} /* -UUSE_OMP */
+EXE_INC = $(COMP_OPENMP) /* -UUSE_OMP */

 /* Mostly do not need to explicitly link openmp libraries */
-/* EXE_LIBS = ${LINK_OPENMP} */
+/* EXE_LIBS = $(LINK_OPENMP) */
--- a/applications/utilities/mesh/manipulation/renumberMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/renumberMesh/Make/options
@ -3,7 +3,7 @@
 */

 EXE_INC = \
-    ${COMP_FLAGS} \
+    $(COMP_FLAGS) \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
--- a/src/OpenFOAM/primitives/ints/label/label.C
+++ b/src/OpenFOAM/primitives/ints/label/label.C
@ -151,7 +151,7 @@ Foam::label Foam::factorial(label n)
    };

    #ifdef FULLDEBUG
-    if (n > 12 && n < 0)
+    if (n < 0 || n > 12)
    {
        FatalErrorInFunction
            << "n value out of range"
--- a/src/renumber/SloanRenumber/Make/options
+++ b/src/renumber/SloanRenumber/Make/options
@ -1,5 +1,5 @@
 EXE_INC = \
-    ${c++LESSWARN} \
+    $(c++LESSWARN) \
    -I$(BOOST_INC_DIR) \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
--- a/src/renumber/zoltanRenumber/Make/options
+++ b/src/renumber/zoltanRenumber/Make/options
@ -3,7 +3,7 @@ include $(GENERAL_RULES)/mpi-rules
 EXE_INC = \
    -I$(ZOLTAN_INC_DIR) \
    $(PFLAGS) $(PINC) \
-    ${c++LESSWARN} \
+    $(c++LESSWARN) \
    -I$(LIB_SRC)/renumber/renumberMethods/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude