From 097008544cd49243d7be270f9d15814202d3c17e Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 7 Sep 2022 10:52:11 +0200 Subject: [PATCH] STYLE: adjust range check in Foam::factorial (FULLDEBUG) STYLE: consistent use of $(LIB_SRC) in Make/options --- applications/solvers/combustion/fireFoam/Make/options | 4 ++-- .../solvers/lagrangian/coalChemistryFoam/Make/options | 2 +- .../solvers/lagrangian/reactingParcelFoam/Make/options | 4 ++-- .../reactingHeterogenousParcelFoam/Make/options | 4 ++-- .../reactingParcelFoam/simpleReactingParcelFoam/Make/options | 2 +- .../solvers/lagrangian/simpleCoalParcelFoam/Make/options | 2 +- applications/solvers/lagrangian/sprayFoam/Make/options | 4 ++-- .../solvers/lagrangian/sprayFoam/engineFoam/Make/options | 4 ++-- .../solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options | 2 +- .../solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options | 4 ++-- applications/test/Hashing1/Make/options | 2 +- applications/test/Hashing2/Make/options | 2 +- applications/test/HashingSpeed/Make/options | 2 +- applications/test/faceHashing/Make/options | 2 +- applications/test/fieldTypes/Make/options | 4 ++-- applications/test/openmp/Make/options | 4 ++-- .../utilities/mesh/manipulation/renumberMesh/Make/options | 2 +- src/OpenFOAM/primitives/ints/label/label.C | 2 +- src/renumber/SloanRenumber/Make/options | 2 +- src/renumber/zoltanRenumber/Make/options | 2 +- 20 files changed, 28 insertions(+), 28 deletions(-) diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options index 4854f5d34a..168acd3d4a 100644 --- 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 \ diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options index 67ee052667..4ad101ffd2 100644 --- 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 \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options index 81dbe56372..44f50c4dfd 100644 --- 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 \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/reactingHeterogenousParcelFoam/Make/options index d2b25e0a67..92af84338a 100644 --- 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 \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options index 3e1485606f..dd75d29d96 100644 --- 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 \ diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options b/applications/solvers/lagrangian/simpleCoalParcelFoam/Make/options index 2b0ed56ead..4b4a37ba5a 100644 --- 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 \ diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options index 7ec29ea7dc..bc58479e9d 100644 --- 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 \ diff --git a/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/engineFoam/Make/options index 4f13ec3364..519f8e4996 100644 --- 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 \ diff --git a/applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/simpleSprayFoam/Make/options index 44c94feb02..f1c12cccae 100644 --- 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 \ diff --git a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/Make/options index 879780b5e0..288d31ce72 100644 --- 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 \ diff --git a/applications/test/Hashing1/Make/options b/applications/test/Hashing1/Make/options index 7dba39797a..ab5895cb5c 100644 --- 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 = */ diff --git a/applications/test/Hashing2/Make/options b/applications/test/Hashing2/Make/options index 7dba39797a..ab5895cb5c 100644 --- 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 = */ diff --git a/applications/test/HashingSpeed/Make/options b/applications/test/HashingSpeed/Make/options index 7dba39797a..ab5895cb5c 100644 --- 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 = */ diff --git a/applications/test/faceHashing/Make/options b/applications/test/faceHashing/Make/options index 7dba39797a..ab5895cb5c 100644 --- 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 = */ diff --git a/applications/test/fieldTypes/Make/options b/applications/test/fieldTypes/Make/options index 3a7088aeea..2526f4eb0e 100644 --- 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 \ diff --git a/applications/test/openmp/Make/options b/applications/test/openmp/Make/options index 9c1cb59980..5094191b4d 100644 --- 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) */ diff --git a/applications/utilities/mesh/manipulation/renumberMesh/Make/options b/applications/utilities/mesh/manipulation/renumberMesh/Make/options index 7956e8e8dc..2faf0b8ed1 100644 --- 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 \ diff --git a/src/OpenFOAM/primitives/ints/label/label.C b/src/OpenFOAM/primitives/ints/label/label.C index 61a2543789..cde1cd2b05 100644 --- 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" diff --git a/src/renumber/SloanRenumber/Make/options b/src/renumber/SloanRenumber/Make/options index 23dc9dd623..5af9c713ee 100644 --- 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 \ diff --git a/src/renumber/zoltanRenumber/Make/options b/src/renumber/zoltanRenumber/Make/options index cf3b1e7226..589a3edc8b 100644 --- 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