From fc7de48319111cce74e258cab32f524b92aa914c Mon Sep 17 00:00:00 2001 From: Henrik Rusche Date: Tue, 29 May 2018 10:30:29 +0200 Subject: [PATCH] Removing trailing whitespace, tabs and DOS CR & Fixing some indentation --- ReleaseNotes.txt | 8 +- .../steadyCompressibleFoam/hEqn.H | 2 +- .../coupled/MRFPorousFoam/MRFPorousFoam.C | 4 +- .../solvers/coupled/MRFPorousFoam/UEqn.H | 2 +- .../spatialMeanValueRichardsonFoam.C | 10 +- .../overset/icoDyMOversetFoam/Make/files | 2 +- .../solvers/overset/icoOversetFoam/Make/files | 2 +- .../overset/simpleMRFOversetFoam/Make/files | 2 +- .../overset/simpleOversetFoam/Make/files | 2 +- .../surfaceTracking/freeSurface/freeSurface.H | 2 +- .../interTrackFoam/interTrackFoam.C | 2 +- .../writeIbMasks/writeIbMasks.C | 2 +- .../utilities/overset/calcOverset/Make/files | 2 +- .../PVReaders/PVFoamReader/CMakeLists.txt | 2 +- .../dsmcFieldsCalc/CMakeLists.txt | 2 +- .../CMakeLists.txt | 2 +- .../faceAgglomerate/faceAgglomerate.C | 2 +- .../viewFactorsGen/viewFactorsGen.C | 4 +- cmake/LibFindMacros.cmake | 8 +- cmake/compileFOAM.cmake | 2 +- cmake/getGitVersion.cmake | 8 +- src/OSspecific/MSWindows/printStack.C | 4 +- .../finiteVolume/domainDecomposition.H | 2 +- .../finiteVolume/processorMeshData.H | 14 +- .../finiteArea/faFieldReconstructor.H | 2 +- .../finiteVolume/fvFieldReconstructor.H | 8 +- .../processorMeshesReconstructor.H | 2 +- .../finiteVolume/sharedPoints.C | 2 +- .../finiteVolume/sharedPoints.H | 2 +- .../polyTopoChangerChangeMesh.C | 2 +- .../dynamicTopoFvMesh/tetMetrics/tetMetric.C | 2 +- .../loadBalanceFvMesh/loadBalanceFvMesh.C | 2 +- .../topoChangerFvMesh/CMakeLists.txt | 2 +- .../dynamicPolyRefinementFvMesh.H | 2 +- .../topoChangerFvMeshLoadBalance.C | 2 +- .../topoChangerFvMeshLoadBalanceTemplates.C | 6 +- src/engine/CMakeLists.txt | 2 +- src/finiteArea/finiteArea/fam/vectorFamDiv.H | 2 +- src/finiteVolume/CMakeLists.txt | 4 +- .../processor/processorFvPatchScalarField.C | 2 +- ...tedInletOutletVelocityFvPatchVectorField.C | 2 +- ...eDirectedInletVelocityFvPatchVectorField.C | 2 +- .../CrankNicolsonDdtScheme.C | 2 +- .../steadyInertialDdtScheme.C | 2 +- .../steadyInertialDdtScheme.H | 2 +- src/finiteVolume/fvMesh/fvMesh.C | 2 +- .../constraint/cyclic/cyclicFvPatch.C | 2 +- .../constraint/cyclicGgi/cyclicGgiFvPatch.C | 2 +- .../dlLibraryTable/dlLibraryTable.C | 2 +- .../SlicedGeometricField.H | 4 +- .../constraint/wedge/WedgePointPatchField.C | 460 +-- .../GGIInterpolationWeights.C | 2 +- .../BlockMatrixClustering.C | 6 +- .../lduMatrix/lduMatrix/lduMatrixOperations.C | 4 +- .../globalMeshData/globalProcFaceIndex.C | 6 +- .../globalMeshData/globalProcFaceIndex.H | 2 +- src/foam/meshes/polyMesh/polyMeshIO.C | 2 +- .../polyPatches/polyPatch/polyPatch.C | 4 +- .../primitiveMeshCheck/primitiveMeshCheck.C | 2 +- .../immersedBoundary/Make/options | 2 +- .../immersedBoundaryFvPatch.C-correctFlux | 4 +- .../immersedBoundaryFvsPatchField.C | 2 +- .../immersedBoundaryPolyPatch.C | 8 +- .../immersedBoundaryPolyPatch.H | 2 +- .../immersedPoly/ImmersedCell.H | 2 +- .../triSurfaceDistance/triSurfaceDistance.H | 2 +- .../immersedBoundary/include/updateIbMasks.H | 2 +- ...icRefineSolidBodyMotionFvMesh.C-refineDead | 10 +- ...icRefineSolidBodyMotionFvMesh.C-refineLive | 10 +- .../immersedBoundaryRefinement.C | 6 +- .../refineImmersedBoundaryMesh.C | 2 +- src/lagrangian/coalCombustion/CMakeLists.txt | 2 +- src/lagrangian/dsmc/CMakeLists.txt | 6 +- src/lagrangian/intermediate/CMakeLists.txt | 22 +- .../amg/amgPolicy/selectionAmgPolicy.C | 3584 ++++++++--------- .../lduPrecon/CholeskyPrecon/CholeskyPrecon.C | 2 +- src/lduSolvers/lduPrecon/ILU0/ILU0.C | 4 +- .../oversetEulerDdtScheme.C | 2 +- .../regionWiseOversetAdjustPhi.C | 54 +- .../oversetMesh/oversetMeshAddressing.C | 6 +- .../functionObjects/doc/functionObjects.dox | 4 +- .../writers/nastran/nastranSurfaceWriter.C | 2 +- .../writers/raw/rawSurfaceWriter.C | 2 +- ...sentropicTotalPressureFvPatchScalarField.C | 4 +- .../overlapGgiEnthalpyJumpFvPatchField.H | 2 +- .../psiThermo/basicPsiThermo/basicPsiThermo.H | 2 +- .../radiation/CMakeLists.txt | 10 +- .../viscoelastic/viscoelasticLaws/UCM/UCM.C | 24 +- .../viscoelastic/viscoelasticLaws/UCM/UCM.H | 2 +- .../compressible/LES/CMakeLists.txt | 2 +- .../compressible/RAS/CMakeLists.txt | 6 +- .../incompressible/LES/CMakeLists.txt | 2 +- .../incompressible/RAS/CMakeLists.txt | 6 +- .../nutCWTWallFunctionFvPatchScalarField.C | 2 +- .../omegaMEWTWallFunctionFvPatchScalarField.C | 2 +- .../constant/polyMesh/blockMeshDict | 80 +- .../constant/polyMesh/boundary | 8 +- .../constant/solid/thermalProperties | 2 +- .../cylinder/constant/faMesh/faBoundary | 10 +- .../planeTransport/constant/faMesh/faBoundary | 6 +- .../sphereTransport/sphereTransport/0/Cvf | 2 +- .../sphereTransport/sphereTransport/0/U | 2 +- .../constant/differenceFactors_ | 12 +- .../system/fvSolution | 2 +- .../system/fvSolution | 2 +- .../system/fvSolution | 2 +- .../constant/oversetMeshDict | 4 +- .../constant/oversetMeshDict | 4 +- .../constant/polyMesh/blockMeshDict | 2 +- .../cylBumpinterOversetFoam/Allclean | 2 +- .../0/k | 4 +- .../0/nut | 4 +- .../0/omega | 4 +- .../0/p | 4 +- .../Allclean | 2 +- .../constant/polyMesh/cellZones | 2 +- .../backgroundMesh/system/controlDict | 6 +- .../backgroundMesh/system/fvSchemes | 24 +- .../constant/oversetMeshDict | 6 +- .../constant/transportProperties | 2 +- .../frontMesh/constant/polyMesh/cellZones | 2 +- .../frontMesh/system/controlDict | 6 +- .../frontMesh/system/fvSchemes | 14 +- .../middleMesh/constant/polyMesh/cellZones | 2 +- .../middleMesh/system/controlDict | 6 +- .../middleMesh/system/fvSchemes | 14 +- .../save/k | 4 +- .../save/nut | 4 +- .../save/omega | 4 +- .../save/p | 4 +- .../system/controlDict | 6 +- .../system/fvSolution | 6 +- .../system/sampleDict | 2 +- .../system/decomposeParDict | 4 +- .../channelSimpleOverlapLaplace/0/T.sol | 2 +- .../0/oversetTypes | 2 +- .../0/T.sol | 2 +- .../0/oversetTypes | 2 +- .../Allclean | 2 +- .../0/T.sol | 2 +- .../0/oversetTypes | 2 +- .../Allclean | 2 +- .../0/T.sol | 2 +- .../0/oversetTypes | 2 +- .../Allclean | 2 +- .../0/T.sol | 2 +- .../0/oversetTypes | 2 +- .../Allclean | 2 +- .../Allclean | 2 +- .../Allclean | 2 +- .../cylinderInSquareLaplace/0/T.solution | 2 +- .../cylinderInSquareLaplace/Allclean | 2 +- .../0/T.solution | 2 +- .../Allclean | 2 +- .../viscoelasticFluidFoam/UCM/README | 8 +- .../UCM/constant/polyMesh/blockMeshDict | 98 +- .../UCM/constant/viscoelasticProperties | 8 +- vagrantSandbox/skel/.zshrc.local | 2 +- .../incompressible/pisoFoam/NACA-4412/Allrun | 2 +- .../NACA-4412/constant/transportProperties | 2 +- .../pisoFoam/NACA-4412/system/fvSolution | 6 +- .../NACA-4412/system/fvSolution-sample | 8 +- .../pisoFoam/NACA-4412/system/sampleDict | 2 +- .../pisoFoam/NACA-4412/validationData/gnuplot | 4 +- .../overset/NACA4412-airfoil/Allclean | 2 +- .../overset/NACA4412-airfoil/Allrun | 4 +- .../NACA4412-airfoil/explicitOverset/0/k | 4 +- .../NACA4412-airfoil/explicitOverset/0/nut | 4 +- .../NACA4412-airfoil/explicitOverset/0/omega | 4 +- .../NACA4412-airfoil/explicitOverset/0/p | 4 +- .../NACA4412-airfoil/explicitOverset/Allclean | 2 +- .../explicitOverset/constant/oversetMeshDict | 6 +- .../constant/transportProperties | 2 +- .../NACA4412-airfoil/explicitOverset/save/k | 4 +- .../NACA4412-airfoil/explicitOverset/save/nut | 4 +- .../explicitOverset/save/omega | 4 +- .../NACA4412-airfoil/explicitOverset/save/p | 4 +- .../explicitOverset/system/sampleDict | 2 +- .../implicitConservativeOverset/0/k | 4 +- .../implicitConservativeOverset/0/nut | 4 +- .../implicitConservativeOverset/0/omega | 4 +- .../implicitConservativeOverset/0/p | 4 +- .../implicitConservativeOverset/Allclean | 2 +- .../constant/oversetMeshDict | 6 +- .../constant/transportProperties | 2 +- .../implicitConservativeOverset/save/k | 4 +- .../implicitConservativeOverset/save/nut | 4 +- .../implicitConservativeOverset/save/omega | 4 +- .../implicitConservativeOverset/save/p | 4 +- .../system/sampleDict | 2 +- .../implicitNonConservativeOverset/0/k | 4 +- .../implicitNonConservativeOverset/0/nut | 4 +- .../implicitNonConservativeOverset/0/omega | 4 +- .../implicitNonConservativeOverset/0/p | 4 +- .../implicitNonConservativeOverset/Allclean | 2 +- .../constant/oversetMeshDict | 6 +- .../constant/transportProperties | 2 +- .../implicitNonConservativeOverset/save/k | 4 +- .../implicitNonConservativeOverset/save/nut | 4 +- .../implicitNonConservativeOverset/save/omega | 4 +- .../implicitNonConservativeOverset/save/p | 4 +- .../system/fvSolution | 2 +- .../system/sampleDict | 2 +- .../overset/NACA4412-airfoil/noOverset/Allrun | 2 +- .../noOverset/constant/transportProperties | 2 +- .../noOverset/system/sampleDict | 2 +- .../constant/polyMesh/cellZones | 2 +- .../backgroundMesh/system/controlDict | 6 +- .../backgroundMesh/system/fvSchemes | 20 +- .../frontMesh/constant/polyMesh/cellZones | 2 +- .../frontMesh/system/controlDict | 6 +- .../oversetMeshes/frontMesh/system/fvSchemes | 14 +- .../middleMesh/constant/polyMesh/cellZones | 2 +- .../middleMesh/system/controlDict | 6 +- .../oversetMeshes/middleMesh/system/fvSchemes | 14 +- .../basicMesh-potentialFoam/0/U | 2 +- .../basicMesh-potentialFoam/0/p | 2 +- .../basicMesh-potentialFoam/boundary | 2 +- .../constant/polyMesh/blockMeshDict | 18 +- .../basicMesh-potentialFoam/save/U | 2 +- .../basicMesh-potentialFoam/save/p | 2 +- .../system/controlDict | 128 +- .../basicMesh-potentialFoam/system/fvSchemes | 92 +- 223 files changed, 2687 insertions(+), 2687 deletions(-) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index d736dcaa7..7d23f7bd6 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -1,10 +1,10 @@ - _____________________________________ + _____________________________________ - *RELEASE NOTES FOR FOAM-EXTEND-4.0* - _____________________________________ + *RELEASE NOTES FOR FOAM-EXTEND-4.0* + _____________________________________ - December 2016 + December 2016 Table of Contents diff --git a/applications/solvers/compressible/steadyCompressibleFoam/hEqn.H b/applications/solvers/compressible/steadyCompressibleFoam/hEqn.H index d9378a743..94e1c4651 100644 --- a/applications/solvers/compressible/steadyCompressibleFoam/hEqn.H +++ b/applications/solvers/compressible/steadyCompressibleFoam/hEqn.H @@ -2,7 +2,7 @@ // Solve the enthalpy equation in total enthalpy formulation (see K) T.storePrevIter(); - + K = 0.5*(magSqr(U)); fvScalarMatrix hEqn diff --git a/applications/solvers/coupled/MRFPorousFoam/MRFPorousFoam.C b/applications/solvers/coupled/MRFPorousFoam/MRFPorousFoam.C index 179c79f92..fabff73d7 100644 --- a/applications/solvers/coupled/MRFPorousFoam/MRFPorousFoam.C +++ b/applications/solvers/coupled/MRFPorousFoam/MRFPorousFoam.C @@ -91,7 +91,7 @@ int main(int argc, char *argv[]) // Solving potential flow equation and correcting velocities phi = (fvc::interpolate(U) & mesh.Sf()); - + solve ( tpEqn() @@ -116,7 +116,7 @@ int main(int argc, char *argv[]) + tpEqn().flux() + tpresSource; } - + // Make flux relative in rotating zones mrfZones.relativeFlux(phi); diff --git a/applications/solvers/coupled/MRFPorousFoam/UEqn.H b/applications/solvers/coupled/MRFPorousFoam/UEqn.H index 55c804f37..3a9891fbe 100644 --- a/applications/solvers/coupled/MRFPorousFoam/UEqn.H +++ b/applications/solvers/coupled/MRFPorousFoam/UEqn.H @@ -34,7 +34,7 @@ // Add implicit MRF source as a Hodge dual of the rotational velocity TU += *mrfZones.omega(); - + // Add implicit resistance pZones.addResistance(UEqn, TU); diff --git a/applications/solvers/incompressible/RichardsFoam/spatialMeanValueRichardsonFoam/spatialMeanValueRichardsonFoam.C b/applications/solvers/incompressible/RichardsFoam/spatialMeanValueRichardsonFoam/spatialMeanValueRichardsonFoam.C index 11e38b6d8..908f7ed34 100644 --- a/applications/solvers/incompressible/RichardsFoam/spatialMeanValueRichardsonFoam/spatialMeanValueRichardsonFoam.C +++ b/applications/solvers/incompressible/RichardsFoam/spatialMeanValueRichardsonFoam/spatialMeanValueRichardsonFoam.C @@ -77,12 +77,12 @@ int main(int argc, char *argv[]) volScalarField field(fieldHeader, mesh); int nbMesh; - nbMesh = 0; + nbMesh = 0; - forAll(field, cellI) - { - nbMesh++; - } + forAll(field, cellI) + { + nbMesh++; + } Info<< runTime.timeName()<< " " << sum(field).value()/nbMesh<< " " diff --git a/applications/solvers/overset/icoDyMOversetFoam/Make/files b/applications/solvers/overset/icoDyMOversetFoam/Make/files index 3543e4382..8cef760bc 100644 --- a/applications/solvers/overset/icoDyMOversetFoam/Make/files +++ b/applications/solvers/overset/icoDyMOversetFoam/Make/files @@ -1,3 +1,3 @@ -icoDyMOversetFoam.C +icoDyMOversetFoam.C EXE = $(FOAM_APPBIN)/icoDyMOversetFoam diff --git a/applications/solvers/overset/icoOversetFoam/Make/files b/applications/solvers/overset/icoOversetFoam/Make/files index 5523b30a3..0ebe442a1 100644 --- a/applications/solvers/overset/icoOversetFoam/Make/files +++ b/applications/solvers/overset/icoOversetFoam/Make/files @@ -1,3 +1,3 @@ -icoOversetFoam.C +icoOversetFoam.C EXE = $(FOAM_APPBIN)/icoOversetFoam diff --git a/applications/solvers/overset/simpleMRFOversetFoam/Make/files b/applications/solvers/overset/simpleMRFOversetFoam/Make/files index 02c1dd001..14e560e47 100644 --- a/applications/solvers/overset/simpleMRFOversetFoam/Make/files +++ b/applications/solvers/overset/simpleMRFOversetFoam/Make/files @@ -1,3 +1,3 @@ -simpleMRFOversetFoam.C +simpleMRFOversetFoam.C EXE = $(FOAM_APPBIN)/simpleMRFOversetFoam diff --git a/applications/solvers/overset/simpleOversetFoam/Make/files b/applications/solvers/overset/simpleOversetFoam/Make/files index a7ac9674d..063fb4741 100644 --- a/applications/solvers/overset/simpleOversetFoam/Make/files +++ b/applications/solvers/overset/simpleOversetFoam/Make/files @@ -1,3 +1,3 @@ -simpleOversetFoam.C +simpleOversetFoam.C EXE = $(FOAM_APPBIN)/simpleOversetFoam diff --git a/applications/solvers/surfaceTracking/freeSurface/freeSurface.H b/applications/solvers/surfaceTracking/freeSurface/freeSurface.H index 05444980c..efe1f6ccc 100644 --- a/applications/solvers/surfaceTracking/freeSurface/freeSurface.H +++ b/applications/solvers/surfaceTracking/freeSurface/freeSurface.H @@ -230,7 +230,7 @@ class freeSurface const vector& axis ) const; - + public: // Declare name of the class and it's debug switch diff --git a/applications/solvers/surfaceTracking/interTrackFoam/interTrackFoam.C b/applications/solvers/surfaceTracking/interTrackFoam/interTrackFoam.C index 59149c978..ee6f5cebc 100644 --- a/applications/solvers/surfaceTracking/interTrackFoam/interTrackFoam.C +++ b/applications/solvers/surfaceTracking/interTrackFoam/interTrackFoam.C @@ -122,7 +122,7 @@ int main(int argc, char *argv[]) { phi -= pEqn.flux(); } - + p.relax(); } diff --git a/applications/utilities/immersedBoundary/writeIbMasks/writeIbMasks.C b/applications/utilities/immersedBoundary/writeIbMasks/writeIbMasks.C index b99b6a00a..cbdda8447 100644 --- a/applications/utilities/immersedBoundary/writeIbMasks/writeIbMasks.C +++ b/applications/utilities/immersedBoundary/writeIbMasks/writeIbMasks.C @@ -59,7 +59,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh) scalar minLiveGamma = GREAT; label minLiveCell = -1; const scalarField& gammaIn = gamma.internalField(); - + forAll (mesh.boundary(), patchI) { if (isA(mesh.boundary()[patchI])) diff --git a/applications/utilities/overset/calcOverset/Make/files b/applications/utilities/overset/calcOverset/Make/files index 27dd2e19d..f6a26c84c 100644 --- a/applications/utilities/overset/calcOverset/Make/files +++ b/applications/utilities/overset/calcOverset/Make/files @@ -1,3 +1,3 @@ -calcOverset.C +calcOverset.C EXE = $(FOAM_APPBIN)/calcOverset diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/CMakeLists.txt index ed12fb572..4b688def7 100644 --- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/CMakeLists.txt +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/CMakeLists.txt @@ -8,7 +8,7 @@ # file extensions and descriptions. # -# We a little hack here to support cmake and wmake-compiled FOAM +# We a little hack here to support cmake and wmake-compiled FOAM # libraries simultaneously. This uses the same trigger as externally # compiled applications (FOAM_FOUND) # diff --git a/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/CMakeLists.txt b/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/CMakeLists.txt index 8072a5406..e8c31db34 100644 --- a/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/CMakeLists.txt +++ b/applications/utilities/postProcessing/miscellaneous/dsmcFieldsCalc/CMakeLists.txt @@ -41,6 +41,6 @@ if(NOT FOAM_FOUND) endif() add_foam_executable(dsmcFieldsCalc - DEPENDS postCalc utilityFunctionObjects dsmc + DEPENDS postCalc utilityFunctionObjects dsmc SOURCES ${SOURCES} ) diff --git a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/CMakeLists.txt b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/CMakeLists.txt index dc6d7e981..b5b914764 100644 --- a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/CMakeLists.txt +++ b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/CMakeLists.txt @@ -41,6 +41,6 @@ if(NOT FOAM_FOUND) endif() add_foam_executable(applyWallFunctionBoundaryConditions - DEPENDS incompressibleRASModels compressibleRASModels + DEPENDS incompressibleRASModels compressibleRASModels SOURCES ${SOURCES} ) diff --git a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C index 55caa5a87..a093288c4 100644 --- a/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C +++ b/applications/utilities/preProcessing/faceAgglomerate/faceAgglomerate.C @@ -56,7 +56,7 @@ int main(int argc, char *argv[]) # include "createTime.H" # include "createNamedMesh.H" - word agglomDictName("faceAgglomerateDict"); + word agglomDictName("faceAgglomerateDict"); args.optionReadIfPresent("dict", agglomDictName); const polyBoundaryMesh& patches = mesh.boundaryMesh(); diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C index 3f6f184ae..07a927037 100644 --- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C +++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C @@ -285,8 +285,8 @@ int main(int argc, char *argv[]) << endl; return 0; - } - + } + if (Pstream::master()) { Info << "\nTotal number of coarse faces: "<< totalNCoarseFaces << endl; diff --git a/cmake/LibFindMacros.cmake b/cmake/LibFindMacros.cmake index 3ef5844dd..1e2979614 100644 --- a/cmake/LibFindMacros.cmake +++ b/cmake/LibFindMacros.cmake @@ -123,7 +123,7 @@ function (libfind_process PREFIX) set(includeopts ${${PREFIX}_PROCESS_INCLUDES}) set(libraryopts ${${PREFIX}_PROCESS_LIBS}) - # Process deps to add to + # Process deps to add to foreach (i ${PREFIX} ${${PREFIX}_DEPENDENCIES}) if (DEFINED ${i}_INCLUDE_OPTS OR DEFINED ${i}_LIBRARY_OPTS) # The package seems to export option lists that we can use, woohoo! @@ -146,11 +146,11 @@ function (libfind_process PREFIX) endif() endif() endforeach() - + if (includeopts) list(REMOVE_DUPLICATES includeopts) endif() - + if (libraryopts) list(REMOVE_DUPLICATES libraryopts) endif() @@ -215,7 +215,7 @@ function (libfind_process PREFIX) set (${PREFIX}_LIBRARIES ${libs} PARENT_SCOPE) set (${PREFIX}_FOUND TRUE PARENT_SCOPE) endif() - return() + return() endif() # Format messages for debug info and the type of error diff --git a/cmake/compileFOAM.cmake b/cmake/compileFOAM.cmake index fb04d236a..609033fc8 100644 --- a/cmake/compileFOAM.cmake +++ b/cmake/compileFOAM.cmake @@ -164,7 +164,7 @@ endif() set(FOAM_LABEL_SIZE "32" CACHE STRING "Label size") set_property(CACHE FOAM_LABEL_SIZE PROPERTY STRINGS 32 64) target_compile_definitions(OSspecific PUBLIC WM_LABEL_SIZE=${FOAM_LABEL_SIZE}) - + # No Repository target_compile_definitions(OSspecific PUBLIC NoRepository) diff --git a/cmake/getGitVersion.cmake b/cmake/getGitVersion.cmake index d2e8d9464..f0eeec5ac 100644 --- a/cmake/getGitVersion.cmake +++ b/cmake/getGitVersion.cmake @@ -38,12 +38,12 @@ if(GIT_FOUND) # Try to get version from from git execute_process( COMMAND ${GIT_EXECUTABLE} describe --tags --dirty=-dirty - OUTPUT_VARIABLE GIT_VERSION - ERROR_VARIABLE dummy - RESULT_VARIABLE res + OUTPUT_VARIABLE GIT_VERSION + ERROR_VARIABLE dummy + RESULT_VARIABLE res OUTPUT_STRIP_TRAILING_WHITESPACE ) - + if(res EQUAL 0) string(REPLACE "g" "" GIT_VERSION "${GIT_VERSION}") string(REGEX REPLACE "^v([0-9]+\\.?[0-9]*\\.?([0-9]*)).*" "\\1" FOAM_VERSION "${GIT_VERSION}") diff --git a/src/OSspecific/MSWindows/printStack.C b/src/OSspecific/MSWindows/printStack.C index f25d65c35..5da36505c 100644 --- a/src/OSspecific/MSWindows/printStack.C +++ b/src/OSspecific/MSWindows/printStack.C @@ -266,7 +266,7 @@ void getSymbolForRaw const word& address ) { - if + if ( filename.size() && (filename[0] == '/' || filename[1] == ':') ) @@ -319,7 +319,7 @@ void error::printStack(Ostream& os) string::size_type space = line.rfind(' ') + 1; fileName libPath = line.substr(space, line.size()-space); - if + if ( libPath.size() && (libPath[0] == '/' || libPath[1] == ':') ) diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H index b6267a1e7..b4f02aa41 100644 --- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H +++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/domainDecomposition.H @@ -71,7 +71,7 @@ class domainDecomposition //- Global face index globalProcFaceIndex gfIndex_; - + //- Processor label for each cell labelList cellToProc_; diff --git a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/processorMeshData.H b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/processorMeshData.H index 8a418137c..d825214ff 100644 --- a/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/processorMeshData.H +++ b/src/decompositionMethods/decomposeReconstruct/decomposeTools/finiteVolume/processorMeshData.H @@ -56,7 +56,7 @@ class processorMeshData // Private data // Internal mesh data - + //- Points pointField procPoints_; @@ -71,7 +71,7 @@ class processorMeshData // Boundary data, separated into existing and new patches - + //- Boundary addressing labelList boundaryAddressing_; @@ -80,19 +80,19 @@ class processorMeshData //- Regular patch starts labelList patchStarts_; - + //- Processor patch sizes labelList procPatchSizes_; - + //- Processor patch starts labelList procPatchSizes_; - + // Zones //- Point zones labelListList pointZones_; - + //- Face zones labelListList faceZones_; @@ -102,7 +102,7 @@ class processorMeshData //- Cell zones labelListList cellZones_; - + // Private Member Functions //- Disallow default bitwise copy construct diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/faFieldReconstructor.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/faFieldReconstructor.H index 7e1ac3e6f..3bad76fbc 100644 --- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/faFieldReconstructor.H +++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteArea/faFieldReconstructor.H @@ -113,7 +113,7 @@ public: //- Destructor virtual ~faPatchFieldReconstructor() {} - + // Member functions diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructor.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructor.H index 976c7c69c..232dceded 100644 --- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructor.H +++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/fvFieldReconstructor.H @@ -109,7 +109,7 @@ public: //- Destructor virtual ~fvPatchFieldReconstructor() {} - + // Member functions @@ -154,7 +154,7 @@ public: // Member Functions // Single field reconstruction - + //- Reconstruct volume field data into a given field // If a PtrList slot is empty, it is skipped template @@ -177,7 +177,7 @@ public: // Reconstruct and return a single field - + //- Reconstruct volume field template tmp > @@ -196,7 +196,7 @@ public: // Reconstruct and write all/selected fields - + //- Reconstruct and write all/selected volume fields template void reconstructFvVolumeFields diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.H index 34205f2cb..17e39cacf 100644 --- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.H +++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/processorMeshesReconstructor.H @@ -29,7 +29,7 @@ Description matching processor boundaries and build a single combined mesh by matching processor patches to each other. - In order to + In order to Author Hrvoje Jasak, Wikki Ltd. All rights reserved. diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.C b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.C index af3741323..2118267f0 100644 --- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.C +++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.C @@ -220,7 +220,7 @@ void Foam::sharedPoints::syncMark curMarkedPoints[patchMpI], nbrMarkedPoints[nbrMpI] ); - + nbrMarkedPoints[nbrMpI] = maxMark; curMarkedPoints[patchMpI] = maxMark; diff --git a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.H b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.H index 76ac83ef3..a0babafb9 100644 --- a/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.H +++ b/src/decompositionMethods/decomposeReconstruct/reconstructTools/finiteVolume/sharedPoints.H @@ -113,7 +113,7 @@ class sharedPoints const labelListList& patchPairs, const label fromMesh ) const; - + //- Calculate shared points void calcSharedPoints(); diff --git a/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChangerChangeMesh.C b/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChangerChangeMesh.C index 6068ab7ae..8b89f320b 100644 --- a/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChangerChangeMesh.C +++ b/src/dynamicMesh/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChangerChangeMesh.C @@ -2499,7 +2499,7 @@ Foam::autoPtr Foam::polyTopoChanger::changeMesh() // Mark the mesh as changing mesh_.changing(true); - + return topoChangeMap; } else diff --git a/src/dynamicMesh/dynamicTopoFvMesh/tetMetrics/tetMetric.C b/src/dynamicMesh/dynamicTopoFvMesh/tetMetrics/tetMetric.C index 91ef3871b..59c6be85b 100644 --- a/src/dynamicMesh/dynamicTopoFvMesh/tetMetrics/tetMetric.C +++ b/src/dynamicMesh/dynamicTopoFvMesh/tetMetrics/tetMetric.C @@ -82,7 +82,7 @@ tetMetric::New ) << "tetMetric table is empty" << exit(FatalError); } - + metricPointMemberFunctionTable::iterator mfIter = metricPointMemberFunctionTablePtr_->find(metricName); diff --git a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C index d9f0b3af8..d76728e48 100644 --- a/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C +++ b/src/dynamicMesh/loadBalanceFvMesh/loadBalanceFvMesh/loadBalanceFvMesh.C @@ -131,7 +131,7 @@ bool Foam::loadBalanceFvMesh::update() if (Pstream::parRun()) { // Decide when to balance here - + return loadBalance(dict_); } else diff --git a/src/dynamicMesh/topoChangerFvMesh/CMakeLists.txt b/src/dynamicMesh/topoChangerFvMesh/CMakeLists.txt index 4a065505c..5006102a7 100644 --- a/src/dynamicMesh/topoChangerFvMesh/CMakeLists.txt +++ b/src/dynamicMesh/topoChangerFvMesh/CMakeLists.txt @@ -54,4 +54,4 @@ list(APPEND SOURCES add_foam_library(topoChangerFvMesh SHARED ${SOURCES}) target_link_libraries(topoChangerFvMesh PUBLIC dynamicFvMesh decomposeReconstruct) - + diff --git a/src/dynamicMesh/topoChangerFvMesh/dynamicPolyRefinementFvMesh/dynamicPolyRefinementFvMesh.H b/src/dynamicMesh/topoChangerFvMesh/dynamicPolyRefinementFvMesh/dynamicPolyRefinementFvMesh.H index 51da62717..76a49f4d0 100644 --- a/src/dynamicMesh/topoChangerFvMesh/dynamicPolyRefinementFvMesh/dynamicPolyRefinementFvMesh.H +++ b/src/dynamicMesh/topoChangerFvMesh/dynamicPolyRefinementFvMesh/dynamicPolyRefinementFvMesh.H @@ -131,7 +131,7 @@ public: //- Is this the first update in the current time-step? bool firstUpdate() const; - + //- Update the mesh for topology change virtual bool update(); }; diff --git a/src/dynamicMesh/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMeshLoadBalance.C b/src/dynamicMesh/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMeshLoadBalance.C index 8a592932e..54b6c5417 100644 --- a/src/dynamicMesh/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMeshLoadBalance.C +++ b/src/dynamicMesh/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMeshLoadBalance.C @@ -623,7 +623,7 @@ bool Foam::topoChangerFvMesh::loadBalance(const dictionary& decompDict) oldPatchNMeshPoints // oldPatchNMeshPoints ); - + // Reset fvMesh and patches resetFvPrimitives ( diff --git a/src/dynamicMesh/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMeshLoadBalanceTemplates.C b/src/dynamicMesh/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMeshLoadBalanceTemplates.C index 5e5c44f4a..38eb453db 100644 --- a/src/dynamicMesh/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMeshLoadBalanceTemplates.C +++ b/src/dynamicMesh/topoChangerFvMesh/topoChangerFvMesh/topoChangerFvMeshLoadBalanceTemplates.C @@ -39,7 +39,7 @@ void Foam::topoChangerFvMesh::sendFields toProc<< geoFields.size() << nl; label fI = 0; - + forAllConstIter ( typename HashTable, @@ -88,7 +88,7 @@ void Foam::topoChangerFvMesh::insertFields iter ) { - + localFields[fI].set ( Pstream::myProcNo(), @@ -164,7 +164,7 @@ void Foam::topoChangerFvMesh::rebuildFields // Make an fvMesh mapper const fvMeshMapper mapper(*this, meshMap); - + forAllConstIter ( typename HashTable, diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt index 25e9e09ea..be41b938e 100644 --- a/src/engine/CMakeLists.txt +++ b/src/engine/CMakeLists.txt @@ -109,7 +109,7 @@ list(APPEND SOURCES engineTopoChangerMesh/noEngineMesh/noEngineMesh.C ) -# derivedFvPatchFields/engineTimeVaryingUniformFixedValue/engineTimeVaryingUniformFixedValueFvPatchField.C +# derivedFvPatchFields/engineTimeVaryingUniformFixedValue/engineTimeVaryingUniformFixedValueFvPatchField.C list(APPEND SOURCES derivedFvPatchFields/engineTimeVaryingUniformFixedValue/engineTimeVaryingUniformFixedValueFvPatchFields.C derivedFvPatchFields/engineMassFlowRateInletVelocity/engineMassFlowRateInletVelocityFvPatchVectorField.C diff --git a/src/finiteArea/finiteArea/fam/vectorFamDiv.H b/src/finiteArea/finiteArea/fam/vectorFamDiv.H index 60aa9a245..27d68773b 100644 --- a/src/finiteArea/finiteArea/fam/vectorFamDiv.H +++ b/src/finiteArea/finiteArea/fam/vectorFamDiv.H @@ -58,7 +58,7 @@ div const word& name ); - + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } diff --git a/src/finiteVolume/CMakeLists.txt b/src/finiteVolume/CMakeLists.txt index 6182a9881..a85cd059e 100644 --- a/src/finiteVolume/CMakeLists.txt +++ b/src/finiteVolume/CMakeLists.txt @@ -354,7 +354,7 @@ list(APPEND SOURCES ${schemes}/quadraticUpwindFit/quadraticUpwindFit.C ${schemes}/cubicUpwindFit/cubicUpwindFit.C ) -# +# # $(schemes)/quadraticLinearPureUpwindFit/quadraticLinearPureUpwindFit.C list(APPEND SOURCES ${schemes}/linearPureUpwindFit/linearPureUpwindFit.C @@ -464,7 +464,7 @@ list(APPEND SOURCES ${snGradSchemes}/skewCorrectedSnGrad/skewCorrectedSnGrads.C ${snGradSchemes}/fourthSnGrad/fourthSnGrads.C ) -# +# # $(snGradSchemes)/quadraticFitSnGrad/quadraticFitSnGradData.C # $(snGradSchemes)/quadraticFitSnGrad/quadraticFitSnGrads.C diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C index cc9dffbf4..71442f28f 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchScalarField.C @@ -77,7 +77,7 @@ void processorFvPatchField::updateInterfaceMatrix // Transform according to the transformation tensor // No transform for scalar. HJ, 29/Nov/2016 - + // Multiply the field by coefficients and add into the result const unallocLabelList& faceCells = this->patch().faceCells(); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C index 9c947cb85..1918a365f 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C @@ -103,7 +103,7 @@ pressureDirectedInletOutletVelocityFvPatchVectorField << " and patch " << this->patch().name() << abort(FatalError); } - } + } // Normalise to obtain the flow direction inletDir_ /= (mag(inletDir_) + SMALL); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C index e4d3f234c..e73d70893 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C @@ -99,7 +99,7 @@ pressureDirectedInletVelocityFvPatchVectorField << " and patch " << this->patch().name() << abort(FatalError); } - } + } // Normalise to obtain the flow direction inletDir_ /= (mag(inletDir_) + SMALL); diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C index 159877138..06f02de42 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C @@ -1201,7 +1201,7 @@ CrankNicolsonDdtScheme::fvcDdtConsistentPhiCorr - offCentre_(faceUDdt0()) ); } - + // Calculate old time flux fluxFieldType oldTimeFlux = rAUf*rDtCoef_(faceUDdt0)*(mesh().Sf() & faceU.oldTime()); diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/steadyInertialDdtScheme/steadyInertialDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/steadyInertialDdtScheme/steadyInertialDdtScheme.C index 23e1db124..28ec98f11 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/steadyInertialDdtScheme/steadyInertialDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/steadyInertialDdtScheme/steadyInertialDdtScheme.C @@ -77,7 +77,7 @@ tmp steadyInertialDdtScheme::CorDeltaT() const << endl; } } - + if (cofrDeltaTPtr.empty()) { FatalErrorIn diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/steadyInertialDdtScheme/steadyInertialDdtScheme.H b/src/finiteVolume/finiteVolume/ddtSchemes/steadyInertialDdtScheme/steadyInertialDdtScheme.H index 46905fcef..53d3ed1a8 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/steadyInertialDdtScheme/steadyInertialDdtScheme.H +++ b/src/finiteVolume/finiteVolume/ddtSchemes/steadyInertialDdtScheme/steadyInertialDdtScheme.H @@ -72,7 +72,7 @@ class steadyInertialDdtScheme //- Name of the flux field used to calculate the local // convective time-step - word phiName_; + word phiName_; //- Name of the diffusivity field used to calculate the local // diffusive time-step diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C index 9efd6d188..ae1e63aec 100644 --- a/src/finiteVolume/fvMesh/fvMesh.C +++ b/src/finiteVolume/fvMesh/fvMesh.C @@ -426,7 +426,7 @@ void Foam::fvMesh::resetFvPrimitives // Clear all mesh data clearOut(); -} +} Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate() diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C index 00c33627e..f65046eaa 100644 --- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C +++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclic/cyclicFvPatch.C @@ -52,7 +52,7 @@ void cyclicFvPatch::makeC(slicedSurfaceVectorField& C) const ); } - + // Make patch weighting factors void cyclicFvPatch::makeWeights(fvsPatchScalarField& w) const { diff --git a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicGgi/cyclicGgiFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicGgi/cyclicGgiFvPatch.C index 28b754699..71abcdc4b 100644 --- a/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicGgi/cyclicGgiFvPatch.C +++ b/src/finiteVolume/fvMesh/fvPatches/constraint/cyclicGgi/cyclicGgiFvPatch.C @@ -57,7 +57,7 @@ void Foam::cyclicGgiFvPatch::makeC(slicedSurfaceVectorField& C) const ); } - + // Make patch weighting factors void Foam::cyclicGgiFvPatch::makeWeights(fvsPatchScalarField& w) const { diff --git a/src/foam/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C b/src/foam/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C index 55165fb44..a8938b1b6 100644 --- a/src/foam/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C +++ b/src/foam/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.C @@ -26,7 +26,7 @@ License #include "dlLibraryTable.H" #include "OSspecific.H" #include "int.H" -#include +#include // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/foam/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H b/src/foam/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H index 2e1f5ae74..c5c7bd35e 100644 --- a/src/foam/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H +++ b/src/foam/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H @@ -166,7 +166,7 @@ public: //- Reset storage of a field to slice void reset(const Field& completeField); - + //- Reset storage of a field to slice with separate fields for the // internal field and boundary field void reset @@ -174,7 +174,7 @@ public: const Field& completeIField, const Field& completeBField ); - + //- Correct boundary field void correctBoundaryConditions(); }; diff --git a/src/foam/fields/PointPatchFieldTemplates/constraint/wedge/WedgePointPatchField.C b/src/foam/fields/PointPatchFieldTemplates/constraint/wedge/WedgePointPatchField.C index bfad81652..87d77d3a8 100644 --- a/src/foam/fields/PointPatchFieldTemplates/constraint/wedge/WedgePointPatchField.C +++ b/src/foam/fields/PointPatchFieldTemplates/constraint/wedge/WedgePointPatchField.C @@ -1,234 +1,234 @@ -/*---------------------------------------------------------------------------*\ - ========= | +/*---------------------------------------------------------------------------*\ + ========= | \\ / F ield | foam-extend: Open Source CFD \\ / O peration | Version: 4.1 \\ / A nd | Web: http://www.foam-extend.org \\/ M anipulation | For copyright notice see file Copyright -------------------------------------------------------------------------------- -License - This file is part of foam-extend. - - foam-extend is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation, either version 3 of the License, or (at your - option) any later version. - - foam-extend is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with foam-extend. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "WedgePointPatchField.H" -#include "transformField.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template -< - template class PatchField, - class Mesh, - class PointPatch, - class WedgePointPatch, - template class MatrixType, - class Type -> -WedgePointPatchField -:: -WedgePointPatchField -( - const PointPatch& p, - const DimensionedField& iF -) -: - PatchField(p, iF) -{} - - -template -< - template class PatchField, - class Mesh, - class PointPatch, - class WedgePointPatch, - template class MatrixType, - class Type -> -WedgePointPatchField -:: -WedgePointPatchField -( - const PointPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - PatchField(p, iF) -{ - if (!isType(p)) - { - FatalIOErrorIn - ( - "WedgePointPatchField" - "::WedgePointPatchField\n" - "(\n" - " const PointPatch& p,\n" - " const DimensionedField& field,\n" - " const dictionary& dict\n" - ")\n", - dict - ) << "patch " << this->patch().index() << " not wedge type. " - << "Patch type = " << p.type() - << exit(FatalIOError); - } -} - - -template -< - template class PatchField, - class Mesh, - class PointPatch, - class WedgePointPatch, - template class MatrixType, - class Type -> -WedgePointPatchField -:: -WedgePointPatchField -( - const WedgePointPatchField - &, - const PointPatch& p, - const DimensionedField& iF, - const PointPatchFieldMapper& -) -: - PatchField(p, iF) -{ - if (!isType(this->patch())) - { - FatalErrorIn - ( - "WedgePointPatchField" - "::WedgePointPatchField\n" - "(\n" - " const WedgePointPatchField" - " &,\n" - " const PointPatch& p,\n" - " const DimensionedField& iF,\n" - " const PointPatchFieldMapper& mapper\n" - ")\n" - ) << "Field type does not correspond to patch type for patch " - << this->patch().index() << "." << endl - << "Field type: " << typeName << endl - << "Patch type: " << this->patch().type() - << exit(FatalError); - } -} - - -template -< - template class PatchField, - class Mesh, - class PointPatch, - class WedgePointPatch, - template class MatrixType, - class Type -> -WedgePointPatchField -:: -WedgePointPatchField -( - const WedgePointPatchField - & ptf -) -: - PatchField(ptf) -{} - - -template -< - template class PatchField, - class Mesh, - class PointPatch, - class WedgePointPatch, - template class MatrixType, - class Type -> -WedgePointPatchField -:: -WedgePointPatchField -( - const WedgePointPatchField - & ptf, - const DimensionedField& iF -) -: - PatchField(ptf, iF) -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -// Evaluate patch field -template -< - template class PatchField, - class Mesh, - class PointPatch, - class WedgePointPatch, - template class MatrixType, - class Type -> -void -WedgePointPatchField -::evaluate -( - const Pstream::commsTypes commsType -) -{ - // ZT, 26/02/2017: Size of the patch could be zero in parallel runs - if (!this->patch().meshPoints().empty()) - { - // In order to ensure that the wedge patch is always flat, take the - // normal vector from the first point - const vector& nHat = this->patch().pointNormals()[0]; - - tmp > tvalues = - transform(I - nHat*nHat, this->patchInternalField()); - const Field& values = tvalues(); - - // Get internal field to insert values into - Field& iF = const_cast&>(this->internalField()); - - // Get addressing - const labelList& meshPoints = this->patch().meshPoints(); - - forAll (meshPoints, pointI) - { - iF[meshPoints[pointI]] = values[pointI]; - } - } -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // +------------------------------------------------------------------------------- +License + This file is part of foam-extend. + + foam-extend is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation, either version 3 of the License, or (at your + option) any later version. + + foam-extend is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with foam-extend. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "WedgePointPatchField.H" +#include "transformField.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +template +< + template class PatchField, + class Mesh, + class PointPatch, + class WedgePointPatch, + template class MatrixType, + class Type +> +WedgePointPatchField +:: +WedgePointPatchField +( + const PointPatch& p, + const DimensionedField& iF +) +: + PatchField(p, iF) +{} + + +template +< + template class PatchField, + class Mesh, + class PointPatch, + class WedgePointPatch, + template class MatrixType, + class Type +> +WedgePointPatchField +:: +WedgePointPatchField +( + const PointPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + PatchField(p, iF) +{ + if (!isType(p)) + { + FatalIOErrorIn + ( + "WedgePointPatchField" + "::WedgePointPatchField\n" + "(\n" + " const PointPatch& p,\n" + " const DimensionedField& field,\n" + " const dictionary& dict\n" + ")\n", + dict + ) << "patch " << this->patch().index() << " not wedge type. " + << "Patch type = " << p.type() + << exit(FatalIOError); + } +} + + +template +< + template class PatchField, + class Mesh, + class PointPatch, + class WedgePointPatch, + template class MatrixType, + class Type +> +WedgePointPatchField +:: +WedgePointPatchField +( + const WedgePointPatchField + &, + const PointPatch& p, + const DimensionedField& iF, + const PointPatchFieldMapper& +) +: + PatchField(p, iF) +{ + if (!isType(this->patch())) + { + FatalErrorIn + ( + "WedgePointPatchField" + "::WedgePointPatchField\n" + "(\n" + " const WedgePointPatchField" + " &,\n" + " const PointPatch& p,\n" + " const DimensionedField& iF,\n" + " const PointPatchFieldMapper& mapper\n" + ")\n" + ) << "Field type does not correspond to patch type for patch " + << this->patch().index() << "." << endl + << "Field type: " << typeName << endl + << "Patch type: " << this->patch().type() + << exit(FatalError); + } +} + + +template +< + template class PatchField, + class Mesh, + class PointPatch, + class WedgePointPatch, + template class MatrixType, + class Type +> +WedgePointPatchField +:: +WedgePointPatchField +( + const WedgePointPatchField + & ptf +) +: + PatchField(ptf) +{} + + +template +< + template class PatchField, + class Mesh, + class PointPatch, + class WedgePointPatch, + template class MatrixType, + class Type +> +WedgePointPatchField +:: +WedgePointPatchField +( + const WedgePointPatchField + & ptf, + const DimensionedField& iF +) +: + PatchField(ptf, iF) +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +// Evaluate patch field +template +< + template class PatchField, + class Mesh, + class PointPatch, + class WedgePointPatch, + template class MatrixType, + class Type +> +void +WedgePointPatchField +::evaluate +( + const Pstream::commsTypes commsType +) +{ + // ZT, 26/02/2017: Size of the patch could be zero in parallel runs + if (!this->patch().meshPoints().empty()) + { + // In order to ensure that the wedge patch is always flat, take the + // normal vector from the first point + const vector& nHat = this->patch().pointNormals()[0]; + + tmp > tvalues = + transform(I - nHat*nHat, this->patchInternalField()); + const Field& values = tvalues(); + + // Get internal field to insert values into + Field& iF = const_cast&>(this->internalField()); + + // Get addressing + const labelList& meshPoints = this->patch().meshPoints(); + + forAll (meshPoints, pointI) + { + iF[meshPoints[pointI]] = values[pointI]; + } + } +} + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// ************************************************************************* // diff --git a/src/foam/interpolations/GGIInterpolation/GGIInterpolationWeights.C b/src/foam/interpolations/GGIInterpolation/GGIInterpolationWeights.C index 33588d421..9d9d41327 100644 --- a/src/foam/interpolations/GGIInterpolation/GGIInterpolationWeights.C +++ b/src/foam/interpolations/GGIInterpolation/GGIInterpolationWeights.C @@ -909,7 +909,7 @@ void GGIInterpolation::calcPartiallyCoveredFaces InfoIn("GGIInterpolation::calcPartiallyCoveredFaces") << " : Found " << partiallyUncoveredMasterAddrPtr_->size() << " partially overlapping faces for master GGI patch" << endl; - + if (partiallyUncoveredMasterAddrPtr_->size()) { Info<< "Max uncoverage: " diff --git a/src/foam/matrices/blockLduMatrix/BlockAMG/BlockMatrixCoarsening/BlockMatrixClustering/BlockMatrixClustering.C b/src/foam/matrices/blockLduMatrix/BlockAMG/BlockMatrixCoarsening/BlockMatrixClustering/BlockMatrixClustering.C index c2890b1cb..8e7412563 100644 --- a/src/foam/matrices/blockLduMatrix/BlockAMG/BlockMatrixCoarsening/BlockMatrixClustering/BlockMatrixClustering.C +++ b/src/foam/matrices/blockLduMatrix/BlockAMG/BlockMatrixCoarsening/BlockMatrixClustering/BlockMatrixClustering.C @@ -633,7 +633,7 @@ void Foam::BlockMatrixClustering::agglomerateCoeffs // Reset coefficients to zero. Cannot touch the diagonal activeCoarseUpper = pTraits::zero; - + forAll(coeffRestrictAddr_, fineCoeffI) { label rmUpperAddr = agglomIndex_[upperAddr[fineCoeffI]]; @@ -686,7 +686,7 @@ void Foam::BlockMatrixClustering::agglomerateCoeffs // Reset coefficients to zero. Cannot touch the diagonal activeCoarseUpper = pTraits::zero; activeCoarseLower = pTraits::zero; - + forAll(coeffRestrictAddr_, fineCoeffI) { label rmUpperAddr = agglomIndex_[upperAddr[fineCoeffI]]; @@ -1165,7 +1165,7 @@ void Foam::BlockMatrixClustering::updateMatrix // Get interfaces from coarse matrix lduInterfacePtrsList coarseInterfaces = coarseMatrix.mesh().interfaces(); - + // Get interfaces fields from coarse matrix typename BlockLduInterfaceFieldPtrsList::Type& coarseInterfaceFieldsTransfer = coarseMatrix.interfaces(); diff --git a/src/foam/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C b/src/foam/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C index a917f12e8..76bf9834c 100644 --- a/src/foam/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C +++ b/src/foam/matrices/lduMatrix/lduMatrix/lduMatrixOperations.C @@ -148,7 +148,7 @@ void Foam::lduMatrix::operator+=(const lduMatrix& A) { return; } - + if (A.diagPtr_) { diag() += A.diag(); @@ -222,7 +222,7 @@ void Foam::lduMatrix::operator-=(const lduMatrix& A) { return; } - + if (A.diagPtr_) { diag() -= A.diag(); diff --git a/src/foam/meshes/polyMesh/globalMeshData/globalProcFaceIndex.C b/src/foam/meshes/polyMesh/globalMeshData/globalProcFaceIndex.C index b38f0ad8a..4f7b1cc79 100644 --- a/src/foam/meshes/polyMesh/globalMeshData/globalProcFaceIndex.C +++ b/src/foam/meshes/polyMesh/globalMeshData/globalProcFaceIndex.C @@ -81,7 +81,7 @@ void Foam::globalProcFaceIndex::calcFaceIndex() // Assemble global label list for mesh faces label globalFaceIndex = procFaceOffset_[Pstream::myProcNo()]; - + for (label faceI = 0; faceI < mesh_.nInternalFaces(); faceI++) { globalLabel_[faceI] = globalFaceIndex; @@ -93,7 +93,7 @@ void Foam::globalProcFaceIndex::calcFaceIndex() { const label patchSize = patches[patchI].size(); const label patchStart = patches[patchI].start(); - + if (isA(patches[patchI])) { const processorPolyPatch& procPatch = @@ -162,7 +162,7 @@ void Foam::globalProcFaceIndex::calcFaceIndex() // Insert the data into the list const label patchStart = patches[patchI].start(); - + forAll (masterFaceLabels, patchFaceI) { globalLabel_[patchStart + patchFaceI] = diff --git a/src/foam/meshes/polyMesh/globalMeshData/globalProcFaceIndex.H b/src/foam/meshes/polyMesh/globalMeshData/globalProcFaceIndex.H index c154c64ba..f0703ae0c 100644 --- a/src/foam/meshes/polyMesh/globalMeshData/globalProcFaceIndex.H +++ b/src/foam/meshes/polyMesh/globalMeshData/globalProcFaceIndex.H @@ -82,7 +82,7 @@ class globalProcFaceIndex // Sized to number of live faces in the mesh labelList globalLabel_; - + // Private Member Functions //- Disallow default bitwise copy construct diff --git a/src/foam/meshes/polyMesh/polyMeshIO.C b/src/foam/meshes/polyMesh/polyMeshIO.C index 976a4c950..8ddd82799 100644 --- a/src/foam/meshes/polyMesh/polyMeshIO.C +++ b/src/foam/meshes/polyMesh/polyMeshIO.C @@ -192,7 +192,7 @@ Foam::polyMesh::polyMesh } - + // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // void Foam::polyMesh::setInstance(const fileName& inst) diff --git a/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C b/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C index 89c174f34..c336d6a7a 100644 --- a/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C +++ b/src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C @@ -587,10 +587,10 @@ void Foam::polyPatch::resetPatch { // Clear all data clearAddressing(); - + // Reset start and primitive patch start_ = newStart; - + primitivePatch::operator= ( primitivePatch diff --git a/src/foam/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C b/src/foam/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C index 67dba15cf..98d9e97be 100644 --- a/src/foam/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C +++ b/src/foam/meshes/primitiveMesh/primitiveMeshCheck/primitiveMeshCheck.C @@ -166,7 +166,7 @@ bool Foam::primitiveMesh::checkClosedCells } reduce(nErrorClosed, sumOp