From 99c000fc946a6293a4f8e4deafb0acf8a45e1efa Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Mon, 29 Feb 2016 15:42:03 +0000 Subject: [PATCH] Rationalized the indentation of C-preprocessor directives --- .../interfaceCompositionModels/Henry/Henry.H | 4 +- .../InterfaceCompositionModel.H | 2 +- .../NonRandomTwoLiquid/NonRandomTwoLiquid.H | 4 +- .../Raoult/Raoult.H | 2 +- .../Saturated/Saturated.H | 4 +- .../HeatAndMassTransferPhaseSystem.H | 2 +- .../HeatTransferPhaseSystem.H | 2 +- ...terfaceCompositionPhaseChangePhaseSystem.H | 4 +- .../MomentumTransferPhaseSystem.H | 2 +- .../ThermalPhaseChangePhaseSystem.H | 4 +- .../AnisothermalPhaseModel.H | 4 +- .../InertPhaseModel/InertPhaseModel.H | 4 +- .../IsothermalPhaseModel.H | 4 +- .../MovingPhaseModel/MovingPhaseModel.H | 4 +- .../MultiComponentPhaseModel.H | 4 +- .../PurePhaseModel/PurePhaseModel.H | 4 +- .../ReactingPhaseModel/ReactingPhaseModel.H | 4 +- .../ThermoPhaseModel/ThermoPhaseModel.H | 4 +- .../phaseSystems/phaseSystem/phaseSystem.H | 2 +- .../test/HashingSpeed/Test-HashingSpeed.C | 18 +- .../star3ToFoam/createCoupleMatches.C | 188 +++++++++--------- .../star3ToFoam/mergeCoupleFacePoints.C | 22 +- .../mesh/manipulation/setSet/setSet.C | 12 +- .../mesh/manipulation/setSet/writeFuns.C | 14 +- .../dataConversion/foamToVTK/writeFuns.C | 32 +-- .../USERD_get_part_elements_by_type.H | 8 +- etc/codeTemplates/BC/BC.H | 2 +- .../template/_TemplateTemplate.H | 2 +- src/OSspecific/POSIX/POSIX.C | 14 +- src/OSspecific/POSIX/fileMonitor.C | 18 +- .../dynamicIndexedOctree.H | 2 +- .../algorithms/indexedOctree/indexedOctree.H | 2 +- .../algorithms/indexedOctree/labelBits.H | 6 +- src/OpenFOAM/db/Callback/Callback.H | 4 +- .../db/CallbackRegistry/CallbackRegistry.H | 4 +- .../IOobjects/CompactIOField/CompactIOField.H | 2 +- .../IOobjects/CompactIOList/CompactIOList.H | 2 +- src/OpenFOAM/db/IOobjects/IOField/IOField.H | 2 +- src/OpenFOAM/db/IOobjects/IOList/IOList.H | 2 +- src/OpenFOAM/db/IOobjects/IOMap/IOMap.H | 2 +- .../db/IOobjects/IOPtrList/IOPtrList.H | 2 +- src/OpenFOAM/db/IOstreams/IOstreams/Istream.H | 4 +- src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H | 10 +- src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.H | 4 +- src/OpenFOAM/db/dictionary/dictionary.H | 2 +- .../primitiveEntry/primitiveEntry.H | 2 +- .../dlLibraryTable/dlLibraryTable.H | 4 +- .../IOOutputFilter/IOOutputFilter.H | 4 +- .../OutputFilterFunctionObject.H | 4 +- .../db/objectRegistry/objectRegistry.H | 4 +- src/OpenFOAM/db/typeInfo/className.H | 4 +- .../dimensionedType/dimensionedType.H | 2 +- .../DimensionedField/DimensionedField.H | 2 +- .../DimensionedScalarField.H | 2 +- .../DimensionedSphericalTensorField.H | 4 +- .../DimensionedSymmTensorField.H | 4 +- .../DimensionedTensorField.H | 4 +- .../FieldFields/FieldField/FieldField.C | 2 +- .../FieldFields/FieldField/FieldField.H | 2 +- .../FieldFields/oneFieldField/oneFieldField.H | 4 +- .../scalarFieldField/scalarFieldField.H | 2 +- .../sphericalTensorFieldField.H | 4 +- .../symmTensorFieldField.H | 4 +- .../tensorFieldField/tensorFieldField.H | 4 +- .../transformFieldField/transformFieldField.H | 2 +- .../zeroFieldField/zeroFieldField.H | 4 +- .../fields/Fields/DynamicField/DynamicField.H | 2 +- src/OpenFOAM/fields/Fields/Field/Field.H | 2 +- .../fields/Fields/oneField/oneField.H | 4 +- .../symmTransformField/symmTransformField.H | 2 +- .../Fields/transformField/transformField.H | 2 +- .../Fields/transformList/transformList.H | 4 +- .../GeometricField/GeometricField.H | 2 +- .../GeometricField/uniformInterpolate.H | 2 +- .../GeometricScalarField.H | 2 +- .../GeometricSphericalTensorField.H | 4 +- .../GeometricSymmTensorField.H | 4 +- .../GeometricTensorField.H | 4 +- .../SlicedGeometricField.H | 2 +- .../geometricOneField/geometricOneField.H | 4 +- .../geometricZeroField/geometricZeroField.H | 4 +- .../transformGeometricField.H | 2 +- src/OpenFOAM/fields/ReadFields/ReadFields.H | 4 +- .../UniformDimensionedField.H | 4 +- .../basicSymmetryPointPatchField.H | 2 +- .../calculated/calculatedPointPatchField.H | 2 +- .../basic/coupled/coupledPointPatchField.H | 2 +- .../fixedValue/fixedValuePointPatchField.H | 2 +- .../basic/value/valuePointPatchField.H | 2 +- .../zeroGradientPointPatchField.H | 2 +- .../constraint/cyclic/cyclicPointPatchField.H | 2 +- .../cyclicSlip/cyclicSlipPointPatchField.H | 2 +- .../constraint/empty/emptyPointPatchField.H | 2 +- ...nonuniformTransformCyclicPointPatchField.H | 2 +- .../processor/processorPointPatchField.H | 2 +- .../processorCyclicPointPatchField.H | 2 +- .../symmetry/symmetryPointPatchField.H | 2 +- .../symmetryPlanePointPatchField.H | 2 +- .../constraint/wedge/wedgePointPatchField.H | 2 +- .../codedFixedValuePointPatchField.H | 2 +- .../fixedNormalSlipPointPatchField.H | 2 +- .../derived/slip/slipPointPatchField.H | 2 +- ...eVaryingUniformFixedValuePointPatchField.H | 2 +- .../uniformFixedValuePointPatchField.H | 2 +- .../pointPatchField/pointPatchField.H | 4 +- src/OpenFOAM/global/debug/defineDebugSwitch.H | 4 +- .../interpolatePointToCell.H | 4 +- .../interpolateSplineXY/interpolateSplineXY.H | 4 +- .../interpolateXY/interpolateXY.H | 4 +- .../interpolation2DTable.H | 2 +- .../interpolationLookUpTable.H | 4 +- .../interpolationTable/interpolationTable.H | 2 +- .../tableReaders/csv/csvTableReader.H | 2 +- .../openFoam/openFoamTableReader.H | 2 +- .../tableReaders/tableReader.H | 2 +- .../interpolationWeights.H | 4 +- .../PatchToPatchInterpolation.C | 6 +- .../PatchToPatchInterpolation.H | 2 +- .../PrimitivePatchInterpolation.H | 2 +- .../matrices/DiagonalMatrix/DiagonalMatrix.H | 4 +- .../matrices/LUscalarMatrix/LUscalarMatrix.H | 4 +- .../LduInterfaceField/LduInterfaceField.H | 4 +- .../matrices/LduMatrix/LduMatrix/LduMatrix.H | 4 +- .../LduMatrix/LduMatrix/SolverPerformance.H | 2 +- .../DILUPreconditioner/TDILUPreconditioner.H | 4 +- .../DiagonalPreconditioner.H | 4 +- .../NoPreconditioner/NoPreconditioner.H | 4 +- .../GaussSeidel/TGaussSeidelSmoother.H | 4 +- .../Solvers/DiagonalSolver/DiagonalSolver.H | 4 +- .../LduMatrix/Solvers/PBiCCCG/PBiCCCG.H | 4 +- .../LduMatrix/Solvers/PBiCICG/PBiCICG.H | 4 +- .../matrices/LduMatrix/Solvers/PCICG/PCICG.H | 4 +- .../Solvers/SmoothSolver/SmoothSolver.H | 4 +- src/OpenFOAM/matrices/Matrix/Matrix.H | 4 +- src/OpenFOAM/matrices/Matrix/MatrixI.H | 8 +- .../matrices/SquareMatrix/SquareMatrix.H | 4 +- .../SymmetricSquareMatrix.H | 4 +- .../lduInterface/processorLduInterface.H | 2 +- .../matrices/lduMatrix/lduMatrix/lduMatrix.H | 2 +- .../GAMGAgglomeration/GAMGAgglomeration.H | 4 +- .../interfaces/GAMGInterface/GAMGInterface.H | 2 +- .../matrices/scalarMatrices/scalarMatrices.H | 4 +- .../matrices/simpleMatrix/simpleMatrix.H | 4 +- src/OpenFOAM/matrices/solution/solution.H | 4 +- src/OpenFOAM/meshes/MeshObject/MeshObject.H | 4 +- .../ProcessorTopology/ProcessorTopology.H | 4 +- src/OpenFOAM/meshes/boundBox/boundBox.H | 4 +- src/OpenFOAM/meshes/data/data.H | 4 +- src/OpenFOAM/meshes/lduMesh/lduMesh.H | 4 +- .../meshes/lduMesh/lduPrimitiveMesh.H | 2 +- src/OpenFOAM/meshes/meshShapes/face/face.H | 4 +- .../meshes/meshShapes/tetCell/tetCellI.H | 18 +- .../meshes/meshShapes/triFace/triFace.H | 4 +- src/OpenFOAM/meshes/meshTools/mergePoints.H | 4 +- .../polyMesh/globalMeshData/globalIndex.H | 4 +- .../polyMesh/globalMeshData/globalMeshData.H | 2 +- .../mapPolyMesh/mapDistribute/mapDistribute.H | 2 +- .../meshes/polyMesh/syncTools/syncTools.H | 4 +- .../meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H | 4 +- .../primitiveMesh/PatchTools/PatchTools.H | 4 +- .../PrimitivePatch/PrimitivePatch.H | 2 +- .../primitiveShapes/tetrahedron/tetrahedron.H | 4 +- .../meshes/treeBoundBox/treeBoundBox.H | 4 +- .../primitives/VectorSpace/VectorSpace.H | 4 +- .../primitives/VectorSpace/VectorSpaceI.H | 26 +-- .../primitives/functions/Function1/CSV/CSV.H | 2 +- .../functions/Function1/Constant/Constant.H | 4 +- .../functions/Function1/Function1/Function1.H | 4 +- .../PolynomialEntry/PolynomialEntry.H | 2 +- .../functions/Function1/Sine/Sine.H | 2 +- .../functions/Function1/Square/Square.H | 2 +- .../functions/Function1/Table/Table.H | 2 +- .../functions/Function1/Table/TableBase.H | 2 +- .../functions/Function1/TableFile/TableFile.H | 2 +- .../functions/Polynomial/Polynomial.H | 6 +- .../functions/TimeFunction1/TimeFunction1.H | 2 +- .../globalIndexAndTransformI.H | 4 +- .../vectorTensorTransform.H | 2 +- .../primitives/hashes/Hasher/Hasher.C | 12 +- src/OpenFOAM/primitives/hashes/SHA1/SHA1.C | 46 ++--- .../random/cachedRandom/cachedRandom.H | 4 +- .../primitives/strings/lists/stringListOps.H | 4 +- .../primitives/subModelBase/subModelBase.H | 4 +- src/OpenFOAM/primitives/zero/zero.H | 4 +- src/Pstream/mpi/UPstream.C | 14 +- src/Pstream/mpi/allReduce.H | 4 +- .../CompressibleTurbulenceModel.H | 4 +- .../EddyDiffusivity/EddyDiffusivity.H | 4 +- .../RAS/buoyantKEpsilon/buoyantKEpsilon.H | 2 +- .../ThermalDiffusivity/ThermalDiffusivity.H | 4 +- .../thermalBaffle1DFvPatchScalarField.H | 4 +- .../turbulentFluidThermoModel.H | 2 +- .../IncompressibleTurbulenceModel.H | 4 +- .../turbulentTransportModel.H | 4 +- .../phaseCompressible/LES/Niceno/NicenoKEqn.H | 2 +- .../LES/SmagorinskyZhang/SmagorinskyZhang.H | 2 +- .../LES/continuousGasKEqn/continuousGasKEqn.H | 2 +- .../PhaseCompressibleTurbulenceModel.H | 4 +- .../RAS/LaheyKEpsilon/LaheyKEpsilon.H | 2 +- .../continuousGasKEpsilon.H | 2 +- .../RAS/mixtureKEpsilon/mixtureKEpsilon.H | 2 +- .../PhaseIncompressibleTurbulenceModel.H | 4 +- .../DeardorffDiffStress/DeardorffDiffStress.H | 2 +- .../turbulenceModels/LES/LESModel/LESModel.H | 4 +- .../LES/LESeddyViscosity/LESeddyViscosity.H | 2 +- .../LES/Smagorinsky/Smagorinsky.H | 2 +- .../SpalartAllmarasDDES/SpalartAllmarasDDES.H | 2 +- .../SpalartAllmarasDES/SpalartAllmarasDES.H | 2 +- .../SpalartAllmarasIDDES.H | 2 +- .../turbulenceModels/LES/WALE/WALE.H | 2 +- .../LES/dynamicKEqn/dynamicKEqn.H | 2 +- .../LES/dynamicLagrangian/dynamicLagrangian.H | 2 +- .../turbulenceModels/LES/kEqn/kEqn.H | 2 +- .../turbulenceModels/RAS/LRR/LRR.H | 2 +- .../RAS/LaunderSharmaKE/LaunderSharmaKE.H | 2 +- .../turbulenceModels/RAS/RASModel/RASModel.H | 4 +- .../RAS/RNGkEpsilon/RNGkEpsilon.H | 2 +- .../turbulenceModels/RAS/SSG/SSG.H | 2 +- .../RAS/SpalartAllmaras/SpalartAllmaras.H | 2 +- .../turbulenceModels/RAS/kEpsilon/kEpsilon.H | 2 +- .../turbulenceModels/RAS/kOmega/kOmega.H | 2 +- .../RAS/kOmegaSST/kOmegaSST.H | 2 +- .../RAS/kOmegaSSTSAS/kOmegaSSTSAS.H | 2 +- .../RAS/realizableKE/realizableKE.H | 2 +- .../turbulenceModels/RAS/v2f/v2f.H | 2 +- .../ReynoldsStress/ReynoldsStress.H | 4 +- .../TurbulenceModel/TurbulenceModel.H | 4 +- .../kqRWallFunctionFvPatchField.H | 2 +- .../eddyViscosity/eddyViscosity.H | 4 +- .../turbulenceModels/laminar/laminar.H | 4 +- .../linearViscousStress/linearViscousStress.H | 4 +- .../nonlinearEddyViscosity.H | 4 +- src/combustionModels/FSD/FSD.H | 4 +- src/combustionModels/PaSR/PaSR.H | 4 +- src/combustionModels/diffusion/diffusion.H | 4 +- .../infinitelyFastChemistry.H | 4 +- src/combustionModels/laminar/laminar.H | 4 +- .../noCombustion/noCombustion.H | 4 +- .../singleStepCombustion.H | 4 +- src/conversion/ensight/part/ensightPart.H | 4 +- src/conversion/ensight/part/ensightParts.H | 4 +- src/dynamicMesh/fvMeshAdder/fvMeshAdder.H | 4 +- .../fvMeshDistribute/fvMeshDistribute.H | 2 +- src/dynamicMesh/fvMeshTools/fvMeshTools.H | 4 +- .../motionSmoother/motionSmootherAlgo.H | 2 +- .../polyMeshAdder/faceCoupleInfo.H | 2 +- .../polyMeshFilter/polyMeshFilter.H | 4 +- .../polyTopoChange/polyTopoChange.H | 2 +- src/dynamicMesh/setUpdater/setUpdater.H | 4 +- .../extendedEdgeMesh/extendedEdgeMesh.H | 2 +- .../sampledSetWriters/csv/csvSetWriter.H | 2 +- .../ensight/ensightSetWriter.H | 2 +- .../gnuplot/gnuplotSetWriter.H | 2 +- .../sampledSetWriters/jplot/jplotSetWriter.H | 2 +- .../sampledSetWriters/raw/rawSetWriter.H | 2 +- .../sampledSetWriters/vtk/vtkSetWriter.H | 2 +- src/fileFormats/sampledSetWriters/writer.H | 2 +- .../xmgrace/xmgraceSetWriter.H | 2 +- src/fileFormats/vtk/vtkUnstructuredReader.H | 4 +- .../cfdTools/general/CorrectPhi/CorrectPhi.H | 4 +- .../cfdTools/general/MRF/MRFZone.H | 2 +- .../constrainPressure/constrainPressure.H | 2 +- .../movingMeshRhoUContinuityErrs.H | 4 +- .../basicSymmetry/basicSymmetryFvPatchField.H | 2 +- .../basic/calculated/calculatedFvPatchField.H | 2 +- .../basic/coupled/coupledFvPatchField.H | 2 +- .../directionMixedFvPatchField.H | 2 +- .../extrapolatedCalculatedFvPatchField.H | 2 +- .../fixedGradient/fixedGradientFvPatchField.H | 2 +- .../basic/fixedValue/fixedValueFvPatchField.H | 2 +- .../basic/mixed/mixedFvPatchField.H | 2 +- .../basic/sliced/slicedFvPatchField.H | 2 +- .../basic/transform/transformFvPatchField.H | 2 +- .../zeroGradient/zeroGradientFvPatchField.H | 2 +- .../constraint/cyclic/cyclicFvPatchField.H | 2 +- .../cyclicACMI/cyclicACMIFvPatchField.H | 2 +- .../cyclicAMI/cyclicAMIFvPatchField.H | 2 +- .../cyclicSlip/cyclicSlipFvPatchField.H | 2 +- .../constraint/empty/emptyFvPatchField.H | 2 +- .../jumpCyclic/jumpCyclicFvPatchField.H | 2 +- .../jumpCyclicAMI/jumpCyclicAMIFvPatchField.H | 2 +- .../nonuniformTransformCyclicFvPatchField.H | 2 +- .../processor/processorFvPatchField.H | 2 +- .../processorCyclicFvPatchField.H | 2 +- .../symmetry/symmetryFvPatchField.H | 2 +- .../symmetryPlane/symmetryPlaneFvPatchField.H | 2 +- .../constraint/wedge/wedgeFvPatchField.H | 2 +- .../derived/advective/advectiveFvPatchField.H | 2 +- .../codedFixedValueFvPatchField.H | 2 +- .../codedMixed/codedMixedFvPatchField.H | 2 +- .../externalCoupledMixedFvPatchField.H | 2 +- .../derived/fan/fanFvPatchField.H | 2 +- .../fixedInternalValueFvPatchField.H | 2 +- .../derived/fixedJump/fixedJumpFvPatchField.H | 2 +- .../fixedJumpAMI/fixedJumpAMIFvPatchField.H | 2 +- .../derived/fixedMean/fixedMeanFvPatchField.H | 2 +- .../fixedNormalSlipFvPatchField.H | 2 +- .../fixedProfile/fixedProfileFvPatchField.H | 2 +- .../freestream/freestreamFvPatchField.H | 2 +- .../inletOutlet/inletOutletFvPatchField.H | 2 +- .../mappedField/mappedFieldFvPatchField.H | 2 +- .../mappedField/mappedPatchFieldBase.H | 2 +- .../mappedFixedInternalValueFvPatchField.H | 2 +- ...ppedFixedPushedInternalValueFvPatchField.H | 2 +- .../mappedFixedValueFvPatchField.H | 2 +- .../outletInlet/outletInletFvPatchField.H | 2 +- .../outletMappedUniformInletFvPatchField.H | 2 +- .../partialSlip/partialSlipFvPatchField.H | 2 +- .../derived/slip/slipFvPatchField.H | 2 +- .../AverageIOField.H | 4 +- .../timeVaryingMappedFixedValueFvPatchField.H | 2 +- .../turbulentInletFvPatchField.H | 2 +- .../uniformFixedGradientFvPatchField.H | 2 +- .../uniformFixedValueFvPatchField.H | 2 +- .../uniformInletOutletFvPatchField.H | 2 +- .../uniformJump/uniformJumpFvPatchField.H | 2 +- .../uniformJumpAMIFvPatchField.H | 2 +- .../waveTransmissiveFvPatchField.H | 2 +- .../fvPatchFields/fvPatchField/fvPatchField.C | 2 +- .../fvPatchFields/fvPatchField/fvPatchField.H | 4 +- .../calculated/calculatedFvsPatchField.H | 2 +- .../basic/coupled/coupledFvsPatchField.H | 2 +- .../fixedValue/fixedValueFvsPatchField.H | 2 +- .../basic/sliced/slicedFvsPatchField.H | 2 +- .../constraint/cyclic/cyclicFvsPatchField.H | 2 +- .../cyclicACMI/cyclicACMIFvsPatchField.H | 2 +- .../cyclicAMI/cyclicAMIFvsPatchField.H | 2 +- .../cyclicSlip/cyclicSlipFvsPatchField.H | 2 +- .../constraint/empty/emptyFvsPatchField.H | 2 +- .../nonuniformTransformCyclicFvsPatchField.H | 2 +- .../processor/processorFvsPatchField.H | 2 +- .../processorCyclicFvsPatchField.H | 2 +- .../symmetry/symmetryFvsPatchField.H | 2 +- .../symmetryPlaneFvsPatchField.H | 2 +- .../constraint/wedge/wedgeFvsPatchField.H | 2 +- .../fvsPatchField/fvsPatchField.H | 4 +- .../boundedConvectionScheme.H | 2 +- .../convectionScheme/convectionScheme.H | 2 +- .../gaussConvectionScheme.H | 2 +- .../multivariateGaussConvectionScheme.H | 2 +- .../EulerD2dt2Scheme/EulerD2dt2Scheme.H | 2 +- .../d2dt2Schemes/d2dt2Scheme/d2dt2Scheme.H | 2 +- .../steadyStateD2dt2Scheme.H | 2 +- .../CoEulerDdtScheme/CoEulerDdtScheme.H | 2 +- .../CrankNicolsonDdtScheme.H | 2 +- .../EulerDdtScheme/EulerDdtScheme.H | 2 +- .../ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H | 2 +- .../backwardDdtScheme/backwardDdtScheme.H | 2 +- .../boundedDdtScheme/boundedDdtScheme.H | 2 +- .../ddtSchemes/ddtScheme/ddtScheme.H | 2 +- .../localEulerDdtScheme/localEulerDdtScheme.H | 2 +- .../steadyStateDdtScheme.H | 2 +- .../divSchemes/divScheme/divScheme.H | 2 +- .../gaussDivScheme/gaussDivScheme.H | 4 +- .../finiteVolume/fvc/fvcAverage.H | 2 +- .../finiteVolume/fvc/fvcCellReduce.H | 2 +- src/finiteVolume/finiteVolume/fvc/fvcCurl.H | 2 +- src/finiteVolume/finiteVolume/fvc/fvcD2dt2.H | 2 +- src/finiteVolume/finiteVolume/fvc/fvcDDt.H | 2 +- src/finiteVolume/finiteVolume/fvc/fvcDdt.H | 2 +- src/finiteVolume/finiteVolume/fvc/fvcDiv.H | 2 +- src/finiteVolume/finiteVolume/fvc/fvcFlux.H | 2 +- src/finiteVolume/finiteVolume/fvc/fvcGrad.H | 2 +- .../finiteVolume/fvc/fvcLaplacian.H | 2 +- .../finiteVolume/fvc/fvcMagSqrGradGrad.H | 2 +- .../finiteVolume/fvc/fvcReconstruct.H | 2 +- src/finiteVolume/finiteVolume/fvc/fvcSnGrad.H | 2 +- src/finiteVolume/finiteVolume/fvc/fvcSup.H | 2 +- .../finiteVolume/fvc/fvcSurfaceIntegrate.H | 2 +- .../finiteVolume/fvc/fvcVolumeIntegrate.H | 2 +- src/finiteVolume/finiteVolume/fvm/fvmD2dt2.H | 2 +- src/finiteVolume/finiteVolume/fvm/fvmDdt.H | 2 +- src/finiteVolume/finiteVolume/fvm/fvmDiv.H | 2 +- .../finiteVolume/fvm/fvmLaplacian.H | 2 +- src/finiteVolume/finiteVolume/fvm/fvmSup.H | 2 +- .../LeastSquaresGrad/LeastSquaresGrad.H | 2 +- .../LeastSquaresGrad/LeastSquaresVectors.H | 2 +- .../gradSchemes/fourthGrad/fourthGrad.H | 4 +- .../gradSchemes/gaussGrad/gaussGrad.H | 2 +- .../gradSchemes/gradScheme/gradScheme.H | 2 +- .../leastSquaresGrad/leastSquaresGrad.H | 4 +- .../gaussLaplacianScheme.H | 2 +- .../laplacianScheme/laplacianScheme.H | 2 +- .../CentredFitSnGrad/CentredFitSnGradData.H | 4 +- .../correctedSnGrad/correctedSnGrad.H | 2 +- .../faceCorrectedSnGrad/faceCorrectedSnGrad.H | 2 +- .../limitedSnGrad/limitedSnGrad.H | 2 +- .../orthogonalSnGrad/orthogonalSnGrad.H | 2 +- .../snGradSchemes/snGradScheme/snGradScheme.H | 2 +- .../uncorrectedSnGrad/uncorrectedSnGrad.H | 2 +- .../fvMatrices/fvMatrix/fvMatrix.H | 2 +- .../fvMatrices/solvers/MULES/CMULES.H | 4 +- .../fvMatrices/solvers/MULES/IMULES.H | 4 +- .../fvMatrices/solvers/MULES/MULES.H | 4 +- .../cellToCell/extendedCellToCellStencil.H | 2 +- .../cellToFace/extendedCellToFaceStencil.H | 2 +- .../extendedUpwindCellToFaceStencil.H | 2 +- .../faceToCell/extendedFaceToCellStencil.H | 2 +- src/finiteVolume/fvMesh/fvMesh.H | 4 +- .../fvMesh/fvMeshSubset/fvMeshSubset.H | 2 +- .../fvMesh/fvPatches/fvPatch/fvPatch.H | 2 +- .../singleCellFvMesh/singleCellFvMesh.H | 2 +- .../meshWave/wallDistData/wallDistData.H | 4 +- .../patchDistMethod/patchDistMethod.H | 4 +- .../interpolation/interpolation.H | 2 +- .../interpolationCell/interpolationCell.H | 4 +- .../interpolationCellPatchConstrained.H | 4 +- .../interpolationCellPoint.H | 4 +- .../interpolationCellPointFace.H | 4 +- .../interpolationCellPointWallModified.H | 4 +- .../interpolationPointMVC.H | 4 +- .../limitedSchemes/LimitedScheme/LimitFuncs.H | 2 +- .../LimitedScheme/LimitedScheme.H | 2 +- .../limitedSchemes/PhiScheme/PhiScheme.H | 2 +- .../limitedSurfaceInterpolationScheme.H | 2 +- .../multivariateIndependentScheme.H | 2 +- .../multivariateScheme/multivariateScheme.H | 2 +- .../multivariateSelectionScheme.H | 2 +- .../multivariateSurfaceInterpolationScheme.H | 2 +- .../schemes/CentredFitScheme/CentredFitData.H | 4 +- .../schemes/FitData/FitData.H | 4 +- .../schemes/UpwindFitScheme/UpwindFitData.H | 4 +- .../surfaceInterpolation/surfaceInterpolate.H | 2 +- .../surfaceInterpolationScheme.H | 2 +- .../volPointInterpolation/pointConstraints.H | 4 +- .../volPointInterpolation.H | 2 +- .../MGridGenGAMGAgglomeration.H | 4 +- .../pairPatchAgglomeration.H | 4 +- .../fvMotionSolverCore/fvMotionSolverCore.H | 4 +- .../cellMotion/cellMotionFvPatchField.H | 2 +- ...meVaryingMappedFixedValuePointPatchField.H | 2 +- .../explicitSetValue/ExplicitSetValue.H | 6 +- .../actuationDiskSource/actuationDiskSource.H | 4 +- .../radialActuationDiskSource.H | 4 +- .../sources/general/codedSource/CodedSource.H | 6 +- .../semiImplicitSource/SemiImplicitSource.H | 4 +- .../genericFvPatchField/genericFvPatchField.H | 2 +- .../genericPointPatchField.H | 2 +- .../clouds/Templates/DSMCCloud/DSMCCloud.H | 2 +- .../BinaryCollisionModel.H | 2 +- .../LarsenBorgnakkeVariableHardSphere.H | 4 +- .../NoBinaryCollision/NoBinaryCollision.H | 4 +- .../VariableHardSphere/VariableHardSphere.H | 4 +- .../FreeStream/FreeStream.H | 2 +- .../InflowBoundaryModel/InflowBoundaryModel.H | 2 +- .../InflowBoundaryModel/NoInflow/NoInflow.H | 4 +- .../MaxwellianThermal/MaxwellianThermal.H | 4 +- .../MixedDiffuseSpecular.H | 4 +- .../SpecularReflection/SpecularReflection.H | 4 +- .../WallInteractionModel.H | 2 +- src/lagrangian/basic/Cloud/Cloud.H | 4 +- src/lagrangian/basic/IOPosition/IOPosition.H | 4 +- .../basic/InteractionLists/InteractionLists.H | 2 +- src/lagrangian/basic/particle/particle.H | 2 +- .../IntegrationScheme/Analytical/Analytical.H | 2 +- .../IntegrationScheme/Euler/Euler.H | 2 +- .../IntegrationScheme/IntegrationScheme.H | 2 +- .../Templates/CollidingCloud/CollidingCloud.H | 2 +- .../Templates/KinematicCloud/KinematicCloud.H | 2 +- .../clouds/Templates/MPPICCloud/MPPICCloud.H | 2 +- .../Templates/ReactingCloud/ReactingCloud.H | 2 +- .../ReactingMultiphaseCloud.H | 2 +- .../Templates/ThermoCloud/ThermoCloud.H | 2 +- .../CollisionRecordList/CollisionRecordList.H | 2 +- .../PairCollisionRecord/PairCollisionRecord.H | 4 +- .../WallCollisionRecord/WallCollisionRecord.H | 4 +- .../CloudFunctionObject/CloudFunctionObject.H | 2 +- .../FacePostProcessing/FacePostProcessing.H | 2 +- .../ParticleCollector/ParticleCollector.H | 2 +- .../ParticleErosion/ParticleErosion.H | 2 +- .../ParticleTracks/ParticleTracks.H | 2 +- .../ParticleTrap/ParticleTrap.H | 2 +- .../PatchPostProcessing/PatchPostProcessing.H | 2 +- .../VoidFraction/VoidFraction.H | 2 +- .../submodels/CloudSubModelBase.H | 4 +- .../CollisionModel/CollisionModel.H | 2 +- .../CollisionModel/NoCollision/NoCollision.H | 2 +- .../PairCollision/PairCollision.H | 2 +- .../PairModel/PairModel/PairModel.H | 2 +- .../PairSpringSliderDashpot.H | 4 +- .../WallLocalSpringSliderDashpot.H | 2 +- .../WallModel/WallModel/WallModel.H | 2 +- .../WallSpringSliderDashpot.H | 2 +- .../PairCollision/WallSiteData/WallSiteData.H | 4 +- .../DispersionModel/DispersionModel.H | 2 +- .../NoDispersion/NoDispersion.H | 2 +- .../CellZoneInjection/CellZoneInjection.H | 2 +- .../ConeInjection/ConeInjection.H | 2 +- .../ConeNozzleInjection/ConeNozzleInjection.H | 2 +- .../FieldActivatedInjection.H | 2 +- .../InflationInjection/InflationInjection.H | 2 +- .../InjectionModel/InjectionModel.H | 2 +- .../InjectionModel/InjectionModelList.H | 2 +- .../KinematicLookupTableInjection.H | 2 +- .../ManualInjection/ManualInjection.H | 2 +- .../InjectionModel/NoInjection/NoInjection.H | 2 +- .../PatchFlowRateInjection.H | 2 +- .../PatchInjection/PatchInjection.H | 2 +- .../DistortedSphereDragForce.H | 2 +- .../Drag/ErgunWenYuDrag/ErgunWenYuDragForce.H | 2 +- .../Drag/NonSphereDrag/NonSphereDragForce.H | 2 +- .../PlessisMasliyahDragForce.H | 2 +- .../Drag/SphereDrag/SphereDragForce.H | 2 +- .../Drag/WenYuDrag/WenYuDragForce.H | 2 +- .../LocalInteraction/LocalInteraction.H | 2 +- .../MultiInteraction/MultiInteraction.H | 2 +- .../NoInteraction/NoInteraction.H | 2 +- .../PatchInteractionModel.H | 2 +- .../PatchInteractionModel/Rebound/Rebound.H | 2 +- .../StandardWallInteraction.H | 2 +- .../NoStochasticCollision.H | 2 +- .../StochasticCollisionModel.H | 2 +- .../NoSurfaceFilm/NoSurfaceFilm.H | 2 +- .../SurfaceFilmModel/SurfaceFilmModel.H | 2 +- .../AveragingMethod/AveragingMethod.H | 2 +- .../MPPIC/AveragingMethods/Basic/Basic.H | 2 +- .../MPPIC/AveragingMethods/Dual/Dual.H | 2 +- .../MPPIC/AveragingMethods/Moment/Moment.H | 2 +- .../DampingModels/DampingModel/DampingModel.H | 2 +- .../MPPIC/DampingModels/NoDamping/NoDamping.H | 2 +- .../DampingModels/Relaxation/Relaxation.H | 2 +- .../IsotropyModel/IsotropyModel.H | 2 +- .../IsotropyModels/NoIsotropy/NoIsotropy.H | 2 +- .../IsotropyModels/Stochastic/Stochastic.H | 2 +- .../MPPIC/PackingModels/Explicit/Explicit.H | 2 +- .../MPPIC/PackingModels/Implicit/Implicit.H | 2 +- .../MPPIC/PackingModels/NoPacking/NoPacking.H | 2 +- .../PackingModels/PackingModel/PackingModel.H | 2 +- .../CompositionModel/CompositionModel.H | 2 +- .../NoComposition/NoComposition.H | 2 +- .../SingleMixtureFraction.H | 2 +- .../SinglePhaseMixture/SinglePhaseMixture.H | 2 +- .../ReactingLookupTableInjection.H | 2 +- .../LiquidEvaporation/LiquidEvaporation.H | 2 +- .../LiquidEvaporationBoil.H | 2 +- .../NoPhaseChange/NoPhaseChange.H | 2 +- .../PhaseChangeModel/PhaseChangeModel.H | 2 +- .../ConstantRateDevolatilisation.H | 2 +- .../DevolatilisationModel.H | 2 +- .../NoDevolatilisation/NoDevolatilisation.H | 2 +- .../SingleKineticRateDevolatilisation.H | 2 +- .../ReactingMultiphaseLookupTableInjection.H | 2 +- .../SuppressionCollision.H | 2 +- .../NoSurfaceReaction/NoSurfaceReaction.H | 2 +- .../SurfaceReactionModel.H | 2 +- .../HeatTransferModel/HeatTransferModel.H | 2 +- .../NoHeatTransfer/NoHeatTransfer.H | 2 +- .../RanzMarshall/RanzMarshall.H | 2 +- .../ThermoLookupTableInjection.H | 2 +- .../ThermoSurfaceFilm/ThermoSurfaceFilm.H | 2 +- .../bufferedAccumulator/bufferedAccumulator.C | 2 +- .../bufferedAccumulator/bufferedAccumulator.H | 2 +- .../correlationFunction/correlationFunction.C | 2 +- .../correlationFunction/correlationFunction.H | 2 +- .../clouds/Templates/SprayCloud/SprayCloud.H | 2 +- .../AtomizationModel/AtomizationModel.H | 2 +- .../BlobsSheetAtomization.H | 2 +- .../LISAAtomization/LISAAtomization.H | 2 +- .../NoAtomization/NoAtomization.H | 2 +- .../BreakupModel/BreakupModel/BreakupModel.H | 2 +- .../spray/submodels/BreakupModel/ETAB/ETAB.H | 2 +- .../BreakupModel/NoBreakup/NoBreakup.H | 2 +- .../BreakupModel/PilchErdman/PilchErdman.H | 2 +- .../BreakupModel/ReitzDiwakar/ReitzDiwakar.H | 2 +- .../BreakupModel/ReitzKHRT/ReitzKHRT.H | 2 +- .../spray/submodels/BreakupModel/SHF/SHF.H | 2 +- .../spray/submodels/BreakupModel/TAB/TAB.H | 2 +- .../ORourkeCollision/ORourkeCollision.H | 2 +- .../TrajectoryCollision/TrajectoryCollision.H | 2 +- .../DispersionRASModel/DispersionRASModel.H | 2 +- .../GradientDispersionRAS.H | 2 +- .../StochasticDispersionRAS.H | 2 +- .../autoHexMeshDriver/autoLayerDriver.H | 4 +- .../zeroFixedValuePointPatchField.H | 2 +- .../meshRefinement/meshRefinement.H | 2 +- .../AMIInterpolation/AMIInterpolation.H | 4 +- .../AMIMethod/AMIMethod/AMIMethod.H | 4 +- .../AMIMethod/directAMI/directAMI.H | 4 +- .../faceAreaWeightAMI/faceAreaWeightAMI.H | 2 +- .../AMIMethod/mapNearestAMI/mapNearestAMI.H | 2 +- .../partialFaceAreaWeightAMI.H | 4 +- .../cyclicACMIPointPatchField.H | 2 +- .../cyclicAMIPointPatchField.H | 2 +- .../algorithms/MeshWave/FaceCellWave.H | 4 +- src/meshTools/algorithms/MeshWave/MeshWave.H | 4 +- .../PatchEdgeFaceWave/PatchEdgeFaceWave.H | 4 +- .../algorithms/PointEdgeWave/PointEdgeWave.H | 4 +- src/meshTools/cellDist/cellDistFuncs.H | 4 +- .../cellDist/patchWave/patchDataWave.H | 2 +- .../cellDist/wallPoint/wallPointData.H | 2 +- .../indexedOctree/treeDataPrimitivePatch.H | 2 +- src/meshTools/meshTools/meshTools.H | 4 +- .../polyMeshZipUpCells/polyMeshZipUpCells.C | 70 +++---- .../surfaceIntersection/surfaceIntersection.H | 2 +- .../pointToPointPlanarInterpolation.H | 2 +- .../decompose/decompose/fvFieldDecomposer.H | 2 +- .../decompose/ptscotchDecomp/ptscotchDecomp.C | 18 +- .../decompose/ptscotchDecomp/ptscotchDecomp.H | 4 +- .../decompose/scotchDecomp/scotchDecomp.C | 18 +- .../distributedTriSurfaceMesh.H | 2 +- .../reconstruct/fvFieldReconstructor.H | 2 +- .../reconstruct/pointFieldReconstructor.H | 2 +- .../reconstruct/reconstructLagrangian.H | 2 +- .../basic/addSubtract/addSubtract.H | 6 +- .../field/components/components.H | 4 +- .../foamCalcFunctions/field/div/div.H | 4 +- .../field/interpolate/interpolate.H | 4 +- .../foamCalcFunctions/field/mag/mag.H | 4 +- .../foamCalcFunctions/field/magGrad/magGrad.H | 4 +- .../foamCalcFunctions/field/magSqr/magSqr.H | 4 +- .../field/randomise/randomise.H | 4 +- .../IO/partialWrite/partialWrite.H | 2 +- .../fieldAverage/fieldAverage/fieldAverage.H | 2 +- .../fieldCoordinateSystemTransform.H | 2 +- .../field/fieldMinMax/fieldMinMax.H | 4 +- .../field/nearWallFields/nearWallFields.H | 2 +- .../field/readFields/readFields.H | 2 +- .../regionSizeDistribution.H | 2 +- .../surfaceInterpolateFields.H | 2 +- .../wallBoundedParticle.H | 4 +- .../utilities/residuals/residuals.H | 2 +- .../kinematicSingleLayer.H | 2 +- src/sampling/cuttingPlane/cuttingPlane.H | 2 +- src/sampling/meshToMesh0/meshToMesh0.H | 2 +- src/sampling/probes/patchProbes.H | 2 +- src/sampling/probes/probes.H | 2 +- .../sampledSet/sampledSets/sampledSets.H | 2 +- .../distanceSurface/distanceSurface.H | 2 +- .../sampledSurface/isoSurface/isoSurface.H | 2 +- .../isoSurface/isoSurfaceCell.H | 2 +- .../isoSurface/sampledIsoSurface.H | 2 +- .../isoSurface/sampledIsoSurfaceCell.H | 2 +- .../sampledCuttingPlane/sampledCuttingPlane.H | 2 +- .../sampledPatch/sampledPatch.H | 2 +- .../sampledPatchInternalField.H | 2 +- .../sampledPlane/sampledPlane.H | 2 +- .../sampledSurface/sampledSurface.H | 2 +- .../sampledSurfaces/sampledSurfaces.H | 4 +- .../sampledTriSurfaceMesh.H | 2 +- .../sampledThresholdCellFaces.H | 2 +- src/surfMesh/MeshedSurface/MeshedSurface.H | 2 +- .../MeshedSurfaceProxy/MeshedSurfaceProxy.H | 4 +- .../UnsortedMeshedSurface.H | 2 +- .../surfaceFormats/ac3d/AC3DsurfaceFormat.H | 2 +- .../ac3d/AC3DsurfaceFormatCore.H | 4 +- .../surfaceFormats/ftr/FTRsurfaceFormat.H | 2 +- .../surfaceFormats/gts/GTSsurfaceFormat.H | 2 +- .../surfaceFormats/nas/NASsurfaceFormat.H | 2 +- .../surfaceFormats/obj/OBJsurfaceFormat.H | 2 +- .../surfaceFormats/off/OFFsurfaceFormat.H | 2 +- .../surfaceFormats/ofs/OFSsurfaceFormat.H | 2 +- .../surfaceFormats/smesh/SMESHsurfaceFormat.H | 4 +- .../starcd/STARCDsurfaceFormat.H | 2 +- .../surfaceFormats/stl/STLsurfaceFormat.H | 2 +- .../surfaceFormats/tri/TRIsurfaceFormat.H | 2 +- .../surfaceFormats/vtk/VTKsurfaceFormat.H | 2 +- .../surfaceFormats/wrl/WRLsurfaceFormat.H | 4 +- .../surfaceFormats/x3d/X3DsurfaceFormat.H | 4 +- .../basic/basicThermo/basicThermo.H | 4 +- .../basic/heThermo/heThermo.H | 4 +- .../basic/mixtures/pureMixture/pureMixture.H | 4 +- .../basic/psiThermo/hePsiThermo.H | 4 +- .../basic/rhoThermo/heRhoThermo.H | 4 +- .../basicChemistryModel/basicChemistryModel.H | 2 +- .../chemistryModel/chemistryModel.H | 2 +- .../EulerImplicit/EulerImplicit.H | 4 +- .../chemistrySolver/chemistrySolver.H | 4 +- .../noChemistrySolver/noChemistrySolver.H | 4 +- .../chemistryModel/chemistrySolver/ode/ode.H | 4 +- .../mixtureFractionSoot/mixtureFractionSoot.H | 4 +- .../chemistryReader/chemistryReader.H | 2 +- .../foamChemistryReader/foamChemistryReader.H | 4 +- .../moleFractions/moleFractions.H | 2 +- .../mixtures/SpecieMixture/SpecieMixture.H | 4 +- .../mixtures/egrMixture/egrMixture.H | 4 +- .../homogeneousMixture/homogeneousMixture.H | 4 +- .../inhomogeneousMixture.H | 4 +- .../multiComponentMixture.H | 4 +- .../reactingMixture/reactingMixture.H | 2 +- .../singleStepReactingMixture.H | 2 +- .../veryInhomogeneousMixture.H | 4 +- .../psiuReactionThermo/heheuPsiThermo.H | 4 +- .../pyrolysisChemistryModel.H | 4 +- .../solidChemistryModel/solidChemistryModel.H | 4 +- .../Reactions/solidReaction/solidReaction.H | 2 +- .../const/constAnIsoSolidTransport.H | 2 +- .../transport/const/constIsoSolidTransport.H | 2 +- .../exponential/exponentialSolidTransport.H | 2 +- .../polynomial/polynomialSolidTransport.H | 2 +- .../solidThermo/solidThermo/heSolidThermo.H | 4 +- .../equationOfState/Boussinesq/Boussinesq.H | 2 +- .../PengRobinsonGas/PengRobinsonGas.H | 2 +- .../adiabaticPerfectFluid.H | 2 +- .../icoPolynomial/icoPolynomial.H | 2 +- .../incompressiblePerfectGas.H | 2 +- .../specie/equationOfState/linear/linear.H | 2 +- .../perfectFluid/perfectFluid.H | 2 +- .../equationOfState/perfectGas/perfectGas.H | 2 +- .../equationOfState/rhoConst/rhoConst.H | 2 +- .../IrreversibleReaction.H | 2 +- .../NonEquilibriumReversibleReaction.H | 2 +- .../reaction/Reactions/Reaction/Reaction.H | 2 +- .../Reactions/ReactionList/ReactionList.H | 2 +- .../ReversibleReaction/ReversibleReaction.H | 2 +- .../specie/thermo/eConst/eConstThermo.H | 4 +- .../specie/thermo/hConst/hConstThermo.H | 4 +- .../thermo/hPolynomial/hPolynomialThermo.H | 2 +- .../specie/thermo/hPower/hPowerThermo.H | 6 +- .../specie/thermo/hRefConst/hRefConstThermo.H | 4 +- .../specie/thermo/janaf/janafThermo.H | 4 +- .../specie/thermo/thermo/thermo.H | 2 +- .../specie/transport/const/constTransport.H | 2 +- .../logPolynomial/logPolynomialTransport.H | 2 +- .../polynomial/polynomialTransport.H | 2 +- .../sutherland/sutherlandTransport.H | 2 +- .../rawTopoChangerFvMesh.H | 4 +- wmake/src/wmkdep.l | 4 +- 717 files changed, 1212 insertions(+), 1214 deletions(-) diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H index 8d9c6a73f..60303766f 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -119,7 +119,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "Henry.C" + #include "Henry.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H index c0a77f3b3..198783c4e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H @@ -206,7 +206,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "InterfaceCompositionModel.C" + #include "InterfaceCompositionModel.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H index f0197e77f..601806164 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/NonRandomTwoLiquid/NonRandomTwoLiquid.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -157,7 +157,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "NonRandomTwoLiquid.C" + #include "NonRandomTwoLiquid.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H index ca001df8e..284453922 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.H @@ -120,7 +120,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "Raoult.C" + #include "Raoult.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H index 758bd3a0a..a585447a1 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Saturated/Saturated.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -127,7 +127,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "Saturated.C" + #include "Saturated.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H index c02f04e82..296201ddb 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.H @@ -156,7 +156,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "HeatAndMassTransferPhaseSystem.C" + #include "HeatAndMassTransferPhaseSystem.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H index 931fc2a75..480433d18 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.H @@ -121,7 +121,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "HeatTransferPhaseSystem.C" + #include "HeatTransferPhaseSystem.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H index b87c5a709..0052008ab 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -110,7 +110,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "InterfaceCompositionPhaseChangePhaseSystem.C" + #include "InterfaceCompositionPhaseChangePhaseSystem.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H index c449e0f67..49a0bfb64 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.H @@ -218,7 +218,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "MomentumTransferPhaseSystem.C" + #include "MomentumTransferPhaseSystem.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H index b54c18315..c1ab9e7c9 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -116,7 +116,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "ThermalPhaseChangePhaseSystem.C" + #include "ThermalPhaseChangePhaseSystem.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H index 1b7ec2f61..7a9cbd51b 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -103,7 +103,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "AnisothermalPhaseModel.C" + #include "AnisothermalPhaseModel.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H index 77823d449..26c9661ab 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -90,7 +90,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "InertPhaseModel.C" + #include "InertPhaseModel.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H index bdf1a14ae..85a31f880 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/IsothermalPhaseModel/IsothermalPhaseModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -86,7 +86,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "IsothermalPhaseModel.C" + #include "IsothermalPhaseModel.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H index 6c5da0bde..864a6b425 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -196,7 +196,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "MovingPhaseModel.C" + #include "MovingPhaseModel.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H index 94ca80582..6bbab1cf5 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -108,7 +108,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "MultiComponentPhaseModel.C" + #include "MultiComponentPhaseModel.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H index 2aa8034ed..ff42fbe71 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/PurePhaseModel/PurePhaseModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -99,7 +99,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "PurePhaseModel.C" + #include "PurePhaseModel.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H index 305b62590..e05c71b44 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -99,7 +99,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "ReactingPhaseModel.C" + #include "ReactingPhaseModel.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H index 960d2c1ba..56289cbf7 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/ThermoPhaseModel/ThermoPhaseModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -161,7 +161,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "ThermoPhaseModel.C" + #include "ThermoPhaseModel.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H index cee72cb35..85470192a 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.H @@ -365,7 +365,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "phaseSystemTemplates.C" + #include "phaseSystemTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/test/HashingSpeed/Test-HashingSpeed.C b/applications/test/HashingSpeed/Test-HashingSpeed.C index 7e89d44f8..5937ad741 100644 --- a/applications/test/HashingSpeed/Test-HashingSpeed.C +++ b/applications/test/HashingSpeed/Test-HashingSpeed.C @@ -7,9 +7,9 @@ #include #ifndef CLOCKS_PER_SEC -# ifdef CLK_TCK -# define CLOCKS_PER_SEC (CLK_TCK) -# endif + #ifdef CLK_TCK + #define CLOCKS_PER_SEC (CLK_TCK) + #endif #endif #undef mix @@ -66,16 +66,16 @@ on 1 byte), but shoehorning those bytes into integers efficiently is messy. __BYTE_ORDER == __LITTLE_ENDIAN) || \ (defined(i386) || defined(__i386__) || defined(__i486__) || \ defined(__i586__) || defined(__i686__) || defined(vax) || defined(MIPSEL)) -# define HASH_LITTLE_ENDIAN 1 -# define HASH_BIG_ENDIAN 0 + #define HASH_LITTLE_ENDIAN 1 + #define HASH_BIG_ENDIAN 0 #elif (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && \ __BYTE_ORDER == __BIG_ENDIAN) || \ (defined(sparc) || defined(POWERPC) || defined(mc68000) || defined(sel)) -# define HASH_LITTLE_ENDIAN 0 -# define HASH_BIG_ENDIAN 1 + #define HASH_LITTLE_ENDIAN 0 + #define HASH_BIG_ENDIAN 1 #else -# define HASH_LITTLE_ENDIAN 0 -# define HASH_BIG_ENDIAN 0 + #define HASH_LITTLE_ENDIAN 0 + #define HASH_BIG_ENDIAN 0 #endif #define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k)))) diff --git a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C index 4f91fcd5e..70ca236c7 100644 --- a/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C +++ b/applications/utilities/mesh/conversion/star3ToFoam/createCoupleMatches.C @@ -75,14 +75,14 @@ void Foam::starMesh::createCoupleMatches() const face& masterFace = cellFaces_[fp.masterCell()][fp.masterFace()]; const face& slaveFace = cellFaces_[fp.slaveCell()][fp.slaveFace()]; -# ifdef DEBUG_COUPLE + #ifdef DEBUG_COUPLE Info<< "coupleI: " << coupleI << endl << "masterFace: " << masterFace << endl << "master points: " << masterFace.points(points_) << endl << "slaveFace: " << slaveFace << endl << "slave points: " << slaveFace.points(points_) << endl << endl; -# endif + #endif // check the angle of face area vectors scalar faceAreaAngle = @@ -177,10 +177,10 @@ void Foam::starMesh::createCoupleMatches() vector d = curMasterEdge.vec(points_); d -= n*(n & d); -# ifdef DEBUG_COUPLE_INTERSECTION + #ifdef DEBUG_COUPLE_INTERSECTION Info<< "curMasterEdge: " << curMasterEdge << endl << "P: " << P << endl << "d: " << d << endl; -# endif + #endif // go through all slave edges and try to get an intersection. // The point is created along the original master edge rather @@ -196,20 +196,20 @@ void Foam::starMesh::createCoupleMatches() e -= n*(n & e); scalar det = -(e & (n ^ d)); -# ifdef DEBUG_COUPLE_INTERSECTION + #ifdef DEBUG_COUPLE_INTERSECTION Info<< "curSlaveEdge: " << curSlaveEdge << endl << "S: " << S << endl << "e: " << e << endl; -# endif + #endif if (mag(det) > SMALL) { // non-singular matrix. Look for intersection scalar beta = ((S - P) & (n ^ d))/det; -# ifdef DEBUG_COUPLE_INTERSECTION + #ifdef DEBUG_COUPLE_INTERSECTION Info<< " beta: " << beta << endl; -# endif + #endif if (beta > -smallMergeTol_ && beta < 1 + smallMergeTol_) { @@ -217,9 +217,9 @@ void Foam::starMesh::createCoupleMatches() scalar alpha = (((S - P) & d) + beta*(d & e))/magSqr(d); -# ifdef DEBUG_COUPLE_INTERSECTION + #ifdef DEBUG_COUPLE_INTERSECTION Info<< " alpha: " << alpha << endl; -# endif + #endif if ( @@ -228,10 +228,10 @@ void Foam::starMesh::createCoupleMatches() ) { // intersection of non-parallel edges -# ifdef DEBUG_COUPLE_INTERSECTION + #ifdef DEBUG_COUPLE_INTERSECTION Info<< "intersection of non-parallel edges" << endl; -# endif + #endif // check for insertion of start-end @@ -309,14 +309,14 @@ void Foam::starMesh::createCoupleMatches() nLivePoints + coupleFacePoints.size() ); -# ifdef DEBUG_COUPLE_INTERSECTION + #ifdef DEBUG_COUPLE_INTERSECTION Info<< "regular intersection. " << "Adding point: " << coupleFacePoints.size() << " which is " << P + alpha*curMasterEdge.vec(points_) << endl; -# endif + #endif // A new point is created. Warning: // using original edge for accuracy. @@ -369,12 +369,12 @@ void Foam::starMesh::createCoupleMatches() && alpha1 < 1 + smallMergeTol_ ) { -# ifdef DEBUG_COUPLE_INTERSECTION + #ifdef DEBUG_COUPLE_INTERSECTION Info<< "adding irregular master " << "intersection1: " << points_[slaveEdges[slaveEdgeI].start()] << endl; -# endif + #endif masterEdgePoints[masterEdgeI].append ( @@ -390,12 +390,12 @@ void Foam::starMesh::createCoupleMatches() && alpha2 < 1 + smallMergeTol_ ) { -# ifdef DEBUG_COUPLE_INTERSECTION + #ifdef DEBUG_COUPLE_INTERSECTION Info<< "adding irregular master " << "intersection2: " << points_[slaveEdges[slaveEdgeI].end()] << endl; -# endif + #endif masterEdgePoints[masterEdgeI].append ( @@ -411,11 +411,11 @@ void Foam::starMesh::createCoupleMatches() scalar beta1 = (sp & e)/magSqr(e); -# ifdef DEBUG_COUPLE_INTERSECTION + #ifdef DEBUG_COUPLE_INTERSECTION Info<< "P: " << P << " S: " << S << " d: " << d << " e: " << e << " sp: " << sp << " beta1: " << beta1 << endl; -# endif + #endif if ( @@ -423,12 +423,12 @@ void Foam::starMesh::createCoupleMatches() && beta1 < 1 + smallMergeTol_ ) { -# ifdef DEBUG_COUPLE_INTERSECTION + #ifdef DEBUG_COUPLE_INTERSECTION Info<< "adding irregular slave " << "intersection1: " << points_[masterEdges[masterEdgeI].start()] << endl; -# endif + #endif slaveEdgePoints[slaveEdgeI].append ( @@ -444,12 +444,12 @@ void Foam::starMesh::createCoupleMatches() && beta2 < 1 + smallMergeTol_ ) { -# ifdef DEBUG_COUPLE_INTERSECTION + #ifdef DEBUG_COUPLE_INTERSECTION Info<< "adding irregular slave " << "intersection2: " << points_[masterEdges[masterEdgeI].end()] << endl; -# endif + #endif slaveEdgePoints[slaveEdgeI].append ( @@ -461,14 +461,14 @@ void Foam::starMesh::createCoupleMatches() } // end of slave edges } // end of master edges -# ifdef DEBUG_COUPLE_INTERSECTION + #ifdef DEBUG_COUPLE_INTERSECTION Info<< "additional slave edge points: " << endl; forAll(slaveEdgePoints, edgeI) { Info<< "edge: " << edgeI << ": " << slaveEdgePoints[edgeI] << endl; } -# endif + #endif // Add new points if (nLivePoints + coupleFacePoints.size() >= points_.size()) @@ -509,11 +509,11 @@ void Foam::starMesh::createCoupleMatches() ); label nTmpMasterLabels = 0; -# ifdef DEBUG_COUPLE_INTERSECTION + #ifdef DEBUG_COUPLE_INTERSECTION Info<< "masterFace: " << masterFace << endl << "nAdditionalMasterPoints: " << nAdditionalMasterPoints << endl; -# endif + #endif forAll(masterEdges, masterEdgeI) { @@ -531,11 +531,11 @@ void Foam::starMesh::createCoupleMatches() vector edgeVector = masterEdges[masterEdgeI].vec(points_); -# ifdef DEBUG_FACE_ORDERING + #ifdef DEBUG_FACE_ORDERING Info<< "edgeVector: " << edgeVector << endl << "curMEdgePoints.size(): " << curMEdgePoints.size() << endl; -# endif + #endif // renormalise edgeVector /= magSqr(edgeVector); @@ -569,14 +569,14 @@ void Foam::starMesh::createCoupleMatches() - edgeStartPoint ); -# ifdef DEBUG_FACE_ORDERING + #ifdef DEBUG_FACE_ORDERING Info<< " edgeStartPoint: " << edgeStartPoint << " edgeEndPoint: " << points_[masterEdges[masterEdgeI].end()] << " other point: " << points_[curMEdgePointsIter()] << " alpha: " << alpha << endl; -# endif + #endif if (alpha < minAlpha) { @@ -586,20 +586,20 @@ void Foam::starMesh::createCoupleMatches() } } -# ifdef DEBUG_FACE_ORDERING + #ifdef DEBUG_FACE_ORDERING Info<< "nextPointLabel: " << nextPointLabel << endl; -# endif + #endif i++; } if (nextPointLabel > -1) { -# ifdef DEBUG_FACE_ORDERING + #ifdef DEBUG_FACE_ORDERING Info<< "added nextPointLabel: " << nextPointLabel << " nTmpMasterLabels: " << nTmpMasterLabels << " to place " << nTmpMasterLabels << endl; -# endif + #endif usedMasterPoint[usedI] = true; // add the next point @@ -617,9 +617,9 @@ void Foam::starMesh::createCoupleMatches() // reset the size of master tmpMasterFace.setSize(nTmpMasterLabels); -# ifdef DEBUG_FACE_ORDERING + #ifdef DEBUG_FACE_ORDERING Info<< "tmpMasterFace: " << tmpMasterFace << endl; -# endif + #endif // Eliminate all zero-length edges face newMasterFace(labelList(tmpMasterFace.size(), labelMax)); @@ -638,12 +638,12 @@ void Foam::starMesh::createCoupleMatches() forAll(mstEdgesToCollapse, edgeI) { -# ifdef DEBUG_FACE_ORDERING + #ifdef DEBUG_FACE_ORDERING Info<< "edgeI: " << edgeI << " curEdge: " << mstEdgesToCollapse[edgeI] << endl << "master edge " << edgeI << ", " << mstEdgesToCollapse[edgeI].mag(points_) << endl; -# endif + #endif // Edge merge tolerance = masterTol if (mstEdgesToCollapse[edgeI].mag(points_) < masterTol) @@ -655,10 +655,10 @@ void Foam::starMesh::createCoupleMatches() mstEdgesToCollapse[edgeI].end() ); -# ifdef DEBUG_FACE_ORDERING + #ifdef DEBUG_FACE_ORDERING Info<< "Collapsed: nMaster: " << nMaster << " label: " << newMasterFace[nMaster] << endl; -# endif + #endif } else @@ -668,11 +668,11 @@ void Foam::starMesh::createCoupleMatches() if (edgeI < mstEdgesToCollapse.size() - 1) { // last edge does not add the point -# ifdef DEBUG_FACE_ORDERING + #ifdef DEBUG_FACE_ORDERING Info<< "Added: nMaster: " << nMaster << " label: " << mstEdgesToCollapse[edgeI].end() << endl; -# endif + #endif newMasterFace[nMaster] = mstEdgesToCollapse[edgeI].end(); @@ -682,10 +682,10 @@ void Foam::starMesh::createCoupleMatches() newMasterFace.setSize(nMaster); -# ifdef DEBUG_COUPLE + #ifdef DEBUG_COUPLE Info<< "newMasterFace: " << newMasterFace << endl << "points: " << newMasterFace.points(points_) << endl; -# endif + #endif // Creating new slave side @@ -704,10 +704,10 @@ void Foam::starMesh::createCoupleMatches() ); label nTmpSlaveLabels = 0; -# ifdef DEBUG_COUPLE_INTERSECTION + #ifdef DEBUG_COUPLE_INTERSECTION Info<< "slaveFace: " << slaveFace << endl << "nAdditionalSlavePoints: " << nAdditionalSlavePoints << endl; -# endif + #endif forAll(slaveEdges, slaveEdgeI) { @@ -725,11 +725,11 @@ void Foam::starMesh::createCoupleMatches() vector edgeVector = slaveEdges[slaveEdgeI].vec(points_); -# ifdef DEBUG_FACE_ORDERING + #ifdef DEBUG_FACE_ORDERING Info<< "curSEdgePoints.size(): " << curSEdgePoints.size() << endl << "edgeVector: " << edgeVector << endl; -# endif + #endif // renormalise edgeVector /= magSqr(edgeVector); @@ -763,14 +763,14 @@ void Foam::starMesh::createCoupleMatches() - edgeStartPoint ); -# ifdef DEBUG_FACE_ORDERING + #ifdef DEBUG_FACE_ORDERING Info<< " edgeStartPoint: " << edgeStartPoint << " edgeEndPoint: " << points_[slaveEdges[slaveEdgeI].end()] << " other point: " << points_[curSEdgePointsIter()] << " alpha: " << alpha << endl; -# endif + #endif if (alpha < minAlpha) { @@ -780,20 +780,20 @@ void Foam::starMesh::createCoupleMatches() } } -# ifdef DEBUG_FACE_ORDERING + #ifdef DEBUG_FACE_ORDERING Info<< "nextPointLabel: " << nextPointLabel << endl; -# endif + #endif i++; } if (nextPointLabel > -1) { -# ifdef DEBUG_FACE_ORDERING + #ifdef DEBUG_FACE_ORDERING Info<< "added nextPointLabel: " << nextPointLabel << " nTmpSlaveLabels: " << nTmpSlaveLabels << " to place " << nTmpSlaveLabels << endl; -# endif + #endif usedSlavePoint[usedI] = true; // add the next point @@ -811,9 +811,9 @@ void Foam::starMesh::createCoupleMatches() // reset the size of slave tmpSlaveFace.setSize(nTmpSlaveLabels); -# ifdef DEBUG_FACE_ORDERING + #ifdef DEBUG_FACE_ORDERING Info<< "tmpSlaveFace: " << tmpSlaveFace << endl; -# endif + #endif // Eliminate all zero-length edges face newSlaveFace(labelList(tmpSlaveFace.size(), labelMax)); @@ -832,10 +832,10 @@ void Foam::starMesh::createCoupleMatches() forAll(slvEdgesToCollapse, edgeI) { -# ifdef DEBUG_FACE_ORDERING + #ifdef DEBUG_FACE_ORDERING Info<< "slave edge length: " << edgeI << ", " << slvEdgesToCollapse[edgeI].mag(points_)<< endl; -# endif + #endif // edge merge tolerance = slaveTol if (slvEdgesToCollapse[edgeI].mag(points_) < slaveTol) @@ -860,10 +860,10 @@ void Foam::starMesh::createCoupleMatches() newSlaveFace.setSize(nSlave); -# ifdef DEBUG_COUPLE + #ifdef DEBUG_COUPLE Info<< "newSlaveFace: " << newSlaveFace << endl << "points: " << newSlaveFace.points(points_) << endl << endl; -# endif + #endif // Create the intersection face @@ -878,10 +878,10 @@ void Foam::starMesh::createCoupleMatches() edgeList newMasterEdges = newMasterFace.edges(); edgeList newSlaveEdges = newSlaveFace.edges(); -# ifdef DEBUG_RIGHT_HAND_WALK + #ifdef DEBUG_RIGHT_HAND_WALK Info<< "newMasterEdges: " << newMasterEdges << endl << "newSlaveEdges: " << newSlaveEdges << endl; -# endif + #endif edge startEdge(-1, -1); @@ -924,9 +924,9 @@ void Foam::starMesh::createCoupleMatches() startEdge = newSlaveEdges[edgeI]; startEdgeFound = 2; -# ifdef DEBUG_RIGHT_HAND_WALK + #ifdef DEBUG_RIGHT_HAND_WALK Info<< "slave edge found" << endl; -# endif + #endif break; } @@ -967,9 +967,9 @@ void Foam::starMesh::createCoupleMatches() startEdge = newMasterEdges[edgeI]; startEdgeFound = 1; -# ifdef DEBUG_RIGHT_HAND_WALK + #ifdef DEBUG_RIGHT_HAND_WALK Info<< "master edge found" << endl; -# endif + #endif break; } @@ -984,9 +984,9 @@ void Foam::starMesh::createCoupleMatches() if (startEdgeFound > 0) { -# ifdef DEBUG_RIGHT_HAND_WALK + #ifdef DEBUG_RIGHT_HAND_WALK Info<< "start edge: " << startEdge << endl; -# endif + #endif // Loop through both faces and add all edges // containing the current point and add them to the @@ -1002,9 +1002,9 @@ void Foam::starMesh::createCoupleMatches() vector planeNormal = newMasterFace.normal(points_); planeNormal /= mag(planeNormal) + VSMALL; -# ifdef DEBUG_RIGHT_HAND_WALK + #ifdef DEBUG_RIGHT_HAND_WALK Info<< "planeNormal: " << planeNormal << endl; -# endif + #endif // Do a check to control the right-hand turn. This is // based on the triple product of the edge start @@ -1032,9 +1032,9 @@ void Foam::starMesh::createCoupleMatches() if (tripleProduct < 0) { -# ifdef DEBUG_RIGHT_HAND_WALK + #ifdef DEBUG_RIGHT_HAND_WALK Info<< "Turning edge for right-hand turn rule" << endl; -# endif + #endif startEdge.flip(); } @@ -1089,11 +1089,11 @@ void Foam::starMesh::createCoupleMatches() } } -# ifdef DEBUG_RIGHT_HAND_WALK + #ifdef DEBUG_RIGHT_HAND_WALK Info<< "number of edges to consider: " << edgesToConsider.size() << endl << "edges to consider: " << edgesToConsider << endl; -# endif + #endif if (edgesToConsider.empty()) { @@ -1132,10 +1132,10 @@ void Foam::starMesh::createCoupleMatches() scalar rightTurn = nextEdgeVec & right; scalar goStraight = nextEdgeVec & ahead; -# ifdef DEBUG_RIGHT_HAND_WALK + #ifdef DEBUG_RIGHT_HAND_WALK Info<< "rightTurn: " << rightTurn << " goStraight: " << goStraight << endl; -# endif + #endif for ( @@ -1153,10 +1153,10 @@ void Foam::starMesh::createCoupleMatches() scalar curRightTurn = newDir & right; scalar curGoStraight = newDir & ahead; -# ifdef DEBUG_RIGHT_HAND_WALK + #ifdef DEBUG_RIGHT_HAND_WALK Info<< "curRightTurn: " << curRightTurn << " curGoStraight: " << curGoStraight << endl; -# endif + #endif if (rightTurn < 0) // old edge turning left { @@ -1165,9 +1165,9 @@ void Foam::starMesh::createCoupleMatches() // both go left. Grab one with greater ahead if (curGoStraight > goStraight) { -# ifdef DEBUG_RIGHT_HAND_WALK + #ifdef DEBUG_RIGHT_HAND_WALK Info<< "a" << endl; -# endif + #endif // Good edge, turning left less than before nextEdge = etcIter(); @@ -1177,9 +1177,9 @@ void Foam::starMesh::createCoupleMatches() } else // new edge turning right { -# ifdef DEBUG_RIGHT_HAND_WALK + #ifdef DEBUG_RIGHT_HAND_WALK Info<< "b" << endl; -# endif + #endif // good edge, turning right nextEdge = etcIter(); @@ -1195,9 +1195,9 @@ void Foam::starMesh::createCoupleMatches() // grab one with smaller ahead if (curGoStraight < goStraight) { -# ifdef DEBUG_RIGHT_HAND_WALK + #ifdef DEBUG_RIGHT_HAND_WALK Info<< "c" << endl; -# endif + #endif // good edge, turning right more than before nextEdge = etcIter(); @@ -1243,10 +1243,10 @@ void Foam::starMesh::createCoupleMatches() // grab the current point and the current edge curEdge = nextEdge; -# ifdef DEBUG_RIGHT_HAND_WALK + #ifdef DEBUG_RIGHT_HAND_WALK Info<< "inserted point " << nextEdge.end() << endl << "curEdge: " << curEdge << endl; -# endif + #endif } } while (!completedFace); @@ -1254,9 +1254,9 @@ void Foam::starMesh::createCoupleMatches() // resize the face intersectedFace.setSize(nIntFacePoints); -# ifdef DEBUG_COUPLE + #ifdef DEBUG_COUPLE Info<< "intersectedFace: " << intersectedFace << endl; -# endif + #endif // check the intersection face for duplicate points forAll(intersectedFace, checkI) @@ -1313,10 +1313,10 @@ void Foam::starMesh::createCoupleMatches() forAll(intersectedFace, intPointI) { -# ifdef DEBUG_COUPLE_PROJECTION + #ifdef DEBUG_COUPLE_PROJECTION Info<< "Proj: old point: " << points_[intersectedFace[intPointI]] << endl; -# endif + #endif pointHit projHit = masterFace.ray @@ -1332,10 +1332,10 @@ void Foam::starMesh::createCoupleMatches() points_[intersectedFace[intPointI]] = projHit.hitPoint(); -# ifdef DEBUG_COUPLE_PROJECTION + #ifdef DEBUG_COUPLE_PROJECTION Info<< " new point: " << points_[intersectedFace[intPointI]] << endl; -# endif + #endif } } diff --git a/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C b/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C index f71573c11..39e7a27b5 100644 --- a/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C +++ b/applications/utilities/mesh/conversion/star3ToFoam/mergeCoupleFacePoints.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -126,9 +126,9 @@ void Foam::starMesh::mergeCoupleFacePoints() if (edge (a, b).mag(points_) < pointMergeTol) { // found a pair of points to merge -# ifdef DEBUG_MERGE + #ifdef DEBUG_MERGE Info<< "Merging points " << a << " and " << b << endl; -# endif + #endif // are the two points in a merge group? label mergeSetA = -1; @@ -147,10 +147,10 @@ void Foam::starMesh::mergeCoupleFacePoints() if (mergeSetA == -1 && mergeSetB == -1) { // add new merge group -# ifdef DEBUG_MERGE + #ifdef DEBUG_MERGE Info<< "adding new merge group " << nMergeSets << endl; -# endif + #endif // mark points as belonging to a new merge set renumberPoints[a] = nMergeSets; @@ -169,10 +169,10 @@ void Foam::starMesh::mergeCoupleFacePoints() } else if (mergeSetA == -1 && mergeSetB != -1) { -# ifdef DEBUG_MERGE + #ifdef DEBUG_MERGE Info<< "adding point a into the merge set of b. " << "a: " << a << endl; -# endif + #endif // add point a into the merge set of b renumberPoints[a] = mergeSetB; @@ -183,10 +183,10 @@ void Foam::starMesh::mergeCoupleFacePoints() } else if (mergeSetA != -1 && mergeSetB == -1) { -# ifdef DEBUG_MERGE + #ifdef DEBUG_MERGE Info<< "adding point b into the merge set of a. " << "b: " << b << endl; -# endif + #endif // add point b into the merge set of a renumberPoints[b] = mergeSetA; @@ -202,12 +202,12 @@ void Foam::starMesh::mergeCoupleFacePoints() label minMerge = min(mergeSetA, mergeSetB); label maxMerge = max(mergeSetA, mergeSetB); -# ifdef DEBUG_MERGE + #ifdef DEBUG_MERGE Info<< "Points already belong to two " << "different merge sets. " << "Eliminate the higher merge set. Sets: " << minMerge << " and " << maxMerge << endl; -# endif + #endif forAll(renumberPoints, elimI) { diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C index 07b146f67..c5459ebb9 100644 --- a/applications/utilities/mesh/manipulation/setSet/setSet.C +++ b/applications/utilities/mesh/manipulation/setSet/setSet.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -847,12 +847,12 @@ int main(int argc, char *argv[]) printAllSets(mesh, Info); // Read history if interactive -# ifdef HAS_READLINE + #ifdef HAS_READLINE if (!batch && !read_history((runTime.path()/historyFile).c_str())) { Info<< "Successfully read history from " << historyFile << endl; } -# endif + #endif // Exit status @@ -929,7 +929,7 @@ int main(int argc, char *argv[]) } else { -# ifdef HAS_READLINE + #ifdef HAS_READLINE { char* linePtr = readline("readline>"); @@ -950,7 +950,7 @@ int main(int argc, char *argv[]) break; } } -# else + #else { if (!std::cin.good()) { @@ -961,7 +961,7 @@ int main(int argc, char *argv[]) Info<< "Command>" << flush; std::getline(std::cin, rawLine); } -# endif + #endif } // Strip off anything after # diff --git a/applications/utilities/mesh/manipulation/setSet/writeFuns.C b/applications/utilities/mesh/manipulation/setSet/writeFuns.C index 6363a485a..720a6dff9 100644 --- a/applications/utilities/mesh/manipulation/setSet/writeFuns.C +++ b/applications/utilities/mesh/manipulation/setSet/writeFuns.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,19 +26,19 @@ License #include "writeFuns.H" #if defined(__mips) -#include -#include + #include + #include #endif #if defined(LITTLE_ENDIAN) \ || defined(_LITTLE_ENDIAN) \ || defined(__LITTLE_ENDIAN) -# define LITTLEENDIAN 1 + #define LITTLEENDIAN 1 #elif defined(BIG_ENDIAN) || defined(_BIG_ENDIAN) || defined(__BIG_ENDIAN) -# undef LITTLEENDIAN + #undef LITTLEENDIAN #else -# error "Cannot find LITTLE_ENDIAN or BIG_ENDIAN symbol defined." -# error "Please add to compilation options" + #error "Cannot find LITTLE_ENDIAN or BIG_ENDIAN symbol defined." + #error "Please add to compilation options" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C index 5685ebc44..d9e9f9cfc 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,28 +27,28 @@ License #include "vtkTopo.H" #if defined(__mips) -#include -#include + #include + #include #endif // MacOSX #ifdef __DARWIN_BYTE_ORDER -#if __DARWIN_BYTE_ORDER==__DARWIN_BIG_ENDIAN -#undef LITTLE_ENDIAN -#else -#undef BIG_ENDIAN -#endif + #if __DARWIN_BYTE_ORDER==__DARWIN_BIG_ENDIAN + #undef LITTLE_ENDIAN + #else + #undef BIG_ENDIAN + #endif #endif #if defined(LITTLE_ENDIAN) \ || defined(_LITTLE_ENDIAN) \ || defined(__LITTLE_ENDIAN) -# define LITTLEENDIAN 1 + #define LITTLEENDIAN 1 #elif defined(BIG_ENDIAN) || defined(_BIG_ENDIAN) || defined(__BIG_ENDIAN) -# undef LITTLEENDIAN + #undef LITTLEENDIAN #else -# error "Cannot find LITTLE_ENDIAN or BIG_ENDIAN symbol defined." -# error "Please add to compilation options" + #error "Cannot find LITTLE_ENDIAN or BIG_ENDIAN symbol defined." + #error "Please add to compilation options" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -85,9 +85,9 @@ void Foam::writeFuns::write { if (binary) { -# ifdef LITTLEENDIAN + #ifdef LITTLEENDIAN swapWords(fField.size(), reinterpret_cast(fField.begin())); -# endif + #endif os.write ( reinterpret_cast(fField.begin()), @@ -138,9 +138,9 @@ void Foam::writeFuns::write { if (binary) { -# ifdef LITTLEENDIAN + #ifdef LITTLEENDIAN swapWords(elems.size(), reinterpret_cast(elems.begin())); -# endif + #endif os.write ( reinterpret_cast(elems.begin()), diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_elements_by_type.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_elements_by_type.H index c9fd0d389..7d768159c 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_elements_by_type.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_elements_by_type.H @@ -5,7 +5,7 @@ int USERD_get_part_elements_by_type int **conn_array ) { -# ifdef ENSIGHTDEBUG + #ifdef ENSIGHTDEBUG Info<< "Entering: USERD_get_part_elements_by_type" << nl << "part_number = " << part_number << nl << "element_type = " << element_type; @@ -46,7 +46,7 @@ int USERD_get_part_elements_by_type Info<< " unknown"; } Info<< endl << flush; -# endif + #endif if (part_number == 1) { @@ -244,9 +244,9 @@ int USERD_get_part_elements_by_type return Z_ERR; } -# ifdef ENSIGHTDEBUG + #ifdef ENSIGHTDEBUG Info<< "Leaving: USERD_get_part_elements_by_type" << endl; -# endif + #endif return Z_OK; } diff --git a/etc/codeTemplates/BC/BC.H b/etc/codeTemplates/BC/BC.H index 8dc2e49a7..65a475703 100644 --- a/etc/codeTemplates/BC/BC.H +++ b/etc/codeTemplates/BC/BC.H @@ -236,7 +236,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "CONSTRUCT.C" + #include "CONSTRUCT.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/etc/codeTemplates/template/_TemplateTemplate.H b/etc/codeTemplates/template/_TemplateTemplate.H index 8fee2df3e..12e5511b7 100644 --- a/etc/codeTemplates/template/_TemplateTemplate.H +++ b/etc/codeTemplates/template/_TemplateTemplate.H @@ -147,7 +147,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "CLASSNAME.C" + #include "CLASSNAME.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C index 9188b7e24..525c84817 100644 --- a/src/OSspecific/POSIX/POSIX.C +++ b/src/OSspecific/POSIX/POSIX.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,7 +27,7 @@ Description \*---------------------------------------------------------------------------*/ #ifdef solarisGcc -# define _SYS_VNODE_H + #define _SYS_VNODE_H #endif #include "OSspecific.H" @@ -58,11 +58,11 @@ Description #include #ifdef USE_RANDOM -# include -# if INT_MAX != 2147483647 -# error "INT_MAX != 2147483647" -# error "The random number generator may not work!" -# endif + #include + #if INT_MAX != 2147483647 + #error "INT_MAX != 2147483647" + #error "The random number generator may not work!" + #endif #endif // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/OSspecific/POSIX/fileMonitor.C b/src/OSspecific/POSIX/fileMonitor.C index e3bddbc78..045ed5be4 100644 --- a/src/OSspecific/POSIX/fileMonitor.C +++ b/src/OSspecific/POSIX/fileMonitor.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,15 +32,15 @@ License #include "regIOobject.H" // for fileModificationSkew symbol #ifdef FOAM_USE_INOTIFY -# include -# include -# include -# include -# define EVENT_SIZE ( sizeof (struct inotify_event) ) -# define EVENT_LEN (EVENT_SIZE + 16) -# define EVENT_BUF_LEN ( 1024 * EVENT_LEN ) + #include + #include + #include + #include + #define EVENT_SIZE ( sizeof (struct inotify_event) ) + #define EVENT_LEN (EVENT_SIZE + 16) + #define EVENT_BUF_LEN ( 1024 * EVENT_LEN ) #else -# include "OSspecific.H" + #include "OSspecific.H" #endif // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H index e80b52646..c54493d5e 100644 --- a/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H +++ b/src/OpenFOAM/algorithms/dynamicIndexedOctree/dynamicIndexedOctree.H @@ -683,7 +683,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "dynamicIndexedOctree.C" + #include "dynamicIndexedOctree.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H index d1debf7f9..e0ead6cf0 100644 --- a/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H +++ b/src/OpenFOAM/algorithms/indexedOctree/indexedOctree.H @@ -697,7 +697,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "indexedOctree.C" + #include "indexedOctree.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/algorithms/indexedOctree/labelBits.H b/src/OpenFOAM/algorithms/indexedOctree/labelBits.H index b2a8907e3..665318994 100644 --- a/src/OpenFOAM/algorithms/indexedOctree/labelBits.H +++ b/src/OpenFOAM/algorithms/indexedOctree/labelBits.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -57,7 +57,7 @@ class labelBits inline static label pack(const label val, const direction bits) { -# ifdef FULLDEBUG + #ifdef FULLDEBUG if (bits > 7 || (((val<<3)>>3) != val)) { FatalErrorInFunction @@ -66,7 +66,7 @@ class labelBits << label(8*sizeof(label)-3) << " bit representation" << abort(FatalError); } -# endif + #endif return (val<<3) | bits; } diff --git a/src/OpenFOAM/db/Callback/Callback.H b/src/OpenFOAM/db/Callback/Callback.H index c4ef97059..b68e13e1e 100644 --- a/src/OpenFOAM/db/Callback/Callback.H +++ b/src/OpenFOAM/db/Callback/Callback.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -99,7 +99,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "Callback.C" + #include "Callback.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H b/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H index 71777c2c0..e2481e647 100644 --- a/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H +++ b/src/OpenFOAM/db/CallbackRegistry/CallbackRegistry.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -98,7 +98,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "CallbackRegistry.C" + #include "CallbackRegistry.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H index f7bdf4b48..231119e6a 100644 --- a/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H +++ b/src/OpenFOAM/db/IOobjects/CompactIOField/CompactIOField.H @@ -130,7 +130,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "CompactIOField.C" + #include "CompactIOField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H index 7c8628ef1..9abb60121 100644 --- a/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H +++ b/src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.H @@ -149,7 +149,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "CompactIOList.C" + #include "CompactIOList.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.H b/src/OpenFOAM/db/IOobjects/IOField/IOField.H index 29768ee62..c5029307d 100644 --- a/src/OpenFOAM/db/IOobjects/IOField/IOField.H +++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.H @@ -98,7 +98,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "IOField.C" + #include "IOField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/IOobjects/IOList/IOList.H b/src/OpenFOAM/db/IOobjects/IOList/IOList.H index 8a54d99aa..ea5b42dc5 100644 --- a/src/OpenFOAM/db/IOobjects/IOList/IOList.H +++ b/src/OpenFOAM/db/IOobjects/IOList/IOList.H @@ -99,7 +99,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "IOList.C" + #include "IOList.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H index 5d9cae6b5..0f2afa982 100644 --- a/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H +++ b/src/OpenFOAM/db/IOobjects/IOMap/IOMap.H @@ -101,7 +101,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "IOMap.C" + #include "IOMap.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H index cef88c460..09df9ba72 100644 --- a/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H +++ b/src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.H @@ -101,7 +101,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "IOPtrList.C" + #include "IOPtrList.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H index 5eefb98e9..984110e31 100644 --- a/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H +++ b/src/OpenFOAM/db/IOstreams/IOstreams/Istream.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -181,7 +181,7 @@ inline Istream& operator>>(Istream& is, IOstreamManip f) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "HashTable.C" + #include "HashTable.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H index 2a0ebd43b..266849bba 100644 --- a/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H +++ b/src/OpenFOAM/db/IOstreams/Pstreams/Pstream.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -328,10 +328,10 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "gatherScatter.C" -# include "combineGatherScatter.C" -# include "gatherScatterList.C" -# include "exchange.C" + #include "gatherScatter.C" + #include "combineGatherScatter.C" + #include "gatherScatterList.C" + #include "exchange.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.H b/src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.H index 72b38e5ec..b4188f75f 100644 --- a/src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.H +++ b/src/OpenFOAM/db/IOstreams/Sstreams/ReadHex.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,7 +53,7 @@ T ReadHex(ISstream&); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "ReadHex.C" + #include "ReadHex.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H index 040e829fb..33c1528ba 100644 --- a/src/OpenFOAM/db/dictionary/dictionary.H +++ b/src/OpenFOAM/db/dictionary/dictionary.H @@ -554,7 +554,7 @@ dictionary operator|(const dictionary& dict1, const dictionary& dict2); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "dictionaryTemplates.C" + #include "dictionaryTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H index 35314c46e..74392ebda 100644 --- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H +++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.H @@ -194,7 +194,7 @@ Ostream& operator<<(Ostream&, const InfoProxy&); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "primitiveEntryTemplates.C" + #include "primitiveEntryTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H index 6def8c458..1f3936c57 100644 --- a/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H +++ b/src/OpenFOAM/db/dynamicLibrary/dlLibraryTable/dlLibraryTable.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -117,7 +117,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "dlLibraryTableTemplates.C" + #include "dlLibraryTableTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H index f46683269..77b248f7e 100644 --- a/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H +++ b/src/OpenFOAM/db/functionObjects/IOOutputFilter/IOOutputFilter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -154,7 +154,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "IOOutputFilter.C" + #include "IOOutputFilter.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H index 6e874dc52..05b794d5e 100644 --- a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H +++ b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -232,7 +232,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "OutputFilterFunctionObject.C" + #include "OutputFilterFunctionObject.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H index 2352b3a3b..bae145b04 100644 --- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H +++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -235,7 +235,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "objectRegistryTemplates.C" + #include "objectRegistryTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/db/typeInfo/className.H b/src/OpenFOAM/db/typeInfo/className.H index 745da10fc..46ab38152 100644 --- a/src/OpenFOAM/db/typeInfo/className.H +++ b/src/OpenFOAM/db/typeInfo/className.H @@ -100,11 +100,11 @@ public: \ defineTypeNameWithName(Type, Type::typeName_()) //- Define the typeName as \a Name for template classes -# define defineTemplateTypeNameWithName(Type, Name) \ +#define defineTemplateTypeNameWithName(Type, Name) \ template<> \ defineTypeNameWithName(Type, Name) //- Define the typeName as \a Name for template sub-classes -# define defineTemplate2TypeNameWithName(Type, Name) \ +#define defineTemplate2TypeNameWithName(Type, Name) \ template<> \ defineTypeNameWithName(Type, Name) diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H index b4817d45e..946b28baf 100644 --- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H +++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H @@ -340,7 +340,7 @@ PRODUCT_OPERATOR(scalarProduct, &&, dotdot) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "dimensionedType.C" + #include "dimensionedType.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H index f90f9bfe2..2f5034c0f 100644 --- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H +++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H @@ -348,7 +348,7 @@ public: #include "DimensionedFieldFunctions.H" #ifdef NoRepository -# include "DimensionedField.C" + #include "DimensionedField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H index efd3b9c23..0a9eeae38 100644 --- a/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H +++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedScalarField/DimensionedScalarField.H @@ -152,7 +152,7 @@ BesselFunc(yn) #include "undefFieldFunctionsM.H" #ifdef NoRepository -# include "DimensionedScalarField.C" + #include "DimensionedScalarField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedSphericalTensorField/DimensionedSphericalTensorField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedSphericalTensorField/DimensionedSphericalTensorField.H index 2b7cb73ef..6a94e7a39 100644 --- a/src/OpenFOAM/fields/DimensionedFields/DimensionedSphericalTensorField/DimensionedSphericalTensorField.H +++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedSphericalTensorField/DimensionedSphericalTensorField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -66,7 +66,7 @@ BINARY_TYPE_OPERATOR(sphericalTensor, scalar, sphericalTensor, /, '|', divide) #include "undefFieldFunctionsM.H" #ifdef NoRepository -# include "DimensionedSphericalTensorField.C" + #include "DimensionedSphericalTensorField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedSymmTensorField/DimensionedSymmTensorField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedSymmTensorField/DimensionedSymmTensorField.H index 01f8c2a03..b046816f2 100644 --- a/src/OpenFOAM/fields/DimensionedFields/DimensionedSymmTensorField/DimensionedSymmTensorField.H +++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedSymmTensorField/DimensionedSymmTensorField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -76,7 +76,7 @@ UNARY_OPERATOR(vector, symmTensor, *, hdual, transform) #include "undefFieldFunctionsM.H" #ifdef NoRepository -# include "DimensionedSymmTensorField.C" + #include "DimensionedSymmTensorField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.H index d0a62746a..8b20379d7 100644 --- a/src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.H +++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -81,7 +81,7 @@ UNARY_OPERATOR(tensor, vector, *, hdual, transform) #include "undefFieldFunctionsM.H" #ifdef NoRepository -# include "DimensionedTensorField.C" + #include "DimensionedTensorField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C index 2324b86e1..940afea59 100644 --- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C +++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.C @@ -387,6 +387,6 @@ Ostream& operator<<(Ostream& os, const tmp>& tf) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -# include "FieldFieldFunctions.C" + #include "FieldFieldFunctions.C" // ************************************************************************* // diff --git a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H index 40e3f2c24..2f2b27353 100644 --- a/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H +++ b/src/OpenFOAM/fields/FieldFields/FieldField/FieldField.H @@ -195,7 +195,7 @@ public: #include "FieldFieldFunctions.H" #ifdef NoRepository -# include "FieldField.C" + #include "FieldField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldField.H b/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldField.H index 3fb0e4763..4b1c9e084 100644 --- a/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldField.H +++ b/src/OpenFOAM/fields/FieldFields/oneFieldField/oneFieldField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -74,7 +74,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -# include "oneFieldFieldI.H" + #include "oneFieldFieldI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H index 208a71907..43e641891 100644 --- a/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H +++ b/src/OpenFOAM/fields/FieldFields/scalarFieldField/scalarFieldField.H @@ -153,7 +153,7 @@ BesselFunc(yn) #include "undefFieldFunctionsM.H" #ifdef NoRepository -# include "scalarFieldField.C" + #include "scalarFieldField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/FieldFields/sphericalTensorFieldField/sphericalTensorFieldField.H b/src/OpenFOAM/fields/FieldFields/sphericalTensorFieldField/sphericalTensorFieldField.H index b3b84d6a1..cc8821313 100644 --- a/src/OpenFOAM/fields/FieldFields/sphericalTensorFieldField/sphericalTensorFieldField.H +++ b/src/OpenFOAM/fields/FieldFields/sphericalTensorFieldField/sphericalTensorFieldField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -69,7 +69,7 @@ BINARY_TYPE_OPERATOR(sphericalTensor, scalar, sphericalTensor, /, divide) #include "undefFieldFunctionsM.H" #ifdef NoRepository -# include "sphericalTensorFieldField.C" + #include "sphericalTensorFieldField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.H b/src/OpenFOAM/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.H index 3e2810133..374257534 100644 --- a/src/OpenFOAM/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.H +++ b/src/OpenFOAM/fields/FieldFields/symmTensorFieldField/symmTensorFieldField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -79,7 +79,7 @@ BINARY_TYPE_OPERATOR(tensor, symmTensor, symmTensor, &, dot) #include "undefFieldFunctionsM.H" #ifdef NoRepository -# include "symmTensorFieldField.C" + #include "symmTensorFieldField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/FieldFields/tensorFieldField/tensorFieldField.H b/src/OpenFOAM/fields/FieldFields/tensorFieldField/tensorFieldField.H index ad6d7a5ea..df227c129 100644 --- a/src/OpenFOAM/fields/FieldFields/tensorFieldField/tensorFieldField.H +++ b/src/OpenFOAM/fields/FieldFields/tensorFieldField/tensorFieldField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -83,7 +83,7 @@ BINARY_TYPE_OPERATOR(vector, vector, tensor, /, divide) #include "undefFieldFunctionsM.H" #ifdef NoRepository -# include "tensorFieldField.C" + #include "tensorFieldField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.H b/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.H index 2b313ac99..28cd31507 100644 --- a/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.H +++ b/src/OpenFOAM/fields/FieldFields/transformFieldField/transformFieldField.H @@ -113,7 +113,7 @@ tmp> transform // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "transformFieldField.C" + #include "transformFieldField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldField.H b/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldField.H index a351a7cb4..a48c83ffc 100644 --- a/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldField.H +++ b/src/OpenFOAM/fields/FieldFields/zeroFieldField/zeroFieldField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -74,7 +74,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -# include "zeroFieldFieldI.H" + #include "zeroFieldFieldI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H index 06165cbb4..60cff25b9 100644 --- a/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H +++ b/src/OpenFOAM/fields/Fields/DynamicField/DynamicField.H @@ -249,7 +249,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "DynamicField.C" + #include "DynamicField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H index 1d69ef80d..a5d01b47f 100644 --- a/src/OpenFOAM/fields/Fields/Field/Field.H +++ b/src/OpenFOAM/fields/Fields/Field/Field.H @@ -386,7 +386,7 @@ public: #include "FieldFunctions.H" #ifdef NoRepository -# include "Field.C" + #include "Field.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/Fields/oneField/oneField.H b/src/OpenFOAM/fields/Fields/oneField/oneField.H index 7512ee14f..1dbf35275 100644 --- a/src/OpenFOAM/fields/Fields/oneField/oneField.H +++ b/src/OpenFOAM/fields/Fields/oneField/oneField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -76,7 +76,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -# include "oneFieldI.H" + #include "oneFieldI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H index 5e25bf0e7..3b09762d2 100644 --- a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H +++ b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.H @@ -122,7 +122,7 @@ tmp> transformFieldMask // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "symmTransformField.C" + #include "symmTransformField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/Fields/transformField/transformField.H b/src/OpenFOAM/fields/Fields/transformField/transformField.H index e5bf3917a..efef059d9 100644 --- a/src/OpenFOAM/fields/Fields/transformField/transformField.H +++ b/src/OpenFOAM/fields/Fields/transformField/transformField.H @@ -134,7 +134,7 @@ tmp transform(const septernion&, const tmp&); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "transformFieldTemplates.C" + #include "transformFieldTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/Fields/transformList/transformList.H b/src/OpenFOAM/fields/Fields/transformList/transformList.H index 2da8e3947..1d0820063 100644 --- a/src/OpenFOAM/fields/Fields/transformList/transformList.H +++ b/src/OpenFOAM/fields/Fields/transformList/transformList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -145,7 +145,7 @@ inline void transformList(const tensorField&, EdgeMap&) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "transformList.C" + #include "transformList.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H index 5c27f055d..4efc05d30 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H @@ -618,7 +618,7 @@ Ostream& operator<< #include "GeometricFieldI.H" #ifdef NoRepository -# include "GeometricField.C" + #include "GeometricField.C" #endif #include "GeometricFieldFunctions.H" diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.H index 4cf01dcf9..5174d91fd 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.H +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.H @@ -77,7 +77,7 @@ tmp uniformInterpolate // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "uniformInterpolate.C" + #include "uniformInterpolate.C" #endif // ************************************************************************* // diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H index 65ebaf930..950b52679 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H +++ b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.H @@ -168,7 +168,7 @@ BesselFunc(yn) #include "undefFieldFunctionsM.H" #ifdef NoRepository -# include "GeometricScalarField.C" + #include "GeometricScalarField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricSphericalTensorField/GeometricSphericalTensorField.H b/src/OpenFOAM/fields/GeometricFields/GeometricSphericalTensorField/GeometricSphericalTensorField.H index 94a48d134..e2a49fb04 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricSphericalTensorField/GeometricSphericalTensorField.H +++ b/src/OpenFOAM/fields/GeometricFields/GeometricSphericalTensorField/GeometricSphericalTensorField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -66,7 +66,7 @@ BINARY_TYPE_OPERATOR(sphericalTensor, scalar, sphericalTensor, /, '|', divide) #include "undefFieldFunctionsM.H" #ifdef NoRepository -# include "GeometricSphericalTensorField.C" + #include "GeometricSphericalTensorField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.H b/src/OpenFOAM/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.H index 5706894bb..53a424561 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.H +++ b/src/OpenFOAM/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -79,7 +79,7 @@ BINARY_TYPE_OPERATOR(tensor, symmTensor, symmTensor, &, '&', dot) #include "undefFieldFunctionsM.H" #ifdef NoRepository -# include "GeometricSymmTensorField.C" + #include "GeometricSymmTensorField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H b/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H index e88d0e6cb..0479e636e 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H +++ b/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -85,7 +85,7 @@ BINARY_TYPE_OPERATOR(vector, vector, tensor, /, '|', divide) #include "undefFieldFunctionsM.H" #ifdef NoRepository -# include "GeometricTensorField.C" + #include "GeometricTensorField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H index 594315715..716225e3f 100644 --- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H +++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.H @@ -215,7 +215,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "SlicedGeometricField.C" + #include "SlicedGeometricField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H index e83c2c0d5..d57bfbea9 100644 --- a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H +++ b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -97,7 +97,7 @@ inline const geometricOneField& operator/ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -# include "geometricOneFieldI.H" + #include "geometricOneFieldI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroField.H b/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroField.H index 7e5aa9102..0eb7c8723 100644 --- a/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroField.H +++ b/src/OpenFOAM/fields/GeometricFields/geometricZeroField/geometricZeroField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -84,7 +84,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -# include "geometricZeroFieldI.H" + #include "geometricZeroFieldI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.H b/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.H index 36307c90a..77c95e742 100644 --- a/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.H +++ b/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.H @@ -112,7 +112,7 @@ tmp> transform // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "transformGeometricField.C" + #include "transformGeometricField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/ReadFields/ReadFields.H b/src/OpenFOAM/fields/ReadFields/ReadFields.H index ac4bdb37c..5d6e9db57 100644 --- a/src/OpenFOAM/fields/ReadFields/ReadFields.H +++ b/src/OpenFOAM/fields/ReadFields/ReadFields.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -82,7 +82,7 @@ static void ReadFields // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "ReadFields.C" + #include "ReadFields.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H index 5a19a4e49..767e4daf0 100644 --- a/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H +++ b/src/OpenFOAM/fields/UniformDimensionedFields/UniformDimensionedField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -109,7 +109,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "UniformDimensionedField.C" + #include "UniformDimensionedField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H index 45f1945ad..3529c77b7 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.H @@ -136,7 +136,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "basicSymmetryPointPatchField.C" + #include "basicSymmetryPointPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H index b33100036..afea0505b 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/basic/calculated/calculatedPointPatchField.H @@ -126,7 +126,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "calculatedPointPatchField.C" + #include "calculatedPointPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H index 283c8cf3b..d9cac6941 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/basic/coupled/coupledPointPatchField.H @@ -143,7 +143,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "coupledPointPatchField.C" + #include "coupledPointPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H index 1e101b8f8..7b3c15267 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/basic/fixedValue/fixedValuePointPatchField.H @@ -148,7 +148,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "fixedValuePointPatchField.C" + #include "fixedValuePointPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H index aedb5b5ce..298eabeec 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.H @@ -226,7 +226,7 @@ tmp> operator+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "valuePointPatchField.C" + #include "valuePointPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H index 6f288f86a..26d34f8cb 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/basic/zeroGradient/zeroGradientPointPatchField.H @@ -128,7 +128,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "zeroGradientPointPatchField.C" + #include "zeroGradientPointPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H index 981f7ee0d..50b4afbe6 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.H @@ -181,7 +181,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "cyclicPointPatchField.C" + #include "cyclicPointPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H index b33f1ed47..22b39163e 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.H @@ -140,7 +140,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "cyclicSlipPointPatchField.C" + #include "cyclicSlipPointPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H index 6f7dfda20..3cac7561d 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/empty/emptyPointPatchField.H @@ -140,7 +140,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "emptyPointPatchField.C" + #include "emptyPointPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H index 8a3c17e45..b6ef3e2a8 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.H @@ -140,7 +140,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "nonuniformTransformCyclicPointPatchField.C" + #include "nonuniformTransformCyclicPointPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H index 68565fa3f..c8028b471 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processor/processorPointPatchField.H @@ -192,7 +192,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "processorPointPatchField.C" + #include "processorPointPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H index bca065d7a..2859591be 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/processorCyclic/processorCyclicPointPatchField.H @@ -193,7 +193,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "processorCyclicPointPatchField.C" + #include "processorCyclicPointPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H index 098f484e8..01278db9a 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetry/symmetryPointPatchField.H @@ -139,7 +139,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "symmetryPointPatchField.C" + #include "symmetryPointPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H index 4090b6b9f..acbba86d2 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.H @@ -151,7 +151,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "symmetryPlanePointPatchField.C" + #include "symmetryPlanePointPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H index 27270b5fd..e14fb992e 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.H @@ -147,7 +147,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "wedgePointPatchField.C" + #include "wedgePointPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H index bc2a08de6..19c775ab7 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.H @@ -245,7 +245,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "codedFixedValuePointPatchField.C" + #include "codedFixedValuePointPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H index fa0692d96..cff5af3d6 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.H @@ -160,7 +160,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "fixedNormalSlipPointPatchField.C" + #include "fixedNormalSlipPointPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H index f21b4ef1b..4847b7367 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/derived/slip/slipPointPatchField.H @@ -128,7 +128,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "slipPointPatchField.C" + #include "slipPointPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.H index 40c18a6dc..2880afa4c 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/derived/timeVaryingUniformFixedValue/timeVaryingUniformFixedValuePointPatchField.H @@ -157,7 +157,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "timeVaryingUniformFixedValuePointPatchField.C" + #include "timeVaryingUniformFixedValuePointPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H index d0d76fd08..02adc8dc9 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.H @@ -173,7 +173,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "uniformFixedValuePointPatchField.C" + #include "uniformFixedValuePointPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H index bf77b43ac..d69b75f37 100644 --- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H @@ -496,8 +496,8 @@ const pointPatchField& operator+ #include "pointPatchFieldFunctions.H" #ifdef NoRepository -# include "pointPatchField.C" -# include "calculatedPointPatchField.H" + #include "pointPatchField.C" + #include "calculatedPointPatchField.H" #endif diff --git a/src/OpenFOAM/global/debug/defineDebugSwitch.H b/src/OpenFOAM/global/debug/defineDebugSwitch.H index 219d01c34..f71e960f4 100644 --- a/src/OpenFOAM/global/debug/defineDebugSwitch.H +++ b/src/OpenFOAM/global/debug/defineDebugSwitch.H @@ -115,12 +115,12 @@ public: registerDebugSwitchWithName(Type, Type, Type::typeName_()) //- Define the debug information for templates, lookup as \a Name -# define defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch) \ +#define defineTemplateDebugSwitchWithName(Type, Name, DebugSwitch) \ template<> \ defineDebugSwitchWithName(Type, Name, DebugSwitch); \ registerTemplateDebugSwitchWithName(Type, Name) //- Define the debug information for templates sub-classes, lookup as \a Name -# define defineTemplate2DebugSwitchWithName(Type, Name, DebugSwitch) \ +#define defineTemplate2DebugSwitchWithName(Type, Name, DebugSwitch) \ template<> \ defineDebugSwitchWithName(Type, Name, DebugSwitch); \ registerTemplateDebugSwitchWithName(Type, Name) diff --git a/src/OpenFOAM/interpolations/interpolatePointToCell/interpolatePointToCell.H b/src/OpenFOAM/interpolations/interpolatePointToCell/interpolatePointToCell.H index efb999078..05194148f 100644 --- a/src/OpenFOAM/interpolations/interpolatePointToCell/interpolatePointToCell.H +++ b/src/OpenFOAM/interpolations/interpolatePointToCell/interpolatePointToCell.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -62,7 +62,7 @@ Type interpolatePointToCell // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "interpolatePointToCell.C" + #include "interpolatePointToCell.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/interpolations/interpolateSplineXY/interpolateSplineXY.H b/src/OpenFOAM/interpolations/interpolateSplineXY/interpolateSplineXY.H index 57a49b423..d99af5575 100644 --- a/src/OpenFOAM/interpolations/interpolateSplineXY/interpolateSplineXY.H +++ b/src/OpenFOAM/interpolations/interpolateSplineXY/interpolateSplineXY.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -73,7 +73,7 @@ Type interpolateSplineXY // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "interpolateSplineXY.C" + #include "interpolateSplineXY.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/interpolations/interpolateXY/interpolateXY.H b/src/OpenFOAM/interpolations/interpolateXY/interpolateXY.H index cf4abd786..ea6d6e215 100644 --- a/src/OpenFOAM/interpolations/interpolateXY/interpolateXY.H +++ b/src/OpenFOAM/interpolations/interpolateXY/interpolateXY.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -71,7 +71,7 @@ Type interpolateXY // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "interpolateXY.C" + #include "interpolateXY.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H index be6fb45e3..7555239bb 100644 --- a/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H +++ b/src/OpenFOAM/interpolations/interpolation2DTable/interpolation2DTable.H @@ -167,7 +167,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "interpolation2DTable.C" + #include "interpolation2DTable.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.H b/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.H index e71f902d8..019c3738e 100644 --- a/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.H +++ b/src/OpenFOAM/interpolations/interpolationLookUpTable/interpolationLookUpTable.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -221,7 +221,7 @@ public: #include "interpolationLookUpTableI.H" #ifdef NoRepository -# include "interpolationLookUpTable.C" + #include "interpolationLookUpTable.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H index 83382d343..fc34afbd8 100644 --- a/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H +++ b/src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H @@ -179,7 +179,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "interpolationTable.C" + #include "interpolationTable.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H index 46949da45..d1bc29c33 100644 --- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H +++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H @@ -122,7 +122,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "csvTableReader.C" + #include "csvTableReader.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H index ee44fe679..035c17887 100644 --- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H +++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/openFoam/openFoamTableReader.H @@ -101,7 +101,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "openFoamTableReader.C" + #include "openFoamTableReader.C" #endif diff --git a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H index 7540e37fa..53cb930af 100644 --- a/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H +++ b/src/OpenFOAM/interpolations/interpolationTable/tableReaders/tableReader.H @@ -122,7 +122,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "tableReader.C" + #include "tableReader.C" #endif diff --git a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H index 36e347283..131cfeb93 100644 --- a/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H +++ b/src/OpenFOAM/interpolations/interpolationWeights/interpolationWeights/interpolationWeights.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -149,7 +149,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "interpolationWeightsTemplates.C" + #include "interpolationWeightsTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.C index 2cc2a88c1..3f5d9baba 100644 --- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.C +++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -182,7 +182,7 @@ bool PatchToPatchInterpolation::movePoints() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -# include "CalcPatchToPatchWeights.C" -# include "PatchToPatchInterpolate.C" + #include "CalcPatchToPatchWeights.C" + #include "PatchToPatchInterpolate.C" // ************************************************************************* // diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H index 04cea8be2..9af12426f 100644 --- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H +++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolation.H @@ -228,7 +228,7 @@ public: } // End namespace Foam #ifdef NoRepository -# include "PatchToPatchInterpolation.C" + #include "PatchToPatchInterpolation.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H index 14f222877..f0663606c 100644 --- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H +++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.H @@ -156,7 +156,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "PrimitivePatchInterpolation.C" + #include "PrimitivePatchInterpolation.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H index a065b3aec..8fdf3e972 100644 --- a/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H +++ b/src/OpenFOAM/matrices/DiagonalMatrix/DiagonalMatrix.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -95,7 +95,7 @@ DiagonalMatrix inv(const DiagonalMatrix&); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "DiagonalMatrix.C" + #include "DiagonalMatrix.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H index 9c96d8dd2..226cd63a8 100644 --- a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H +++ b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -120,7 +120,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "LUscalarMatrixTemplates.C" + #include "LUscalarMatrixTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H index aa21af6b4..289649f2a 100644 --- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H +++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduInterfaceField/LduInterfaceField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -124,7 +124,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "LduInterfaceField.C" + #include "LduInterfaceField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H index 55081e89a..1da27f106 100644 --- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H +++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/LduMatrix.H @@ -794,8 +794,8 @@ LduMatrix::solver:: \ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "LduMatrixI.H" -# include "LduMatrix.C" + #include "LduMatrixI.H" + #include "LduMatrix.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H index 9781cf42c..a933e1aec 100644 --- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H +++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H @@ -291,7 +291,7 @@ const scalar solverPerformance##Type::vsmall_(VSMALL); \ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "SolverPerformance.C" + #include "SolverPerformance.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DILUPreconditioner/TDILUPreconditioner.H b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DILUPreconditioner/TDILUPreconditioner.H index da46f8185..075f2087a 100644 --- a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DILUPreconditioner/TDILUPreconditioner.H +++ b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DILUPreconditioner/TDILUPreconditioner.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -116,7 +116,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "TDILUPreconditioner.C" + #include "TDILUPreconditioner.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H index 93eca754e..f35342aa8 100644 --- a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H +++ b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/DiagonalPreconditioner/DiagonalPreconditioner.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -124,7 +124,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "DiagonalPreconditioner.C" + #include "DiagonalPreconditioner.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H index bf8b10d24..856b4673f 100644 --- a/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H +++ b/src/OpenFOAM/matrices/LduMatrix/Preconditioners/NoPreconditioner/NoPreconditioner.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -115,7 +115,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "NoPreconditioner.C" + #include "NoPreconditioner.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.H b/src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.H index 262759298..839aff7a1 100644 --- a/src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.H +++ b/src/OpenFOAM/matrices/LduMatrix/Smoothers/GaussSeidel/TGaussSeidelSmoother.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -102,7 +102,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "TGaussSeidelSmoother.C" + #include "TGaussSeidelSmoother.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H index b9dc537c0..cd771ed8b 100644 --- a/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H +++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/DiagonalSolver/DiagonalSolver.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -94,7 +94,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "DiagonalSolver.C" + #include "DiagonalSolver.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H index 39c0e56d4..7ebf51669 100644 --- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H +++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -98,7 +98,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "PBiCCCG.C" + #include "PBiCCCG.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H index 1265af2aa..6c848f418 100644 --- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H +++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -98,7 +98,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "PBiCICG.C" + #include "PBiCICG.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H index cafeb7f61..56764df93 100644 --- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H +++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -98,7 +98,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "PCICG.C" + #include "PCICG.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.H b/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.H index 54db11be8..cc073477c 100644 --- a/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.H +++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/SmoothSolver/SmoothSolver.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -97,7 +97,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "SmoothSolver.C" + #include "SmoothSolver.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/Matrix/Matrix.H b/src/OpenFOAM/matrices/Matrix/Matrix.H index dc8e1f9e8..8455ac997 100644 --- a/src/OpenFOAM/matrices/Matrix/Matrix.H +++ b/src/OpenFOAM/matrices/Matrix/Matrix.H @@ -227,12 +227,12 @@ template Form operator* // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -# include "MatrixI.H" + #include "MatrixI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "Matrix.C" + #include "Matrix.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/Matrix/MatrixI.H b/src/OpenFOAM/matrices/Matrix/MatrixI.H index 07e987580..613285c70 100644 --- a/src/OpenFOAM/matrices/Matrix/MatrixI.H +++ b/src/OpenFOAM/matrices/Matrix/MatrixI.H @@ -114,9 +114,9 @@ inline void Foam::Matrix::checkj(const label j) const template inline Type* Foam::Matrix::operator[](const label i) { -# ifdef FULLDEBUG + #ifdef FULLDEBUG checki(i); -# endif + #endif return v_[i]; } @@ -124,9 +124,9 @@ inline Type* Foam::Matrix::operator[](const label i) template inline const Type* Foam::Matrix::operator[](const label i) const { -# ifdef FULLDEBUG + #ifdef FULLDEBUG checki(i); -# endif + #endif return v_[i]; } diff --git a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H index 3938728b3..270891a95 100644 --- a/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H +++ b/src/OpenFOAM/matrices/SquareMatrix/SquareMatrix.H @@ -102,12 +102,12 @@ scalar det(SquareMatrix&); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -# include "SquareMatrixI.H" + #include "SquareMatrixI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "SquareMatrix.C" + #include "SquareMatrix.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H index f6fee5f73..a5050b24c 100644 --- a/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H +++ b/src/OpenFOAM/matrices/SymmetricSquareMatrix/SymmetricSquareMatrix.H @@ -111,12 +111,12 @@ scalar det(const SymmetricSquareMatrix&); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -# include "SymmetricSquareMatrixI.H" + #include "SymmetricSquareMatrixI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "SymmetricSquareMatrix.C" + #include "SymmetricSquareMatrix.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H index 2ca3c7290..9a9f9ddd8 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H +++ b/src/OpenFOAM/matrices/lduMatrix/lduAddressing/lduInterface/processorLduInterface.H @@ -159,7 +159,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "processorLduInterfaceTemplates.C" + #include "processorLduInterfaceTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H index 5d5d62fd4..771317ed7 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H +++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H @@ -735,7 +735,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "lduMatrixTemplates.C" + #include "lduMatrixTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H index edcc01d6e..ff9030ff8 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -494,7 +494,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "GAMGAgglomerationTemplates.C" + #include "GAMGAgglomerationTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H index dea8a20d3..c1b8009f2 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/GAMGInterface/GAMGInterface.H @@ -287,7 +287,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "GAMGInterfaceTemplates.C" + #include "GAMGInterfaceTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.H b/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.H index f01a46f1e..8cf58611d 100644 --- a/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.H +++ b/src/OpenFOAM/matrices/scalarMatrices/scalarMatrices.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -160,7 +160,7 @@ scalarRectangularMatrix SVDinv // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "scalarMatricesTemplates.C" + #include "scalarMatricesTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.H b/src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.H index 62cefec4b..ddf2e9508 100644 --- a/src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.H +++ b/src/OpenFOAM/matrices/simpleMatrix/simpleMatrix.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -162,7 +162,7 @@ simpleMatrix operator* // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "simpleMatrix.C" + #include "simpleMatrix.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/matrices/solution/solution.H b/src/OpenFOAM/matrices/solution/solution.H index e6a8040c7..f106450b0 100644 --- a/src/OpenFOAM/matrices/solution/solution.H +++ b/src/OpenFOAM/matrices/solution/solution.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -158,7 +158,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "solutionTemplates.C" + #include "solutionTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/MeshObject/MeshObject.H b/src/OpenFOAM/meshes/MeshObject/MeshObject.H index bc844bd1e..d1e9cf1f4 100644 --- a/src/OpenFOAM/meshes/MeshObject/MeshObject.H +++ b/src/OpenFOAM/meshes/MeshObject/MeshObject.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -278,7 +278,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "MeshObject.C" + #include "MeshObject.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.H b/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.H index ef1ad593d..90923a88c 100644 --- a/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.H +++ b/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -115,7 +115,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "ProcessorTopology.C" + #include "ProcessorTopology.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/boundBox/boundBox.H b/src/OpenFOAM/meshes/boundBox/boundBox.H index 9a9821b53..a340a90c0 100644 --- a/src/OpenFOAM/meshes/boundBox/boundBox.H +++ b/src/OpenFOAM/meshes/boundBox/boundBox.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -256,7 +256,7 @@ inline bool contiguous() {return contiguous();} #include "boundBoxI.H" #ifdef NoRepository -# include "boundBoxTemplates.C" + #include "boundBoxTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/data/data.H b/src/OpenFOAM/meshes/data/data.H index c5b7758e9..615834836 100644 --- a/src/OpenFOAM/meshes/data/data.H +++ b/src/OpenFOAM/meshes/data/data.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -114,7 +114,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "dataTemplates.C" + #include "dataTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/lduMesh/lduMesh.H b/src/OpenFOAM/meshes/lduMesh/lduMesh.H index d8700b106..f42413294 100644 --- a/src/OpenFOAM/meshes/lduMesh/lduMesh.H +++ b/src/OpenFOAM/meshes/lduMesh/lduMesh.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -112,7 +112,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "lduMeshTemplates.C" + #include "lduMeshTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H index e94850f4b..7561554b6 100644 --- a/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H +++ b/src/OpenFOAM/meshes/lduMesh/lduPrimitiveMesh.H @@ -271,7 +271,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "lduPrimitiveMeshTemplates.C" + #include "lduPrimitiveMeshTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.H b/src/OpenFOAM/meshes/meshShapes/face/face.H index afb9b4549..ca5fd198a 100644 --- a/src/OpenFOAM/meshes/meshShapes/face/face.H +++ b/src/OpenFOAM/meshes/meshShapes/face/face.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -426,7 +426,7 @@ label longestEdge(const face& f, const pointField& pts); #include "faceI.H" #ifdef NoRepository -# include "faceTemplates.C" + #include "faceTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellI.H b/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellI.H index 218fa12e9..d4f424b6c 100644 --- a/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellI.H +++ b/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -70,14 +70,14 @@ inline Foam::triFace Foam::tetCell::face(const label faceI) const static const label b[] = {2, 3, 1, 2}; static const label c[] = {3, 2, 3, 1}; -# ifdef FULLDEBUG + #ifdef FULLDEBUG if (faceI >= 4) { FatalErrorInFunction << "index out of range 0 -> 3. faceI = " << faceI << abort(FatalError); } -# endif + #endif return triFace ( @@ -95,14 +95,14 @@ inline Foam::label Foam::tetCell::edgeFace(const label edgeI) const //static const label edgeFaces[6] = {2, 1, 1, 0, 0, 0}; static const label edgeFaces[6] = {2, 3, 1, 0, 0, 1}; -# ifdef FULLDEBUG + #ifdef FULLDEBUG if (edgeI >= 6) { FatalErrorInFunction << "edge index out of range 0 -> 5. edgeI = " << edgeI << abort(FatalError); } -# endif + #endif return edgeFaces[edgeI]; } @@ -126,7 +126,7 @@ inline Foam::label Foam::tetCell::edgeAdjacentFace {1, 0, -1, -1} }; -# ifdef FULLDEBUG + #ifdef FULLDEBUG if (faceI >= 4) { FatalErrorInFunction @@ -140,7 +140,7 @@ inline Foam::label Foam::tetCell::edgeAdjacentFace << "edge index out of range 0 -> 5. edgeI = " << edgeI << abort(FatalError); } -# endif + #endif return adjacentFace[edgeI][faceI]; } @@ -154,14 +154,14 @@ inline Foam::edge Foam::tetCell::tetEdge(const label edgeI) const static const label start[] = {0, 0, 0, 3, 1, 3}; static const label end[] = {1, 2, 3, 1, 2, 2}; -# ifdef FULLDEBUG + #ifdef FULLDEBUG if (edgeI >= 6) { FatalErrorInFunction << "index out of range 0 -> 5. edgeI = " << edgeI << abort(FatalError); } -# endif + #endif return edge(operator[](start[edgeI]), operator[](end[edgeI])); } diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H index 892fd6d48..2a66556d2 100644 --- a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H +++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -293,7 +293,7 @@ public: #include "triFaceI.H" #ifdef NoRepository -# include "triFaceTemplates.C" + #include "triFaceTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/meshTools/mergePoints.H b/src/OpenFOAM/meshes/meshTools/mergePoints.H index 92f1f1071..37d41f3e7 100644 --- a/src/OpenFOAM/meshes/meshTools/mergePoints.H +++ b/src/OpenFOAM/meshes/meshTools/mergePoints.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -74,7 +74,7 @@ bool mergePoints // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "mergePoints.C" + #include "mergePoints.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndex.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndex.H index 3a6d49e75..129b477be 100644 --- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndex.H +++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalIndex.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -251,7 +251,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "globalIndexTemplates.C" + #include "globalIndexTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H index 3c1cb48cb..2362f9382 100644 --- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H +++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H @@ -625,7 +625,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "globalMeshDataTemplates.C" + #include "globalMeshDataTemplates.C" #endif diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H index 8a5b06d44..f209610e0 100644 --- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H +++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H @@ -771,7 +771,7 @@ void mapDistribute::transform::operator() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "mapDistributeTemplates.C" + #include "mapDistributeTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H index cb1484b3b..281b891b6 100644 --- a/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H +++ b/src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -615,7 +615,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "syncToolsTemplates.C" + #include "syncToolsTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H index d0bb09902..06ee30f5e 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H +++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -204,7 +204,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "ZoneMesh.C" + #include "ZoneMesh.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H index 6eed70e62..648fd4a26 100644 --- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H +++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchTools.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -310,7 +310,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "PatchTools.C" + #include "PatchTools.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H index 0d7f235d8..e01541b6e 100644 --- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H +++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatch.H @@ -473,7 +473,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "PrimitivePatch.C" + #include "PrimitivePatch.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H index 6ecdfddba..954cffdab 100644 --- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H +++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -327,7 +327,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "tetrahedron.C" + #include "tetrahedron.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H index 6648ba7bc..24a68e8fd 100644 --- a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H +++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -362,7 +362,7 @@ inline bool contiguous() {return contiguous();} #include "treeBoundBoxI.H" #ifdef NoRepository -# include "treeBoundBoxTemplates.C" + #include "treeBoundBoxTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H index f9bf6dfc6..7a2bf4f91 100644 --- a/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H +++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpace.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -168,7 +168,7 @@ word name(const VectorSpace&); #include "VectorSpaceI.H" #ifdef NoRepository -# include "VectorSpace.C" + #include "VectorSpace.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H index 4752ea43f..7ba4fe169 100644 --- a/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H +++ b/src/OpenFOAM/primitives/VectorSpace/VectorSpaceI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -76,14 +76,14 @@ inline const Cmpt& VectorSpace::component const direction d ) const { -# ifdef FULLDEBUG + #ifdef FULLDEBUG if (d >= nCmpt) { FatalErrorInFunction << "index out of range" << abort(FatalError); } -# endif + #endif return v_[d]; } @@ -95,14 +95,14 @@ inline Cmpt& VectorSpace::component const direction d ) { -# ifdef FULLDEBUG + #ifdef FULLDEBUG if (d >= nCmpt) { FatalErrorInFunction << "index out of range" << abort(FatalError); } -# endif + #endif return v_[d]; } @@ -115,14 +115,14 @@ inline void VectorSpace::component const direction d ) const { -# ifdef FULLDEBUG + #ifdef FULLDEBUG if (d >= nCmpt) { FatalErrorInFunction << "index out of range" << abort(FatalError); } -# endif + #endif c = v_[d]; } @@ -135,14 +135,14 @@ inline void VectorSpace::replace const Cmpt& c ) { -# ifdef FULLDEBUG + #ifdef FULLDEBUG if (d >= nCmpt) { FatalErrorInFunction << "index out of range" << abort(FatalError); } -# endif + #endif v_[d] = c; } @@ -156,14 +156,14 @@ inline const Cmpt& VectorSpace::operator[] const direction d ) const { -# ifdef FULLDEBUG + #ifdef FULLDEBUG if (d >= nCmpt) { FatalErrorInFunction << "index out of range" << abort(FatalError); } -# endif + #endif return v_[d]; } @@ -175,14 +175,14 @@ inline Cmpt& VectorSpace::operator[] const direction d ) { -# ifdef FULLDEBUG + #ifdef FULLDEBUG if (d >= nCmpt) { FatalErrorInFunction << "index out of range" << abort(FatalError); } -# endif + #endif return v_[d]; } diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H index fd8f8d265..97e0047a2 100644 --- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H +++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H @@ -164,7 +164,7 @@ Foam::scalar CSV::readValue(const List& splitted); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "CSV.C" + #include "CSV.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H index eda6f2165..20b8a6870 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H +++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H @@ -121,8 +121,8 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "Constant.C" -# include "Function1New.C" + #include "Constant.C" + #include "Function1New.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H index 0e22404a4..fb71134ad 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H +++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H @@ -198,8 +198,8 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "Function1.C" -# include "Constant.H" + #include "Function1.C" + #include "Constant.H" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H index 93ddccbe6..5afa50275 100644 --- a/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H +++ b/src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H @@ -141,7 +141,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "PolynomialEntry.C" + #include "PolynomialEntry.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H index 00320d756..66c9f1105 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H +++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H @@ -168,7 +168,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "Sine.C" + #include "Sine.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/functions/Function1/Square/Square.H b/src/OpenFOAM/primitives/functions/Function1/Square/Square.H index 9ae5cd8b1..9ca2079c0 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Square/Square.H +++ b/src/OpenFOAM/primitives/functions/Function1/Square/Square.H @@ -175,7 +175,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "Square.C" + #include "Square.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H index ab1cafd9c..c11eb621d 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H +++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H @@ -104,7 +104,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "Table.C" + #include "Table.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H index 1f2ab0f46..9a1e228bb 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H +++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H @@ -175,7 +175,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "TableBase.C" + #include "TableBase.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H index 3bb7d0f81..a44ba48d7 100644 --- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H +++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H @@ -127,7 +127,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "TableFile.C" + #include "TableFile.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H index c48483021..b6f20330d 100644 --- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H +++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -168,8 +168,8 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "Polynomial.C" -# include "PolynomialIO.C" + #include "Polynomial.C" + #include "PolynomialIO.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H index 80f1ed0b6..5d89572d8 100644 --- a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H +++ b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H @@ -143,7 +143,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "TimeFunction1.C" + #include "TimeFunction1.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H index ddd43327e..e37e3fb37 100644 --- a/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H +++ b/src/OpenFOAM/primitives/globalIndexAndTransform/globalIndexAndTransformI.H @@ -157,7 +157,7 @@ Foam::globalIndexAndTransform::decodeTransformIndex } } -# ifdef FULLDEBUG + #ifdef FULLDEBUG t /= 3; if (t != 0) { @@ -166,7 +166,7 @@ Foam::globalIndexAndTransform::decodeTransformIndex << " has more than 3 fields." << abort(FatalError); } -# endif + #endif return permutation; } diff --git a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H index d56741a79..c4db7aa53 100644 --- a/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H +++ b/src/OpenFOAM/primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.H @@ -248,7 +248,7 @@ inline vectorTensorTransform operator& #include "vectorTensorTransformI.H" #ifdef NoRepository -# include "vectorTensorTransformTemplates.C" + #include "vectorTensorTransformTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C b/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C index 17e569798..b9f16b6b3 100644 --- a/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C +++ b/src/OpenFOAM/primitives/hashes/Hasher/Hasher.C @@ -29,7 +29,7 @@ Description #include "HasherInt.H" #if defined (__GLIBC__) -# include + #include #endif // Left-rotate a 32-bit value and carry by nBits @@ -480,11 +480,11 @@ unsigned Foam::Hasher ) { #ifdef __BYTE_ORDER -# if (__BYTE_ORDER == __BIG_ENDIAN) - return jenkins_hashbig(key, length, initval); -# else - return jenkins_hashlittle(key, length, initval); -# endif + #if (__BYTE_ORDER == __BIG_ENDIAN) + return jenkins_hashbig(key, length, initval); + #else + return jenkins_hashlittle(key, length, initval); + #endif #else // endian-ness not known at compile-time: runtime endian test const short endianTest = 0x0100; diff --git a/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C b/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C index 84c179262..43cb7ec47 100644 --- a/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C +++ b/src/OpenFOAM/primitives/hashes/SHA1/SHA1.C @@ -39,7 +39,7 @@ Description #include #if defined (__GLIBC__) -# include + #include #endif @@ -57,29 +57,9 @@ static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ... */ }; inline uint32_t Foam::SHA1::swapBytes(uint32_t n) { #ifdef __BYTE_ORDER - # if (__BYTE_ORDER == __BIG_ENDIAN) - return n; - # else - return - ( - ((n) << 24) - | (((n) & 0xff00) << 8) - | (((n) >> 8) & 0xff00) - | ((n) >> 24) - ); - # endif - - #else - - const short x = 0x0100; - - // yields 0x01 for big endian - if (*(reinterpret_cast(&x))) - { + #if (__BYTE_ORDER == __BIG_ENDIAN) return n; - } - else - { + #else return ( ((n) << 24) @@ -87,7 +67,25 @@ inline uint32_t Foam::SHA1::swapBytes(uint32_t n) | (((n) >> 8) & 0xff00) | ((n) >> 24) ); - } + #endif + #else + const short x = 0x0100; + + // yields 0x01 for big endian + if (*(reinterpret_cast(&x))) + { + return n; + } + else + { + return + ( + ((n) << 24) + | (((n) & 0xff00) << 8) + | (((n) >> 8) & 0xff00) + | ((n) >> 24) + ); + } #endif } diff --git a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H index 46f23adfe..539d8103b 100644 --- a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H +++ b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -224,7 +224,7 @@ label cachedRandom::globalPosition