From 5e972c772fc77d7bd8a197f0e0d40ea2b9aad9fb Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 4 Dec 2009 13:39:35 +0100 Subject: [PATCH] remove trailing space from some files --- .../solvers/combustion/PDRFoam/XiEqns | 4 +- .../PDRFoam/XiModels/algebraic/algebraic.C | 2 +- .../SCOPE/SCOPELaminarFlameSpeed.C | 2 +- .../solvers/combustion/PDRFoam/setDeltaT.H | 2 +- .../compressible/rhoCentralFoam/Allwmake | 2 +- .../compressible/rhoSonicFoam/rhoSonicFoam.C | 2 +- .../compressible/rhopSonicFoam/Allwmake | 2 +- .../BCs/p/inviscidWallPFvPatchScalarField.C | 4 +- .../BCs/rhoE/mixedRhoEFvPatchScalarField.C | 4 +- .../BCs/rhoU/fixedRhoUFvPatchVectorField.H | 2 +- .../electrostaticFoam/Make/files | 2 +- .../solvers/incompressible/icoFoam/Make/files | 2 +- .../nonNewtonianIcoFoam/Make/files | 2 +- .../incompressible/simpleFoam/Make/files | 2 +- .../solvers/multiphase/bubbleFoam/UEqns.H | 2 +- .../multiphase/cavitatingFoam/CourantNo.H | 2 +- .../cavitatingFoam/continuityErrs.H | 4 +- .../multiphase/cavitatingFoam/setDeltaT.H | 2 +- .../alphaContactAngleFvPatchScalarField.C | 2 +- .../multiphaseMixture/phase/phase.C | 2 +- .../settlingFoam/correctViscosity.H | 2 +- .../multiphase/twoPhaseEulerFoam/UEqns.H | 2 +- .../conductivityModel/newConductivityModel.C | 4 +- .../JohnsonJacksonFrictionalStress.C | 6 +- .../newFrictionalStressModel.C | 4 +- .../newGranularPressureModel.C | 4 +- .../CarnahanStarling/CarnahanStarlingRadial.C | 6 +- .../radialModel/Gidaspow/GidaspowRadial.C | 2 +- .../SinclairJackson/SinclairJacksonRadial.C | 2 +- .../radialModel/radialModel/newRadialModel.C | 4 +- .../multiphase/twoPhaseEulerFoam/pEqn.H | 2 +- .../tractionDisplacementFvPatchVectorField.C | 4 +- .../solidEquilibriumDisplacementFoam.C | 2 +- ...DisplacementCorrectionFvPatchVectorField.C | 2 +- .../mesh/advanced/selectCells/edgeStats.H | 2 +- .../conversion/fluentMeshToFoam/README.txt | 18 +-- .../mesh/conversion/gmshToFoam/Make/options | 2 +- .../mesh/conversion/sammToFoam/readBoundary.C | 2 +- .../mesh/conversion/starToFoam/readBoundary.C | 2 +- .../mesh/conversion/starToFoam/readPoints.C | 2 +- .../mesh/conversion/writeMeshObj/Make/options | 2 +- .../extrudeMesh/extrudedMesh/extrudedMesh.C | 2 +- .../generation/snappyHexMesh/snappyHexMesh.C | 2 +- .../manipulation/checkMesh/printMeshStats.C | 2 +- .../moveEngineMesh/moveEngineMesh.C | 4 +- .../mesh/manipulation/objToVTK/Make/options | 2 +- .../mesh/manipulation/setSet/writePatch.C | 4 +- .../mesh/manipulation/setSet/writePointSet.C | 4 +- .../mesh/manipulation/splitMesh/Make/options | 2 +- .../mesh/manipulation/splitMesh/regionSide.C | 2 +- .../mesh/manipulation/splitMesh/regionSide.H | 2 +- .../mesh/manipulation/zipUpMesh/zipUpMesh.C | 2 +- .../decomposePar/decomposeParDict | 2 +- .../decomposePar/fvFieldDecomposer.H | 4 +- .../foamDataToFluent/fluentUnitNumbers.txt | 38 ++--- .../foamToFieldview9/calcFaceAddressing.C | 2 +- .../dataConversion/foamToGMV/Make/options | 4 +- .../foamToGMV/gmvOutputHeader.H | 6 +- .../foamToGMV/readConversionProperties.H | 4 +- .../foamToTecplot360/foamToTecplot360.C | 2 +- .../foamToTecplot360/readFields.H | 2 +- .../foamToTecplot360/tecplotWriter.C | 140 +++++++++--------- .../dataConversion/foamToVTK/internalWriter.C | 2 +- .../dataConversion/foamToVTK/readFields.H | 2 +- .../dataConversion/foamToVTK/vtkTopo.C | 2 +- .../dataConversion/foamToVTK/writeFaceSet.C | 4 +- .../dataConversion/foamToVTK/writePointSet.C | 4 +- .../foamToVTK/writeSurfFields.C | 2 +- .../PV3Readers/vtkPV3Readers/vtkPV3Readers.H | 2 +- .../ensightFoamReader/getFieldScalar.H | 4 +- .../ensightFoamReader/getFieldTensor.H | 8 +- .../ensightFoamReader/getFieldVector.H | 10 +- .../miscellaneous/postChannel/channelIndex.C | 2 +- .../miscellaneous/postChannel/sumDataI.H | 2 +- .../surface/surfaceClean/collapseBase.C | 16 +- .../surface/surfaceClean/collapseEdge.C | 2 +- .../equilibriumCO/equilibriumCO.C | 2 +- .../algorithms/MeshWave/FaceCellWave.C | 8 +- .../algorithms/MeshWave/FaceCellWave.H | 2 +- src/OpenFOAM/algorithms/MeshWave/MeshWave.C | 4 +- .../db/IOstreams/Pstreams/PstreamReduceOps.H | 6 +- .../db/IOstreams/gzstream/COPYING.LIB | 2 +- src/OpenFOAM/db/IOstreams/gzstream/gzstream.C | 8 +- src/OpenFOAM/db/IOstreams/gzstream/gzstream.h | 102 ++++++------- .../OutputFilterFunctionObject.H | 2 +- .../DimensionedFieldFunctions.C | 2 +- .../FieldFields/FieldField/FieldField.C | 2 +- .../GeometricField/GeometricField.H | 8 +- .../GeometricField/GeometricFieldFunctions.C | 2 +- .../GeometricField/GeometricFieldFunctions.H | 2 +- .../GeometricField/GeometricFieldFunctionsM.H | 2 +- .../GeometricField/MapGeometricFields.H | 10 +- .../transformGeometricField.C | 8 +- src/OpenFOAM/fields/ReadFields/ReadFields.C | 2 +- .../pointConstraint/pointConstraint.H | 4 +- src/OpenFOAM/graph/curve/curve.H | 2 +- src/OpenFOAM/graph/graph.H | 6 +- .../graph/writers/jplotGraph/jplotGraph.H | 2 +- src/OpenFOAM/include/checkTimeOptions.H | 2 +- .../LUscalarMatrix/procLduInterface.H | 2 +- .../matrices/LUscalarMatrix/procLduMatrix.C | 2 +- .../lduAddressing/lduInterface/lduInterface.H | 2 +- .../lduInterface/processorLduInterface.C | 2 +- .../cyclicLduInterfaceField.C | 2 +- .../noPreconditioner/noPreconditioner.H | 2 +- .../GAMGAgglomerateLduAddressing.C | 2 +- .../lduMatrix/solvers/GAMG/GAMGSolver.H | 2 +- .../GAMG/GAMGSolverAgglomerateMatrix.C | 4 +- .../cyclicGAMGInterfaceField.H | 2 +- .../ProcessorTopology/ProcessorTopology.C | 4 +- .../meshes/ProcessorTopology/commSchedule.H | 6 +- .../meshes/meshShapes/cellShape/cellShapeI.H | 2 +- .../meshes/meshShapes/face/oppositeFace.H | 2 +- src/OpenFOAM/meshes/meshTools/matchPoints.C | 2 +- .../pointMesh/pointMeshMapper/pointMapper.C | 2 +- .../constraint/cyclic/cyclicPointPatch.C | 2 +- .../processor/processorPointPatch.H | 4 +- .../polyMesh/globalMeshData/globalMeshData.C | 6 +- .../polyMesh/globalMeshData/globalMeshData.H | 8 +- .../polyMesh/globalMeshData/globalPoints.H | 4 +- .../mapPolyMesh/faceMapper/faceMapper.C | 2 +- .../mapPolyMesh/mapDistribute/mapDistribute.H | 2 +- .../mapDistribute/mapDistributePolyMesh.H | 2 +- .../constraint/processor/processorPolyPatch.H | 2 +- .../meshes/primitiveMesh/primitiveMesh.H | 6 +- .../primitiveShapes/triangle/triangle.H | 2 +- .../primitives/DiagTensor/DiagTensorI.H | 2 +- .../SphericalTensor2D/SphericalTensor2DI.H | 2 +- .../primitives/VectorSpace/VectorSpaceM.H | 2 +- src/OpenFOAM/primitives/random/random.3 | 6 +- src/OpenFOAM/primitives/random/random.c | 6 +- .../primitives/septernion/septernion.H | 2 +- .../primitives/transform/symmTransform.H | 4 +- .../dynamicFvMesh/newDynamicFvMesh.C | 2 +- .../dynamicMotionSolverFvMesh.C | 2 +- src/dynamicFvMesh/include/meshCourantNo.H | 2 +- .../solidBodyMotionFunctions/SDA/SDA.H | 2 +- .../newSolidBodyMotionFunction.C | 2 +- .../attachDetach/attachInterface.C | 2 +- .../attachDetach/detachInterface.C | 6 +- src/dynamicMesh/boundaryPatch/boundaryPatch.H | 2 +- .../fvMeshAdder/fvMeshAdderTemplates.C | 16 +- .../fvMeshDistribute/fvMeshDistribute.C | 14 +- .../fvMeshDistributeTemplates.C | 2 +- .../layerAdditionRemoval/removeCellLayer.C | 6 +- .../layerAdditionRemoval/setLayerPairing.C | 4 +- src/dynamicMesh/meshCut/cellCuts/cellCuts.H | 6 +- .../meshCut/cellLooper/cellLooper.H | 2 +- .../directions/directionInfo/directionInfo.C | 10 +- .../directions/directionInfo/directionInfo.H | 4 +- .../directions/directionInfo/directionInfoI.H | 2 +- .../meshCut/directions/directions.C | 4 +- .../meshCut/directions/directions.H | 2 +- .../meshCut/edgeVertex/edgeVertex.H | 6 +- .../boundaryCutter/boundaryCutter.C | 8 +- .../meshCutAndRemove/meshCutAndRemove.H | 4 +- .../multiDirRefinement/multiDirRefinement.C | 4 +- .../multiDirRefinement/multiDirRefinement.H | 2 +- .../refinementIterator/refinementIterator.C | 4 +- .../refinementIterator/refinementIterator.H | 2 +- .../wallNormalInfo/wallNormalInfoI.H | 4 +- src/dynamicMesh/motionSolver/motionSolver.H | 2 +- .../perfectInterface/perfectInterface.C | 2 +- .../polyMeshAdder/faceCoupleInfo.H | 4 +- .../polyTopoChange/addPatchCellLayer.C | 2 +- .../polyTopoChange/edgeCollapser.C | 6 +- .../modifyObject/polyModifyFace.H | 2 +- .../polyTopoChange/refinementDataI.H | 2 +- .../polyTopoChange/refinementDistanceDataI.H | 2 +- .../polyTopoChange/removeCells.C | 2 +- .../polyTopoChange/removePoints.C | 4 +- .../repatchPolyTopoChanger.H | 2 +- src/dynamicMesh/setUpdater/setUpdater.H | 2 +- .../setUpdater/setUpdaterTemplates.C | 2 +- .../slidingInterfaceAttachedAddressing.C | 10 +- .../slidingInterfaceProjectPoints.C | 16 +- .../fvMotionSolverEngineMesh.C | 4 +- .../layeredEngineMesh/layeredEngineMesh.C | 6 +- src/engine/ignition/ignitionSite.H | 2 +- .../errorDrivenRefinement.C | 4 +- .../errorDrivenRefinement.H | 2 +- .../evaluateError/evaluateError.C | 2 +- .../compressible/compressibleCourantNo.H | 2 +- .../cfdTools/incompressible/CourantNo.H | 2 +- .../basic/transform/transformFvPatchField.C | 2 +- .../jumpCyclic/jumpCyclicFvPatchField.H | 2 +- .../constraint/wedge/wedgeFvPatchField.C | 2 +- .../derived/fan/fanFvPatchField.H | 2 +- .../freestreamPressureFvPatchScalarField.C | 4 +- .../partialSlip/partialSlipFvPatchField.C | 2 +- ...ureInletOutletVelocityFvPatchVectorField.C | 2 +- .../rotatingTotalPressureFvPatchScalarField.C | 2 +- .../supersonicFreestreamFvPatchVectorField.H | 2 +- ...urfaceNormalFixedValueFvPatchVectorField.H | 2 +- .../syringePressureFvPatchScalarField.C | 18 +-- .../totalTemperatureFvPatchScalarField.C | 2 +- .../totalTemperatureFvPatchScalarField.H | 2 +- .../gaussConvectionSchemes.C | 2 +- .../multivariateGaussConvectionSchemes.C | 2 +- .../EulerD2dt2Scheme/EulerD2dt2Schemes.C | 2 +- .../steadyStateD2dt2Schemes.C | 2 +- .../CoEulerDdtScheme/CoEulerDdtSchemes.C | 2 +- .../CrankNicholsonDdtSchemes.C | 2 +- .../EulerDdtScheme/EulerDdtSchemes.C | 2 +- .../ddtSchemes/SLTSDdtScheme/SLTSDdtSchemes.C | 2 +- .../backwardDdtScheme/backwardDdtSchemes.C | 2 +- .../steadyStateDdtSchemes.C | 2 +- .../gaussDivScheme/gaussDivScheme.C | 2 +- .../gaussDivScheme/gaussDivSchemes.C | 2 +- .../finiteVolume/fvc/fvcAverage.C | 4 +- src/finiteVolume/finiteVolume/fvc/fvcCurl.C | 6 +- src/finiteVolume/finiteVolume/fvc/fvcD2dt2.C | 2 +- src/finiteVolume/finiteVolume/fvc/fvcDDt.C | 2 +- src/finiteVolume/finiteVolume/fvc/fvcFlux.C | 2 +- .../finiteVolume/fvc/fvcMagSqrGradGrad.C | 2 +- .../extendedLeastSquaresGrads.C | 2 +- .../extendedLeastSquaresVectors.C | 8 +- .../gradSchemes/fourthGrad/fourthGrads.C | 2 +- .../leastSquaresGrad/leastSquaresGrads.C | 2 +- .../limitedSnGrad/limitedSnGrad.C | 2 +- .../quadraticFitSnGrad/quadraticFitSnGrads.C | 2 +- .../fullStencils/CFCCellToCellStencil.C | 6 +- .../fullStencils/cellToCellStencil.H | 2 +- .../extendedUpwindCellToFaceStencil.C | 2 +- .../fvMesh/fvBoundaryMesh/fvBoundaryMesh.C | 2 +- src/finiteVolume/fvMesh/fvMeshGeometry.C | 4 +- .../fvMesh/fvMeshMapper/fvSurfaceMapper.C | 2 +- .../fvMesh/fvMeshSubset/fvMeshSubset.H | 4 +- .../fvMeshSubset/fvMeshSubsetInterpolate.C | 6 +- .../fvMesh/fvPatches/fvPatch/fvPatch.H | 2 +- .../singleCellFvMesh/singleCellFvMesh.C | 2 +- src/finiteVolume/fvMesh/wallDist/wallDist.C | 2 +- .../fvMesh/wallDist/wallDistData.H | 4 +- .../wallDist/wallPointYPlus/wallPointYPlusI.H | 8 +- .../findCellPointFaceTriangle.H | 2 +- .../interpolationCellPointFace.C | 54 +++---- .../interpolationCellPointFace.H | 2 +- .../LimitedScheme/LimitedScheme.H | 2 +- .../limitedSchemes/LimitedScheme/NVDVTVDV.H | 2 +- .../limitedSchemes/Phi/Phi.H | 2 +- .../limitedSchemes/PhiScheme/PhiScheme.C | 2 +- .../limitedSchemes/PhiScheme/PhiScheme.H | 2 +- .../limitedSchemes/blended/blended.H | 2 +- .../limitedCubic/limitedCubic.H | 2 +- .../limitedCubic/limitedCubicV.H | 2 +- .../limitedSchemes/upwind/upwind.H | 2 +- .../multivariateScheme/multivariateScheme.C | 4 +- .../multivariateScheme/multivariateScheme.H | 2 +- .../multivariateSelectionScheme.H | 2 +- .../upwind/multivariateUpwind.H | 2 +- .../schemes/clippedLinear/clippedLinear.H | 2 +- .../schemes/cubic/cubic.H | 2 +- .../schemes/downwind/downwind.H | 2 +- .../schemes/linear/linear.H | 2 +- .../schemes/localBlended/localBlended.H | 6 +- .../schemes/localMax/localMax.H | 2 +- .../schemes/localMin/localMin.H | 2 +- .../schemes/reverseLinear/reverseLinear.C | 2 +- .../schemes/skewCorrected/skewCorrected.H | 4 +- .../skewCorrected/skewCorrectionVectors.H | 2 +- .../surfaceInterpolation/surfaceInterpolate.C | 20 +-- .../volPointInterpolation.C | 2 +- .../volPointInterpolation.H | 4 +- .../MGridGenGAMGAgglomerate.C | 2 +- ...lacementComponentLaplacianFvMotionSolver.C | 2 +- .../cellMotion/cellMotionFvPatchField.C | 2 +- .../inverseDistanceDiffusivity.H | 2 +- .../inverseFaceDistanceDiffusivity.H | 2 +- .../inversePointDistanceDiffusivity.H | 2 +- .../motionDirectionalDiffusivity.C | 2 +- ...surfaceDisplacementPointPatchVectorField.C | 2 +- ...aceSlipDisplacementPointPatchVectorField.C | 2 +- .../layerParameters/layerParameters.H | 10 +- .../autoHexMeshDriver/pointData/pointDataI.H | 18 +-- .../meshRefinement/meshRefinement.C | 2 +- .../refinementSurfaces/refinementSurfaces.C | 2 +- .../trackedParticle/ExactParticle.H | 2 +- src/meshTools/PointEdgeWave/PointEdgeWave.C | 16 +- src/meshTools/cellClassification/cellInfo.H | 4 +- src/meshTools/cellClassification/cellInfoI.H | 8 +- src/meshTools/cellDist/cellDistFuncs.H | 2 +- .../cellDist/wallPoint/wallPointDataI.H | 10 +- src/meshTools/cellDist/wallPoint/wallPointI.H | 12 +- src/meshTools/indexedOctree/indexedOctree.C | 10 +- src/meshTools/meshSearch/meshSearch.C | 6 +- src/meshTools/meshSearch/meshSearch.H | 2 +- src/meshTools/octree/PointIndexHit.H | 2 +- src/meshTools/octree/octreeDataCell.C | 6 +- src/meshTools/octree/octreeDataEdges.C | 4 +- .../octree/octreeDataPointTreeLeaf.C | 2 +- .../searchableSurfaceWithGaps.C | 2 +- .../sets/cellSources/cellToCell/cellToCell.C | 2 +- .../sets/cellSources/faceToCell/faceToCell.C | 2 +- .../sets/cellSources/nbrToCell/nbrToCell.C | 2 +- .../rotatedBoxToCell/rotatedBoxToCell.C | 4 +- .../cellSources/surfaceToCell/surfaceToCell.C | 4 +- .../cellSources/surfaceToCell/surfaceToCell.H | 2 +- .../sets/faceSources/cellToFace/cellToFace.C | 4 +- .../pointSources/cellToPoint/cellToPoint.C | 2 +- .../pointSources/faceToPoint/faceToPoint.C | 2 +- .../surfaceToPoint/surfaceToPoint.C | 4 +- src/meshTools/sets/topoSets/cellSet.H | 2 +- src/meshTools/sets/topoSets/cellZoneSet.H | 2 +- src/meshTools/sets/topoSets/faceSet.C | 2 +- src/meshTools/sets/topoSets/faceSet.H | 2 +- src/meshTools/sets/topoSets/faceZoneSet.H | 2 +- src/meshTools/sets/topoSets/pointSet.H | 2 +- src/meshTools/sets/topoSets/pointZoneSet.H | 2 +- src/meshTools/sets/topoSets/topoSet.C | 10 +- src/meshTools/surfaceSets/surfaceSets.C | 14 +- src/meshTools/surfaceSets/surfaceSets.H | 4 +- .../intersectedSurface/intersectedSurface.H | 2 +- .../octreeData/octreeDataTriSurface.H | 2 +- .../surfaceLocation/surfaceLocation.H | 8 +- .../triSurfaceTools/geompack/geompack.H | 20 +-- .../triSurface/triangleFuncs/triangleFuncs.C | 2 +- .../twoDPointCorrector/twoDPointCorrector.H | 2 +- .../geomDecomp/geomDecomp.H | 2 +- .../manualDecomp/manualDecomp.C | 2 +- .../simpleGeomDecomp/simpleGeomDecomp.C | 26 ++-- .../simpleGeomDecomp/simpleGeomDecomp.H | 2 +- .../reconstruct/pointFieldReconstructor.C | 2 +- .../fixedInternalEnergyFvPatchScalarField.C | 4 +- .../gradientEnthalpyFvPatchScalarField.C | 4 +- .../mixedEnthalpyFvPatchScalarField.C | 2 +- .../laminarFlameSpeed/GuldersEGR/GuldersEGR.C | 2 +- .../fixedUnburntEnthalpyFvPatchScalarField.C | 4 +- ...radientUnburntEnthalpyFvPatchScalarField.C | 4 +- .../mixedUnburntEnthalpyFvPatchScalarField.C | 2 +- .../specie/atomicWeights/atomicWeights.C | 2 +- .../thirdBodyArrheniusReactionRateI.H | 4 +- .../interfaceCompression.H | 2 +- .../meshTriangulation/meshTriangulation.C | 8 +- .../meshTriangulation/meshTriangulation.H | 2 +- .../triSurface/interfaces/AC3D/readAC.C | 4 +- .../triSurface/interfaces/TRI/readTRI.C | 2 +- .../surfacePatch/surfacePatchIOList.C | 4 +- .../LES/LESdeltas/smoothDelta/smoothDelta.C | 2 +- .../smoothDelta/smoothDeltaDeltaDataI.H | 10 +- ...mperatureCoupledBaffleFvPatchScalarField.H | 4 +- ...tureCoupledBaffleMixedFvPatchScalarField.H | 6 +- 341 files changed, 780 insertions(+), 780 deletions(-) diff --git a/applications/solvers/combustion/PDRFoam/XiEqns b/applications/solvers/combustion/PDRFoam/XiEqns index bd5ca3066a..8de3bffe4b 100644 --- a/applications/solvers/combustion/PDRFoam/XiEqns +++ b/applications/solvers/combustion/PDRFoam/XiEqns @@ -22,7 +22,7 @@ volScalarField GEta = GEtaCoef/tauEta; volScalarField XiEqEta = 1.0 + XiCoef*sqrt(up/(Su + SuMin))*Reta; - volScalarField R = + volScalarField R = GEta*XiEqEta/(XiEqEta - 0.999) + GIn*XiIn/(XiIn - 0.999); volScalarField XiEqStar = R/(R - GEta - GIn); @@ -42,7 +42,7 @@ volScalarField GEta = GEtaCoef/tauEta; volScalarField XiEqEta = 1.0 + XiCoef*sqrt(up/(Su + SuMin))*Reta; - volScalarField R = + volScalarField R = GEta*XiEqEta/(XiEqEta - 0.999) + GIn*XiIn/(XiIn - 0.999); volScalarField XiEqStar = R/(R - GEta - GIn); diff --git a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C index 59fc746507..3ab7587431 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.C @@ -91,7 +91,7 @@ bool Foam::XiModels::algebraic::read(const dictionary& XiProperties) XiModel::read(XiProperties); XiModelCoeffs_.lookup("XiShapeCoef") >> XiShapeCoef; - + return true; } diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C index 9f42a4cc97..e98ff38adc 100644 --- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C +++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C @@ -117,7 +117,7 @@ inline Foam::scalar Foam::laminarFlameSpeedModels::SCOPE::polyPhi { scalar x = phi - 1.0; - return + return a[0] *( scalar(1) diff --git a/applications/solvers/combustion/PDRFoam/setDeltaT.H b/applications/solvers/combustion/PDRFoam/setDeltaT.H index c40bc4a1d7..4a4cc4e6bf 100644 --- a/applications/solvers/combustion/PDRFoam/setDeltaT.H +++ b/applications/solvers/combustion/PDRFoam/setDeltaT.H @@ -45,7 +45,7 @@ if (adjustTimeStep) maxDeltaT ) ); - + Info<< "deltaT = " << runTime.deltaTValue() << endl; } diff --git a/applications/solvers/compressible/rhoCentralFoam/Allwmake b/applications/solvers/compressible/rhoCentralFoam/Allwmake index 698558da0b..5f01d96a75 100755 --- a/applications/solvers/compressible/rhoCentralFoam/Allwmake +++ b/applications/solvers/compressible/rhoCentralFoam/Allwmake @@ -2,7 +2,7 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso BCs +wmake libso BCs wmake # ----------------------------------------------------------------- end-of-file diff --git a/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C b/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C index f06b13e5de..0375185a88 100644 --- a/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C +++ b/applications/solvers/compressible/rhoSonicFoam/rhoSonicFoam.C @@ -84,7 +84,7 @@ int main(int argc, char *argv[]) ( fvm::ddt(rhoU) + fvm::div(phiv, rhoU) - == + == - fvc::grad(p) ); diff --git a/applications/solvers/compressible/rhopSonicFoam/Allwmake b/applications/solvers/compressible/rhopSonicFoam/Allwmake index 698558da0b..5f01d96a75 100755 --- a/applications/solvers/compressible/rhopSonicFoam/Allwmake +++ b/applications/solvers/compressible/rhopSonicFoam/Allwmake @@ -2,7 +2,7 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso BCs +wmake libso BCs wmake # ----------------------------------------------------------------- end-of-file diff --git a/applications/solvers/compressible/rhopSonicFoam/BCs/p/inviscidWallPFvPatchScalarField.C b/applications/solvers/compressible/rhopSonicFoam/BCs/p/inviscidWallPFvPatchScalarField.C index 27fa4db29a..6acbe1b0ca 100644 --- a/applications/solvers/compressible/rhopSonicFoam/BCs/p/inviscidWallPFvPatchScalarField.C +++ b/applications/solvers/compressible/rhopSonicFoam/BCs/p/inviscidWallPFvPatchScalarField.C @@ -131,7 +131,7 @@ void inviscidWallPFvPatchScalarField::updateCoeffs() const fvPatchField& rhoUp = patch().lookupPatchField("rhoU"); - const fvsPatchField& phip = + const fvsPatchField& phip = patch().lookupPatchField("phi"); const fvsPatchField& rAp = @@ -147,7 +147,7 @@ void inviscidWallPFvPatchScalarField::updateCoeffs() void inviscidWallPFvPatchScalarField::write(Ostream& os) const { fixedGradientFvPatchScalarField::write(os); - os.writeKeyword("fluxFraction") + os.writeKeyword("fluxFraction") << fluxFraction_ << token::END_STATEMENT << nl; writeEntry("value", os); } diff --git a/applications/solvers/compressible/rhopSonicFoam/BCs/rhoE/mixedRhoEFvPatchScalarField.C b/applications/solvers/compressible/rhopSonicFoam/BCs/rhoE/mixedRhoEFvPatchScalarField.C index 8f63d984f5..b334d39c3a 100644 --- a/applications/solvers/compressible/rhopSonicFoam/BCs/rhoE/mixedRhoEFvPatchScalarField.C +++ b/applications/solvers/compressible/rhopSonicFoam/BCs/rhoE/mixedRhoEFvPatchScalarField.C @@ -145,7 +145,7 @@ void mixedRhoEFvPatchScalarField::updateCoeffs() const volScalarField& T = db().lookupObject("T"); const label patchi = patch().index(); - fvPatchScalarField& Tp = + fvPatchScalarField& Tp = const_cast(T.boundaryField()[patchi]); Tp.evaluate(); @@ -164,7 +164,7 @@ void mixedRhoEFvPatchScalarField::updateCoeffs() refGrad() = rhop*Cv.value()*Tp.snGrad() + ( - refValue() + refValue() - (0.5*rhop.patchInternalField()* magSqr(rhoUp.patchInternalField()/rhop.patchInternalField())) )*patch().deltaCoeffs(); diff --git a/applications/solvers/compressible/rhopSonicFoam/BCs/rhoU/fixedRhoUFvPatchVectorField.H b/applications/solvers/compressible/rhopSonicFoam/BCs/rhoU/fixedRhoUFvPatchVectorField.H index 091f9b6d58..1f3665b760 100644 --- a/applications/solvers/compressible/rhopSonicFoam/BCs/rhoU/fixedRhoUFvPatchVectorField.H +++ b/applications/solvers/compressible/rhopSonicFoam/BCs/rhoU/fixedRhoUFvPatchVectorField.H @@ -66,7 +66,7 @@ public: const dictionary& ); - //- Construct by mapping given fixedRhoUFvPatchVectorField + //- Construct by mapping given fixedRhoUFvPatchVectorField // onto a new patch fixedRhoUFvPatchVectorField ( diff --git a/applications/solvers/electromagnetics/electrostaticFoam/Make/files b/applications/solvers/electromagnetics/electrostaticFoam/Make/files index 073ad4cd76..d5cb4f1395 100644 --- a/applications/solvers/electromagnetics/electrostaticFoam/Make/files +++ b/applications/solvers/electromagnetics/electrostaticFoam/Make/files @@ -1,3 +1,3 @@ -electrostaticFoam.C +electrostaticFoam.C EXE = $(FOAM_APPBIN)/electrostaticFoam diff --git a/applications/solvers/incompressible/icoFoam/Make/files b/applications/solvers/incompressible/icoFoam/Make/files index 964e46e159..f1564ba482 100644 --- a/applications/solvers/incompressible/icoFoam/Make/files +++ b/applications/solvers/incompressible/icoFoam/Make/files @@ -1,3 +1,3 @@ -icoFoam.C +icoFoam.C EXE = $(FOAM_APPBIN)/icoFoam diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/Make/files b/applications/solvers/incompressible/nonNewtonianIcoFoam/Make/files index ad5215ffda..8b68719cc8 100644 --- a/applications/solvers/incompressible/nonNewtonianIcoFoam/Make/files +++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/Make/files @@ -1,3 +1,3 @@ -nonNewtonianIcoFoam.C +nonNewtonianIcoFoam.C EXE = $(FOAM_APPBIN)/nonNewtonianIcoFoam diff --git a/applications/solvers/incompressible/simpleFoam/Make/files b/applications/solvers/incompressible/simpleFoam/Make/files index 22ef538832..693d26fd80 100644 --- a/applications/solvers/incompressible/simpleFoam/Make/files +++ b/applications/solvers/incompressible/simpleFoam/Make/files @@ -1,3 +1,3 @@ -simpleFoam.C +simpleFoam.C EXE = $(FOAM_APPBIN)/simpleFoam diff --git a/applications/solvers/multiphase/bubbleFoam/UEqns.H b/applications/solvers/multiphase/bubbleFoam/UEqns.H index e692f9f5fe..64cc5db462 100644 --- a/applications/solvers/multiphase/bubbleFoam/UEqns.H +++ b/applications/solvers/multiphase/bubbleFoam/UEqns.H @@ -41,7 +41,7 @@ fvVectorMatrix UbEqn(Ub, Ub.dimensions()*dimVol/dimTime); - fvc::interpolate(nuEffb) *mesh.magSf()*fvc::snGrad(beta)/fvc::interpolate(beta + scalar(0.001)); - UbEqn = + UbEqn = ( (scalar(1) + Cvm*rhob*alpha/rhob)* ( diff --git a/applications/solvers/multiphase/cavitatingFoam/CourantNo.H b/applications/solvers/multiphase/cavitatingFoam/CourantNo.H index a9d43535ec..8e9e9cb00c 100644 --- a/applications/solvers/multiphase/cavitatingFoam/CourantNo.H +++ b/applications/solvers/multiphase/cavitatingFoam/CourantNo.H @@ -36,7 +36,7 @@ scalar acousticCoNum = 0.0; if (mesh.nInternalFaces()) { - surfaceScalarField SfUfbyDelta = + surfaceScalarField SfUfbyDelta = mesh.surfaceInterpolation::deltaCoeffs()*mag(phiv); CoNum = max(SfUfbyDelta/mesh.magSf()) diff --git a/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H b/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H index 6f1622510f..c5e93c7efb 100644 --- a/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H +++ b/applications/solvers/multiphase/cavitatingFoam/continuityErrs.H @@ -3,12 +3,12 @@ dimensionedScalar totalMass = fvc::domainIntegrate(rho); - scalar sumLocalContErr = + scalar sumLocalContErr = ( fvc::domainIntegrate(mag(rho - thermoRho))/totalMass ).value(); - scalar globalContErr = + scalar globalContErr = ( fvc::domainIntegrate(rho - thermoRho)/totalMass ).value(); diff --git a/applications/solvers/multiphase/cavitatingFoam/setDeltaT.H b/applications/solvers/multiphase/cavitatingFoam/setDeltaT.H index dd8f23464a..26f0b43108 100644 --- a/applications/solvers/multiphase/cavitatingFoam/setDeltaT.H +++ b/applications/solvers/multiphase/cavitatingFoam/setDeltaT.H @@ -47,7 +47,7 @@ if (adjustTimeStep) maxDeltaT ) ); - + Info<< "deltaT = " << runTime.deltaTValue() << endl; } diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C index c948063408..d975577dbc 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C @@ -63,7 +63,7 @@ Ostream& operator<< ) { os << tp.theta0_ << token::SPACE - << tp.uTheta_ << token::SPACE + << tp.uTheta_ << token::SPACE << tp.thetaA_ << token::SPACE << tp.thetaR_; diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C index 20beaa4da3..00e7deb644 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C @@ -28,7 +28,7 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::phase::phase +Foam::phase::phase ( const word& name, const dictionary& phaseDict, diff --git a/applications/solvers/multiphase/settlingFoam/correctViscosity.H b/applications/solvers/multiphase/settlingFoam/correctViscosity.H index 0c22a12ea2..ddc539dcdb 100644 --- a/applications/solvers/multiphase/settlingFoam/correctViscosity.H +++ b/applications/solvers/multiphase/settlingFoam/correctViscosity.H @@ -1,5 +1,5 @@ { - mul = muc + + mul = muc + plasticViscosity ( plasticViscosityCoeff, diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H b/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H index 93593196af..9f0417045b 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/UEqns.H @@ -56,7 +56,7 @@ fvVectorMatrix UbEqn(Ub, Ub.dimensions()*dimVol/dimTime); -fvc::interpolate(nuEffb)*mesh.magSf()*fvc::snGrad(beta) /fvc::interpolate(beta + scalar(0.001)); - UbEqn = + UbEqn = ( (scalar(1) + Cvm*rhob*alpha/rhob)* ( diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C index e5d27350b3..999dc887d8 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/conductivityModel/conductivityModel/newConductivityModel.C @@ -35,9 +35,9 @@ Foam::autoPtr Foam::conductivityModel::New { word conductivityModelType(dict.lookup("conductivityModel")); - Info<< "Selecting conductivityModel " + Info<< "Selecting conductivityModel " << conductivityModelType << endl; - + dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(conductivityModelType); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C index a7c65bc13f..174ff70a50 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C @@ -73,7 +73,7 @@ frictionalPressure ) const { - return + return Fr*pow(max(alpha - alphaMinFriction, scalar(0)), eta) /pow(max(alphaMax - alpha, scalar(5.0e-2)), p); } @@ -104,9 +104,9 @@ Foam::tmp Foam::JohnsonJacksonFrictionalStress::muf const dimensionedScalar& alphaMax, const volScalarField& pf, const volTensorField& D, - const dimensionedScalar& phi + const dimensionedScalar& phi ) const -{ +{ return dimensionedScalar("0.5", dimTime, 0.5)*pf*sin(phi); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C index fed001e0c0..7e542fc978 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/frictionalStressModel/frictionalStressModel/newFrictionalStressModel.C @@ -35,9 +35,9 @@ Foam::autoPtr Foam::frictionalStressModel::New { word frictionalStressModelType(dict.lookup("frictionalStressModel")); - Info<< "Selecting frictionalStressModel " + Info<< "Selecting frictionalStressModel " << frictionalStressModelType << endl; - + dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(frictionalStressModelType); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C index cda9814b46..e673544a9b 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/granularPressureModel/granularPressureModel/newGranularPressureModel.C @@ -35,9 +35,9 @@ Foam::autoPtr Foam::granularPressureModel::New { word granularPressureModelType(dict.lookup("granularPressureModel")); - Info<< "Selecting granularPressureModel " + Info<< "Selecting granularPressureModel " << granularPressureModelType << endl; - + dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(granularPressureModelType); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C index e2114f9baf..f7651d2279 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C @@ -65,7 +65,7 @@ Foam::tmp Foam::CarnahanStarlingRadial::g0 ) const { - return + return 1.0/(1.0 - alpha) + 3.0*alpha/(2.0*sqr(1.0 - alpha)) + sqr(alpha)/(2.0*pow(1.0 - alpha, 3)); @@ -78,8 +78,8 @@ Foam::tmp Foam::CarnahanStarlingRadial::g0prime const dimensionedScalar& alphaMax ) const { - return - - alpha/sqr(1.0 - alpha) + return + - alpha/sqr(1.0 - alpha) + (3.0*(1.0 - alpha) + 6.0*sqr(alpha))/(2.0*(1.0 - alpha)) + (2.0*alpha*(1.0 - alpha) + 3.0*pow(alpha, 3)) /(2.0*pow(1.0 - alpha, 4)); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C index d62a9c1c65..9ef25b9340 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/Gidaspow/GidaspowRadial.C @@ -74,7 +74,7 @@ Foam::tmp Foam::GidaspowRadial::g0prime const dimensionedScalar& alphaMax ) const { - return + return (-1.0/5.0)*pow(alpha/alphaMax, -2.0/3.0) /(alphaMax*sqr(1.0 - pow(alpha/alphaMax, 1.0/3.0))); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C index a600b350a8..f9f4a68c09 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C @@ -74,7 +74,7 @@ Foam::tmp Foam::SinclairJacksonRadial::g0prime const dimensionedScalar& alphaMax ) const { - return + return (-1.0/3.0)*pow(alpha/alphaMax, -2.0/3.0) /(alphaMax*sqr(1.0 - pow(alpha/alphaMax, 1.0/3.0))); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C index fc6b2ed5d9..72d7a1193d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/kineticTheoryModels/radialModel/radialModel/newRadialModel.C @@ -35,9 +35,9 @@ Foam::autoPtr Foam::radialModel::New { word radialModelType(dict.lookup("radialModel")); - Info<< "Selecting radialModel " + Info<< "Selecting radialModel " << radialModelType << endl; - + dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(radialModelType); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H index 57a25a299d..7645aeb204 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pEqn.H @@ -42,7 +42,7 @@ phib = (fvc::interpolate(Ub) & mesh.Sf()) + fvc::ddtPhiCorr(rUbA, Ub, phib) + phiDragb; - + phi = alphaf*phia + betaf*phib; surfaceScalarField Dp("(rho*(1|A(U)))", alphaf*rUaAf/rhoa + betaf*rUbAf/rhob); diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C index 515e638be4..92039de085 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/tractionDisplacement/tractionDisplacementFvPatchVectorField.C @@ -177,7 +177,7 @@ void tractionDisplacementFvPatchVectorField::updateCoeffs() gradient() = ( (traction_ + pressure_*n)/rho.value() - + twoMuLambda*fvPatchField::snGrad() - (n & sigmaD) + + twoMuLambda*fvPatchField::snGrad() - (n & sigmaD) )/twoMuLambda; Switch thermalStress(thermalProperties.lookup("thermalStress")); @@ -187,7 +187,7 @@ void tractionDisplacementFvPatchVectorField::updateCoeffs() dimensionedScalar alpha(thermalProperties.lookup("alpha")); dimensionedScalar threeKalpha = threeK*alpha; - const fvPatchField& T = + const fvPatchField& T = patch().lookupPatchField("T"); gradient() += n*threeKalpha.value()*T/twoMuLambda; diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C index 4c14b00cc6..70b8b76d39 100644 --- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C +++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C @@ -72,7 +72,7 @@ int main(int argc, char *argv[]) { volTensorField gradDcorr = fvc::grad(Dcorr); - sigmaExp = + sigmaExp = (lambda - mu)*gradDcorr + mu*gradDcorr.T() + (lambda*I)*tr(gradDcorr); diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C index d071ff7c78..3cec9205f5 100644 --- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C +++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/tractionDisplacementCorrection/tractionDisplacementCorrectionFvPatchVectorField.C @@ -171,7 +171,7 @@ void tractionDisplacementCorrectionFvPatchVectorField::updateCoeffs() const fvPatchField& sigmaD = patch().lookupPatchField("sigmaD"); - const fvPatchField& sigmaExp = + const fvPatchField& sigmaExp = patch().lookupPatchField("sigmaExp"); gradient() = diff --git a/applications/utilities/mesh/advanced/selectCells/edgeStats.H b/applications/utilities/mesh/advanced/selectCells/edgeStats.H index 6cba727557..f39b323468 100644 --- a/applications/utilities/mesh/advanced/selectCells/edgeStats.H +++ b/applications/utilities/mesh/advanced/selectCells/edgeStats.H @@ -67,7 +67,7 @@ class edgeStats //- If 2d get component of normal dir. direction getNormalDir(const twoDPointCorrector*) const; - + //- Disallow default bitwise copy construct edgeStats(const edgeStats&); diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/README.txt b/applications/utilities/mesh/conversion/fluentMeshToFoam/README.txt index 8089acb531..1dcfe05a8e 100644 --- a/applications/utilities/mesh/conversion/fluentMeshToFoam/README.txt +++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/README.txt @@ -2,35 +2,35 @@ Notes for fluentMeshToFoam with zone preservation ################################################# 1. New option added: - - writeSets: + - writeSets: Writes all Fluent boundaries faceSets preserving Fluent names Writes all Fluent regions to cellSets preserving Fluent names lines: 1375 - 1393 & 1673 - 1741 sets are useful for post-processing using foamToVTK with the "-faceSet " and "-cellSet " options. - - - writeZones: + + - writeZones: Writes all regions to cellZones preserving Fluent names - Writes all region internal face to faceZones preserving Fluent names + Writes all region internal face to faceZones preserving Fluent names lines: 1545 - 1667 Zones are usefull for porous media and MRF calculations 2. Zone Access - - Zones are simple lists of label lists that can be accessed from polyMesh + - Zones are simple lists of label lists that can be accessed from polyMesh with the cellZones(), faceZones() and pointZones() member functions - Example (Members from polyMesh.H and ZoneMesh.H): label thisCellZoneID = mesh.cellZones().findZoneID("thisZoneName"); const labelList& thisCellZone = mesh.cellZones()[thisCellZoneID]; - + - Zone integrity is preserved during mesh modification and decompomposition. - - - Once created via addZones, zones allow modification through non-const + + - Once created via addZones, zones allow modification through non-const access 3. Fluent boundary types. - All internal and baffle elements are ignored during conversion - + - Boundary faces labelled as internal (i.e. interior, interface, internal, solid, fan, radiator, porous-jump) but that are in fact external boundaries will be added to a default wall boundary. diff --git a/applications/utilities/mesh/conversion/gmshToFoam/Make/options b/applications/utilities/mesh/conversion/gmshToFoam/Make/options index b9b67515f1..7349856cab 100644 --- a/applications/utilities/mesh/conversion/gmshToFoam/Make/options +++ b/applications/utilities/mesh/conversion/gmshToFoam/Make/options @@ -4,4 +4,4 @@ EXE_INC = \ EXE_LIBS = \ -ldynamicMesh \ - -lmeshTools + -lmeshTools diff --git a/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C b/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C index dcd23aa5db..57c165431f 100644 --- a/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C +++ b/applications/utilities/mesh/conversion/sammToFoam/readBoundary.C @@ -188,7 +188,7 @@ void sammMesh::readBoundary() boundary_[patchLabel][nPatchFaces[patchLabel]] = face(pointLabels); } - + // increment counter of faces in current patch nPatchFaces[patchLabel]++; } diff --git a/applications/utilities/mesh/conversion/starToFoam/readBoundary.C b/applications/utilities/mesh/conversion/starToFoam/readBoundary.C index 7bc9274247..8bb7852d10 100644 --- a/applications/utilities/mesh/conversion/starToFoam/readBoundary.C +++ b/applications/utilities/mesh/conversion/starToFoam/readBoundary.C @@ -186,7 +186,7 @@ void starMesh::readBoundary() boundary_[patchLabel][nPatchFaces[patchLabel]] = face(pointLabels); } - + // increment counter of faces in current patch nPatchFaces[patchLabel]++; } diff --git a/applications/utilities/mesh/conversion/starToFoam/readPoints.C b/applications/utilities/mesh/conversion/starToFoam/readPoints.C index fa59848b8a..e2206bd4e5 100644 --- a/applications/utilities/mesh/conversion/starToFoam/readPoints.C +++ b/applications/utilities/mesh/conversion/starToFoam/readPoints.C @@ -95,7 +95,7 @@ void starMesh::readPoints(const scalar scaleFactor) pointLabel = readVtxLabel(pointsFile); if (!pointsFile) break; - + maxLabel = max(maxLabel, pointLabel); x = readVtxCmpt(pointsFile); diff --git a/applications/utilities/mesh/conversion/writeMeshObj/Make/options b/applications/utilities/mesh/conversion/writeMeshObj/Make/options index 0cd3a75c53..54c035b8f5 100644 --- a/applications/utilities/mesh/conversion/writeMeshObj/Make/options +++ b/applications/utilities/mesh/conversion/writeMeshObj/Make/options @@ -2,4 +2,4 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lmeshTools + -lmeshTools diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.C b/applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.C index 16bab41094..11445c28b1 100644 --- a/applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.C +++ b/applications/utilities/mesh/generation/extrudeMesh/extrudedMesh/extrudedMesh.C @@ -95,7 +95,7 @@ Foam::Xfer Foam::extrudedMesh::extrudedFaces const label nLayers = model.nLayers(); - label nFaces = + label nFaces = (nLayers + 1)*surfaceFaces.size() + nLayers*surfaceEdges.size(); faceList eFaces(nFaces); diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C index 727d21c061..7fcf53e935 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C +++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C @@ -192,7 +192,7 @@ int main(int argc, char *argv[]) autoRefineDriver::debug = debug; autoSnapDriver::debug = debug; autoLayerDriver::debug = debug; - } + } // Read geometry diff --git a/applications/utilities/mesh/manipulation/checkMesh/printMeshStats.C b/applications/utilities/mesh/manipulation/checkMesh/printMeshStats.C index 462d1531f8..2179e67b0c 100644 --- a/applications/utilities/mesh/manipulation/checkMesh/printMeshStats.C +++ b/applications/utilities/mesh/manipulation/checkMesh/printMeshStats.C @@ -129,7 +129,7 @@ void Foam::printMeshStats(const polyMesh& mesh, const bool allTopology) } reduce(nHex,sumOp