From c778346c9667de5f4f86e5bb35d0ffb6ec463e16 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 10 Feb 2015 20:35:50 +0000 Subject: [PATCH] Formatting: Rationalized the indentation of #include --- .../basic/scalarTransportFoam/createFields.H | 2 +- .../mixedFixedValueSlipFvPatchField.H | 4 ++-- .../incompressible/icoFoam/createFields.H | 2 +- .../nonNewtonianIcoFoam/createFields.H | 2 +- .../shallowWaterFoam/createFields.H | 2 +- .../cavitatingFoam/setInitialDeltaT.H | 4 ++-- .../interMixingFoam/interMixingFoam.C | 2 +- .../multiphase/twoPhaseEulerFoam/CourantNos.H | 2 +- .../kOmegaSSTSato/kOmegaSSTSato.H | 4 ++-- .../BlendedInterfacialModel.H | 4 ++-- .../solidEquilibriumDisplacementFoam.C | 23 +++++++++---------- .../test/CompactIOList/Test-CompactIOList.C | 6 ++--- .../test/Distribution/Test-Distribution.C | 4 ++-- .../test/HashingSpeed/Test-HashingSpeed.C | 2 +- applications/test/List/Test-List.C | 4 ++-- .../Test-PatchEdgeFaceWave.C | 8 +++---- .../test/PatchTools/Test-PatchTools.C | 10 ++++---- .../test/PointEdgeWave/Test-PointEdgeWave.C | 8 +++---- applications/test/dataEntry/Test-DataEntry.C | 6 ++--- .../extendedStencil/Test-ExtendedStencil.C | 12 +++++----- .../extendedStencil/Test-ExtendedStencil2.C | 12 +++++----- .../test/fieldMapping/Test-fieldMapping.C | 10 ++++---- .../findCell-octree/Test-findCell-octree.C | 8 +++---- .../Test-findSphereFeatureEdges-octree.C | 8 +++---- applications/test/findTimes/Test-findTimes.C | 6 ++--- .../test/globalIndex/Test-globalIndex.C | 8 +++---- .../test/globalMeshData/Test-globalMeshData.C | 8 +++---- applications/test/hexRef8/Test-hexRef8.C | 10 ++++---- applications/test/mesh/Test-mesh.C | 6 ++--- .../Test-parallel-communicators.C | 4 ++-- .../Test-parallel-nonBlocking.C | 6 ++--- applications/test/parallel/Test-parallel.C | 6 ++--- .../test/patchRegion/Test-patchRegion.C | 8 +++---- .../test/pointField/Test-PointField.C | 8 +++---- .../test/primitivePatch/Test-PrimitivePatch.C | 8 +++---- applications/test/router/Gather/Gather.H | 4 ++-- applications/test/router/Gather/GatherBase.H | 4 ++-- .../test/router/Test-processorRouter.C | 8 +++---- applications/test/syncTools/Test-syncTools.C | 8 +++---- .../advanced/autoRefineMesh/autoRefineMesh.C | 8 +++---- .../advanced/collapseEdges/collapseEdges.C | 10 ++++---- .../combinePatchFaces/combinePatchFaces.C | 10 ++++---- .../mesh/advanced/modifyMesh/modifyMesh.C | 10 ++++---- .../refineWallLayer/refineWallLayer.C | 8 +++---- .../mesh/advanced/removeFaces/removeFaces.C | 10 ++++---- .../mesh/advanced/selectCells/selectCells.C | 8 +++---- .../mesh/conversion/ansysToFoam/ansysToFoam.L | 4 ++-- .../mesh/conversion/cfx4ToFoam/cfx4ToFoam.C | 4 ++-- .../fluent3DMeshToFoam/fluent3DMeshToFoam.L | 4 ++-- .../fluentMeshToFoam/fluentMeshToFoam.L | 4 ++-- .../foamMeshToFluent/foamMeshToFluent.C | 6 ++--- .../foamToStarMesh/foamToStarMesh.C | 10 ++++---- .../conversion/foamToSurface/foamToSurface.C | 10 ++++---- .../conversion/gambitToFoam/gambitToFoam.L | 4 ++-- .../mesh/conversion/gmshToFoam/gmshToFoam.C | 8 +++---- .../ideasUnvToFoam/ideasUnvToFoam.C | 6 ++--- .../mesh/conversion/kivaToFoam/kivaToFoam.C | 8 +++---- .../mesh/conversion/kivaToFoam/readKivaGrid.H | 12 +++++----- .../mesh/conversion/mshToFoam/mshToFoam.C | 6 ++--- .../netgenNeutralToFoam/netgenNeutralToFoam.C | 6 ++--- .../conversion/plot3dToFoam/plot3dToFoam.C | 4 ++-- .../conversion/tetgenToFoam/tetgenToFoam.C | 6 ++--- .../vtkUnstructuredToFoam.C | 6 ++--- .../mesh/generation/blockMesh/blockMeshApp.C | 10 ++++---- .../extrudeMesh/extrudedMesh/extrudedMesh.H | 4 ++-- .../DelaunayMesh/DelaunayMesh.H | 2 +- .../DelaunayMesh/DistributedDelaunayMesh.H | 2 +- .../DelaunayMeshTools/DelaunayMeshTools.H | 2 +- .../PrintTable/PrintTable.H | 2 +- .../backgroundMeshDecomposition.H | 2 +- .../conformalVoronoiMesh.H | 2 +- .../indexedCell/indexedCell.H | 2 +- .../indexedCell/indexedCellChecks.H | 2 +- .../indexedCell/indexedCellOps.H | 2 +- .../indexedVertex/indexedVertex.H | 2 +- .../indexedVertex/indexedVertexOps.H | 2 +- .../pointPairs/pointPairs.H | 2 +- .../foamyHexMeshBackgroundMesh.C | 2 +- .../generation/snappyHexMesh/snappyHexMesh.C | 10 ++++---- .../mesh/manipulation/attachMesh/attachMesh.C | 10 ++++---- .../mesh/manipulation/autoPatch/autoPatch.C | 10 ++++---- .../mesh/manipulation/checkMesh/checkMesh.C | 10 ++++---- .../manipulation/deformedGeom/deformedGeom.C | 8 +++---- .../manipulation/flattenMesh/flattenMesh.C | 8 +++---- .../manipulation/insideCells/insideCells.C | 8 +++---- .../mesh/manipulation/mirrorMesh/mirrorMesh.C | 8 +++---- .../moveDynamicMesh/moveDynamicMesh.C | 10 ++++---- .../moveEngineMesh/moveEngineMesh.C | 8 +++---- .../mesh/manipulation/moveMesh/moveMesh.C | 8 +++---- .../orientFaceZone/orientFaceZone.C | 10 ++++---- .../polyDualMesh/polyDualMeshApp.C | 10 ++++---- .../manipulation/renumberMesh/renumberMesh.C | 20 ++++++++-------- .../mesh/manipulation/setSet/setSet.C | 14 +++++------ .../singleCellMesh/singleCellMesh.C | 8 +++---- .../mesh/manipulation/splitMesh/splitMesh.C | 10 ++++---- .../splitMeshRegions/splitMeshRegions.C | 4 ++-- .../transformPoints/transformPoints.C | 10 ++++---- .../mesh/manipulation/zipUpMesh/zipUpMesh.C | 10 ++++---- .../foamFormatConvert/foamFormatConvert.C | 8 +++---- .../miscellaneous/patchSummary/patchSummary.C | 10 ++++---- .../patchSummary/patchSummaryTemplates.H | 4 ++-- .../decomposePar/dimFieldDecomposer.H | 4 ++-- .../decomposePar/lagrangianFieldDecomposer.H | 4 ++-- .../decomposePar/pointFieldDecomposer.H | 4 ++-- .../decomposePar/readFields.H | 4 ++-- .../redistributePar/redistributePar.C | 10 ++++---- .../foamDataToFluent/foamDataToFluent.C | 8 +++---- .../foamToEnsight/ensightCloudField.H | 4 ++-- .../foamToEnsight/ensightField.H | 4 ++-- .../ensightOutputFunctions.H | 4 ++-- .../dataConversion/foamToGMV/foamToGMV.C | 18 +++++++-------- .../dataConversion/foamToGMV/gmvOutput.H | 2 +- .../foamToTecplot360/foamToTecplot360.C | 4 ++-- .../foamToTecplot360/readFields.H | 4 ++-- .../foamToTecplot360/tecplotWriter.H | 4 ++-- .../foamToTetDualMesh/foamToTetDualMesh.C | 14 +++++------ .../dataConversion/foamToVTK/internalWriter.H | 4 ++-- .../foamToVTK/lagrangianWriter.H | 4 ++-- .../dataConversion/foamToVTK/patchWriter.H | 4 ++-- .../dataConversion/foamToVTK/readFields.H | 4 ++-- .../foamToVTK/surfaceMeshWriter.H | 4 ++-- .../dataConversion/foamToVTK/writeFuns.H | 4 ++-- .../dataConversion/smapToFoam/smapToFoam.C | 6 ++--- .../postProcessing/foamCalc/foamCalcApp.C | 12 +++++----- .../PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H | 4 ++-- .../PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H | 4 ++-- .../USERD_get_gold_part_build_info.H | 7 ++---- .../ensightFoamReader/USERD_get_part_coords.H | 15 ++++-------- .../USERD_get_var_by_component.H | 16 ++++++------- .../ensightFoamReader/getFieldTensor.H | 12 +++++----- .../ensightFoamReader/getPatchFieldTensor.H | 6 ++--- .../foamListTimes/foamListTimes.C | 4 ++-- .../miscellaneous/postChannel/channelIndex.H | 4 ++-- .../miscellaneous/postChannel/postChannel.C | 16 ++++++------- .../postProcessing/miscellaneous/ptot/ptot.C | 8 +++---- .../postProcessing/miscellaneous/wdot/wdot.C | 8 +++---- .../writeCellCentres/writeCellCentres.C | 10 ++++---- .../patch/patchAverage/patchAverage.C | 8 +++---- .../sampling/probeLocations/probeLocations.C | 10 ++++---- .../scalarField/pPrime2/pPrime2.C | 8 +++---- .../stressComponents/stressComponents.C | 10 ++++---- .../createTurbulenceFields/createFields.H | 2 +- .../velocityField/Mach/thermodynamicMach.H | 2 +- ...ateExternalCoupledPatchGeometryTemplates.H | 4 ++-- .../preProcessing/engineSwirl/engineSwirl.C | 10 ++++---- .../foamUpgradeCyclics/foamUpgradeCyclics.C | 8 +++---- .../preProcessing/mdInitialise/mdInitialise.C | 8 +++---- .../surfaceBooleanFeatures.C | 6 ++--- .../surfaceFeatureExtract.C | 10 ++++---- .../surface/surfaceHookUp/surfaceHookUp.C | 10 ++++---- .../surfaceMeshConvertTesting.C | 4 ++-- 151 files changed, 508 insertions(+), 519 deletions(-) diff --git a/applications/solvers/basic/scalarTransportFoam/createFields.H b/applications/solvers/basic/scalarTransportFoam/createFields.H index 394fe42e97..c6ba83629b 100644 --- a/applications/solvers/basic/scalarTransportFoam/createFields.H +++ b/applications/solvers/basic/scalarTransportFoam/createFields.H @@ -52,4 +52,4 @@ transportProperties.lookup("DT") ); -# include "createPhi.H" + #include "createPhi.H" diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H index a2880681ec..46d71ab0df 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.H +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/mixedFixedValueSlip/mixedFixedValueSlipFvPatchField.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -217,7 +217,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "mixedFixedValueSlipFvPatchField.C" + #include "mixedFixedValueSlipFvPatchField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/incompressible/icoFoam/createFields.H b/applications/solvers/incompressible/icoFoam/createFields.H index 02093c3938..7f5ba06c4a 100644 --- a/applications/solvers/incompressible/icoFoam/createFields.H +++ b/applications/solvers/incompressible/icoFoam/createFields.H @@ -47,7 +47,7 @@ ); -# include "createPhi.H" + #include "createPhi.H" label pRefCell = 0; diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/createFields.H b/applications/solvers/incompressible/nonNewtonianIcoFoam/createFields.H index ef08e58c7d..10a51b9d75 100644 --- a/applications/solvers/incompressible/nonNewtonianIcoFoam/createFields.H +++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/createFields.H @@ -28,7 +28,7 @@ ); -# include "createPhi.H" + #include "createPhi.H" singlePhaseTransportModel fluid(U, phi); diff --git a/applications/solvers/incompressible/shallowWaterFoam/createFields.H b/applications/solvers/incompressible/shallowWaterFoam/createFields.H index cfc14216f7..05dce1b321 100644 --- a/applications/solvers/incompressible/shallowWaterFoam/createFields.H +++ b/applications/solvers/incompressible/shallowWaterFoam/createFields.H @@ -68,7 +68,7 @@ volScalarField hTotal ); hTotal.write(); -# include "createPhi.H" + #include "createPhi.H" Info<< "Creating Coriolis Force" << endl; const dimensionedVector F("F", ((2.0*Omega) & gHat)*gHat); diff --git a/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H b/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H index c452d06951..b0516d1101 100644 --- a/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.H +++ b/applications/solvers/multiphase/cavitatingFoam/setInitialDeltaT.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ Description if (adjustTimeStep) { -# include "CourantNo.H" + #include "CourantNo.H" if (CoNum > SMALL) { diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C index 62b02ddd9c..b1174b2c6d 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C @@ -105,7 +105,7 @@ int main(int argc, char *argv[]) << nl << endl; } - Info<< "\n end \n"; + Info<< "End\n" << endl; return 0; } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H b/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H index 4433c5cde4..248f4c0602 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H @@ -1,4 +1,4 @@ -# include "CourantNo.H" + #include "CourantNo.H" { scalar UrCoNum = 0.5*gMax diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kOmegaSSTSato/kOmegaSSTSato.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kOmegaSSTSato/kOmegaSSTSato.H index f8118d284a..6d0f720b7d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kOmegaSSTSato/kOmegaSSTSato.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kOmegaSSTSato/kOmegaSSTSato.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -207,7 +207,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "kOmegaSSTSato.C" + #include "kOmegaSSTSato.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H index 5337252dbd..de51082f86 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -132,7 +132,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "BlendedInterfacialModel.C" + #include "BlendedInterfacialModel.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C index 447b27963a..240593d814 100644 --- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C +++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,15 +42,14 @@ Description int main(int argc, char *argv[]) { + #include "setRootCase.H" -# include "setRootCase.H" + #include "createTime.H" + #include "createMesh.H" + #include "readMechanicalProperties.H" + #include "createFields.H" -# include "createTime.H" -# include "createMesh.H" -# include "readMechanicalProperties.H" -# include "createFields.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nCalculating displacement field\n" << endl; @@ -58,7 +57,7 @@ int main(int argc, char *argv[]) { Info<< "Iteration: " << runTime.value() << nl << endl; -# include "readSteadyStressFoamControls.H" + #include "readSteadyStressFoamControls.H" solve ( @@ -78,15 +77,15 @@ int main(int argc, char *argv[]) sigmaD += accFac*(mu*twoSymm(gradDcorr) + (lambda*I)*tr(gradDcorr)); } -# include "calculateStress.H" -# include "kineticEnergyLimiter.H" + #include "calculateStress.H" + #include "kineticEnergyLimiter.H" Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; } - Info<< "\n end \n"; + Info<< "End\n" << endl; return 0; } diff --git a/applications/test/CompactIOList/Test-CompactIOList.C b/applications/test/CompactIOList/Test-CompactIOList.C index f224bb307c..12d64c6bde 100644 --- a/applications/test/CompactIOList/Test-CompactIOList.C +++ b/applications/test/CompactIOList/Test-CompactIOList.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,8 +43,8 @@ using namespace Foam; int main(int argc, char *argv[]) { -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" IOstream::streamFormat format=IOstream::BINARY; // IOstream::streamFormat format=IOstream::ASCII; diff --git a/applications/test/Distribution/Test-Distribution.C b/applications/test/Distribution/Test-Distribution.C index 2e183259b3..209f46a36c 100644 --- a/applications/test/Distribution/Test-Distribution.C +++ b/applications/test/Distribution/Test-Distribution.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,7 +53,7 @@ using namespace Foam; int main(int argc, char *argv[]) { - # include "setRootCase.H" + #include "setRootCase.H" Random R(918273); diff --git a/applications/test/HashingSpeed/Test-HashingSpeed.C b/applications/test/HashingSpeed/Test-HashingSpeed.C index fbd53e83b0..529edd3fec 100644 --- a/applications/test/HashingSpeed/Test-HashingSpeed.C +++ b/applications/test/HashingSpeed/Test-HashingSpeed.C @@ -55,7 +55,7 @@ on 1 byte), but shoehorning those bytes into integers efficiently is messy. #include /* defines time_t for timings in the test */ #include /* attempt to define endianness */ #ifdef linux -# include /* attempt to define endianness */ + #include /* attempt to define endianness */ #endif /* diff --git a/applications/test/List/Test-List.C b/applications/test/List/Test-List.C index 719a5ebc5c..2b063ff122 100644 --- a/applications/test/List/Test-List.C +++ b/applications/test/List/Test-List.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) argList::addOption("float", "xx"); argList::addBoolOption("flag"); -# include "setRootCase.H" + #include "setRootCase.H" List list1(IStringStream("1 ((0 1 2))")()); Info<< "list1: " << list1 << endl; diff --git a/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C b/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C index 6a8aeb9de0..d1a2e8f202 100644 --- a/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C +++ b/applications/test/PatchEdgeFaceWave/Test-PatchEdgeFaceWave.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,9 +42,9 @@ int main(int argc, char *argv[]) { argList::validArgs.append("patch"); -# include "setRootCase.H" -# include "createTime.H" -# include "createMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createMesh.H" const polyBoundaryMesh& patches = mesh.boundaryMesh(); diff --git a/applications/test/PatchTools/Test-PatchTools.C b/applications/test/PatchTools/Test-PatchTools.C index 4cf3eb0a0b..21d5e27617 100644 --- a/applications/test/PatchTools/Test-PatchTools.C +++ b/applications/test/PatchTools/Test-PatchTools.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -200,12 +200,12 @@ using namespace Foam; int main(int argc, char *argv[]) { -# include "addTimeOptions.H" + #include "addTimeOptions.H" argList::validArgs.append("patch"); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" -# include "createMesh.H" + #include "createMesh.H" const word patchName = args[1]; label patchI = mesh.boundaryMesh().findPatchID(patchName); diff --git a/applications/test/PointEdgeWave/Test-PointEdgeWave.C b/applications/test/PointEdgeWave/Test-PointEdgeWave.C index c49c8662c1..1e0695e547 100644 --- a/applications/test/PointEdgeWave/Test-PointEdgeWave.C +++ b/applications/test/PointEdgeWave/Test-PointEdgeWave.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,9 +43,9 @@ int main(int argc, char *argv[]) { argList::validArgs.append("(patches)"); -# include "setRootCase.H" -# include "createTime.H" -# include "createPolyMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createPolyMesh.H" const polyBoundaryMesh& pbm = mesh.boundaryMesh(); diff --git a/applications/test/dataEntry/Test-DataEntry.C b/applications/test/dataEntry/Test-DataEntry.C index 46ec905c34..6223b2c6a7 100644 --- a/applications/test/dataEntry/Test-DataEntry.C +++ b/applications/test/dataEntry/Test-DataEntry.C @@ -39,9 +39,9 @@ Description int main(int argc, char *argv[]) { -# include "setRootCase.H" -# include "createTime.H" -# include "createMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createMesh.H" { scalarField samples(4); diff --git a/applications/test/extendedStencil/Test-ExtendedStencil.C b/applications/test/extendedStencil/Test-ExtendedStencil.C index 0e50f8710f..8c01410fec 100644 --- a/applications/test/extendedStencil/Test-ExtendedStencil.C +++ b/applications/test/extendedStencil/Test-ExtendedStencil.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -124,15 +124,15 @@ void writeStencilStats(const labelListList& stencil) int main(int argc, char *argv[]) { -# include "addTimeOptions.H" -# include "setRootCase.H" -# include "createTime.H" + #include "addTimeOptions.H" + #include "setRootCase.H" + #include "createTime.H" // Get times list instantList Times = runTime.times(); -# include "checkTimeOptions.H" + #include "checkTimeOptions.H" runTime.setTime(Times[startTime], startTime); -# include "createMesh.H" + #include "createMesh.H" // Force calculation of extended edge addressing const labelListList& edgeFaces = mesh.edgeFaces(); diff --git a/applications/test/extendedStencil/Test-ExtendedStencil2.C b/applications/test/extendedStencil/Test-ExtendedStencil2.C index eda8f98679..df23d30283 100644 --- a/applications/test/extendedStencil/Test-ExtendedStencil2.C +++ b/applications/test/extendedStencil/Test-ExtendedStencil2.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -105,15 +105,15 @@ void writeStencilStats(const labelListList& stencil) int main(int argc, char *argv[]) { -# include "addTimeOptions.H" -# include "setRootCase.H" -# include "createTime.H" + #include "addTimeOptions.H" + #include "setRootCase.H" + #include "createTime.H" // Get times list instantList Times = runTime.times(); -# include "checkTimeOptions.H" + #include "checkTimeOptions.H" runTime.setTime(Times[startTime], startTime); -# include "createMesh.H" + #include "createMesh.H" //---- CELL CENTRED STENCIL ----- diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C index eece86105e..e4bc196777 100644 --- a/applications/test/fieldMapping/Test-fieldMapping.C +++ b/applications/test/fieldMapping/Test-fieldMapping.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -55,11 +55,11 @@ bool notEqual(const scalar s1, const scalar s2, const scalar tol) int main(int argc, char *argv[]) { -# include "addTimeOptions.H" + #include "addTimeOptions.H" argList::validArgs.append("inflate (true|false)"); -# include "setRootCase.H" -# include "createTime.H" -# include "createMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createMesh.H" const Switch inflate(args.args()[1]); diff --git a/applications/test/findCell-octree/Test-findCell-octree.C b/applications/test/findCell-octree/Test-findCell-octree.C index e9bbb1fe5f..e8b475d177 100644 --- a/applications/test/findCell-octree/Test-findCell-octree.C +++ b/applications/test/findCell-octree/Test-findCell-octree.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,9 +40,9 @@ int main(int argc, char *argv[]) { argList::validArgs.append("point (x y z)"); -# include "setRootCase.H" -# include "createTime.H" -# include "createMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createMesh.H" //label nReps = 100000; label nReps = 10000; diff --git a/applications/test/findSphereFeatureEdges-octree/Test-findSphereFeatureEdges-octree.C b/applications/test/findSphereFeatureEdges-octree/Test-findSphereFeatureEdges-octree.C index 4842756d48..0c2f95429d 100644 --- a/applications/test/findSphereFeatureEdges-octree/Test-findSphereFeatureEdges-octree.C +++ b/applications/test/findSphereFeatureEdges-octree/Test-findSphereFeatureEdges-octree.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,9 +40,9 @@ using namespace Foam; int main(int argc, char *argv[]) { -# include "setRootCase.H" -# include "createTime.H" -# include "createMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createMesh.H" fileName sFeatFileName("unit_cube_rotated.extendedFeatureEdgeMesh"); diff --git a/applications/test/findTimes/Test-findTimes.C b/applications/test/findTimes/Test-findTimes.C index 7ec30d2a7f..b24910615d 100644 --- a/applications/test/findTimes/Test-findTimes.C +++ b/applications/test/findTimes/Test-findTimes.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,8 +40,8 @@ int main(int argc, char *argv[]) // timeSelector::addOptions(); timeSelector::addOptions(true, true); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" Info<< "Times found:" << runTime.times() << endl; diff --git a/applications/test/globalIndex/Test-globalIndex.C b/applications/test/globalIndex/Test-globalIndex.C index 561f658a5f..11078c858b 100644 --- a/applications/test/globalIndex/Test-globalIndex.C +++ b/applications/test/globalIndex/Test-globalIndex.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,9 +44,9 @@ using namespace Foam; int main(int argc, char *argv[]) { -# include "setRootCase.H" -# include "createTime.H" -# include "createPolyMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createPolyMesh.H" // Global numbering of cells (proc0 elements first, then proc1, etc.) globalIndex globalNumbering(mesh.nCells()); diff --git a/applications/test/globalMeshData/Test-globalMeshData.C b/applications/test/globalMeshData/Test-globalMeshData.C index 9e47d0e7e3..c6b2d142e7 100644 --- a/applications/test/globalMeshData/Test-globalMeshData.C +++ b/applications/test/globalMeshData/Test-globalMeshData.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,9 +44,9 @@ using namespace Foam; int main(int argc, char *argv[]) { -# include "setRootCase.H" -# include "createTime.H" -# include "createPolyMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createPolyMesh.H" const globalMeshData& globalData = mesh.globalData(); const indirectPrimitivePatch& coupledPatch = globalData.coupledPatch(); diff --git a/applications/test/hexRef8/Test-hexRef8.C b/applications/test/hexRef8/Test-hexRef8.C index 0e913ff011..44a6094076 100644 --- a/applications/test/hexRef8/Test-hexRef8.C +++ b/applications/test/hexRef8/Test-hexRef8.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -57,11 +57,11 @@ bool notEqual(const scalar s1, const scalar s2, const scalar tol) // Main program: int main(int argc, char *argv[]) { -# include "addTimeOptions.H" + #include "addTimeOptions.H" argList::validArgs.append("inflate (true|false)"); -# include "setRootCase.H" -# include "createTime.H" -# include "createMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createMesh.H" const pointConstraints& pc = pointConstraints::New(pointMesh::New(mesh)); diff --git a/applications/test/mesh/Test-mesh.C b/applications/test/mesh/Test-mesh.C index bab19bcc5e..d9c6dd431b 100644 --- a/applications/test/mesh/Test-mesh.C +++ b/applications/test/mesh/Test-mesh.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,8 +36,8 @@ using namespace Foam; int main(int argc, char *argv[]) { -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" Info<< "Create mesh, no clear-out\n" << endl; fvMesh mesh diff --git a/applications/test/parallel-communicators/Test-parallel-communicators.C b/applications/test/parallel-communicators/Test-parallel-communicators.C index 2ead6a63f4..5593e07eff 100644 --- a/applications/test/parallel-communicators/Test-parallel-communicators.C +++ b/applications/test/parallel-communicators/Test-parallel-communicators.C @@ -130,8 +130,8 @@ scalar sumReduce int main(int argc, char *argv[]) { -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C b/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C index 5654db9658..ea27cfc7df 100644 --- a/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C +++ b/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,8 +48,8 @@ using namespace Foam; int main(int argc, char *argv[]) { -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" // Test PstreamBuffers diff --git a/applications/test/parallel/Test-parallel.C b/applications/test/parallel/Test-parallel.C index 2292e031f4..5aeb0140bd 100644 --- a/applications/test/parallel/Test-parallel.C +++ b/applications/test/parallel/Test-parallel.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,8 +47,8 @@ using namespace Foam; int main(int argc, char *argv[]) { -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" // Test mapDistribute diff --git a/applications/test/patchRegion/Test-patchRegion.C b/applications/test/patchRegion/Test-patchRegion.C index 2df8b3a8b0..c5c7c82cd1 100644 --- a/applications/test/patchRegion/Test-patchRegion.C +++ b/applications/test/patchRegion/Test-patchRegion.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,12 +46,12 @@ int main(int argc, char *argv[]) { argList::validArgs.append("patch"); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" const word patchName = args[1]; -# include "createPolyMesh.H" + #include "createPolyMesh.H" Info<< "Mesh read in = " << runTime.cpuTimeIncrement() diff --git a/applications/test/pointField/Test-PointField.C b/applications/test/pointField/Test-PointField.C index 56528228e1..b2524a2044 100644 --- a/applications/test/pointField/Test-PointField.C +++ b/applications/test/pointField/Test-PointField.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,10 +38,10 @@ Description int main(int argc, char *argv[]) { -# include "setRootCase.H" + #include "setRootCase.H" -# include "createTime.H" -# include "createMesh.H" + #include "createTime.H" + #include "createMesh.H" const pointMesh& pMesh = pointMesh::New(mesh); diff --git a/applications/test/primitivePatch/Test-PrimitivePatch.C b/applications/test/primitivePatch/Test-PrimitivePatch.C index 6f6d998c7d..60d321b2b7 100644 --- a/applications/test/primitivePatch/Test-PrimitivePatch.C +++ b/applications/test/primitivePatch/Test-PrimitivePatch.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -215,9 +215,9 @@ int main(int argc, char *argv[]) argList::noParallel(); argList::validArgs.append("patch"); -# include "setRootCase.H" -# include "createTime.H" -# include "createPolyMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createPolyMesh.H" const word patchName = args[1]; const polyPatch& patch = mesh.boundaryMesh()[patchName]; diff --git a/applications/test/router/Gather/Gather.H b/applications/test/router/Gather/Gather.H index 678ad6c908..e95829b267 100644 --- a/applications/test/router/Gather/Gather.H +++ b/applications/test/router/Gather/Gather.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -86,7 +86,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "Gather.C" + #include "Gather.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/test/router/Gather/GatherBase.H b/applications/test/router/Gather/GatherBase.H index b77e897836..1f01c14bb6 100644 --- a/applications/test/router/Gather/GatherBase.H +++ b/applications/test/router/Gather/GatherBase.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -92,7 +92,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "GatherBase.C" + #include "GatherBase.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/test/router/Test-processorRouter.C b/applications/test/router/Test-processorRouter.C index 31a396d9c8..580277ee7e 100644 --- a/applications/test/router/Test-processorRouter.C +++ b/applications/test/router/Test-processorRouter.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -95,9 +95,9 @@ point meshCentre(const polyMesh& mesh) int main(int argc, char *argv[]) { -# include "setRootCase.H" -# include "createTime.H" -# include "createMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createMesh.H" word procLabel = '[' + word(name(Pstream::myProcNo())) + "]-"; diff --git a/applications/test/syncTools/Test-syncTools.C b/applications/test/syncTools/Test-syncTools.C index cf68380952..f7379b8cd5 100644 --- a/applications/test/syncTools/Test-syncTools.C +++ b/applications/test/syncTools/Test-syncTools.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -592,9 +592,9 @@ void testFaceSync(const polyMesh& mesh, Random& rndGen) int main(int argc, char *argv[]) { -# include "setRootCase.H" -# include "createTime.H" -# include "createPolyMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createPolyMesh.H" Random rndGen(5341*(Pstream::myProcNo()+1)); diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C index c6181aaa21..134d112b39 100644 --- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C +++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -624,9 +624,9 @@ int main(int argc, char *argv[]) { argList::noParallel(); -# include "setRootCase.H" -# include "createTime.H" -# include "createPolyMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createPolyMesh.H" // If nessecary add oldInternalFaces patch label newPatchI = addPatch(mesh, "oldInternalFaces"); diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C index 3fda55fcc0..134c735919 100644 --- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C +++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -80,14 +80,14 @@ int main(int argc, char *argv[]) "Collapse faces that are in the supplied face set" ); -# include "addOverwriteOption.H" -# include "setRootCase.H" -# include "createTime.H" + #include "addOverwriteOption.H" + #include "setRootCase.H" + #include "createTime.H" runTime.functionObjects().off(); instantList timeDirs = timeSelector::selectIfPresent(runTime, args); -# include "createMesh.H" + #include "createMesh.H" const word oldInstance = mesh.pointsInstance(); diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C index c9063c35b4..f4d5d13418 100644 --- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C +++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -342,7 +342,7 @@ label mergeEdges(const scalar minCos, polyMesh& mesh) int main(int argc, char *argv[]) { -# include "addOverwriteOption.H" + #include "addOverwriteOption.H" argList::validArgs.append("featureAngle [0..180]"); argList::addOption @@ -357,10 +357,10 @@ int main(int argc, char *argv[]) "read user-defined mesh quality criterions from system/meshQualityDict" ); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" runTime.functionObjects().off(); -# include "createPolyMesh.H" + #include "createPolyMesh.H" const word oldInstance = mesh.pointsInstance(); const scalar featureAngle = args.argRead(1); diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C index f92aad9fb0..c3f8bed837 100644 --- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C +++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -330,12 +330,12 @@ label findCell(const primitiveMesh& mesh, const point& nearPoint) int main(int argc, char *argv[]) { -# include "addOverwriteOption.H" + #include "addOverwriteOption.H" -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" runTime.functionObjects().off(); -# include "createPolyMesh.H" + #include "createPolyMesh.H" const word oldInstance = mesh.pointsInstance(); const bool overwrite = args.optionFound("overwrite"); diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C index b0fcf3417f..67fdf139ff 100644 --- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C +++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -61,10 +61,10 @@ int main(int argc, char *argv[]) ); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" runTime.functionObjects().off(); -# include "createPolyMesh.H" + #include "createPolyMesh.H" const word oldInstance = mesh.pointsInstance(); const word patchName = args[1]; diff --git a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C index 96c0f7330a..64191b8bb0 100644 --- a/applications/utilities/mesh/advanced/removeFaces/removeFaces.C +++ b/applications/utilities/mesh/advanced/removeFaces/removeFaces.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,13 +49,13 @@ using namespace Foam; int main(int argc, char *argv[]) { -# include "addOverwriteOption.H" + #include "addOverwriteOption.H" argList::validArgs.append("faceSet"); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" runTime.functionObjects().off(); -# include "createMesh.H" + #include "createMesh.H" const word oldInstance = mesh.pointsInstance(); const word setName = args[1]; diff --git a/applications/utilities/mesh/advanced/selectCells/selectCells.C b/applications/utilities/mesh/advanced/selectCells/selectCells.C index 41db908013..86eddffcf4 100644 --- a/applications/utilities/mesh/advanced/selectCells/selectCells.C +++ b/applications/utilities/mesh/advanced/selectCells/selectCells.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -334,9 +334,9 @@ int main(int argc, char *argv[]) { argList::noParallel(); -# include "setRootCase.H" -# include "createTime.H" -# include "createPolyMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createPolyMesh.H" // Mesh edge statistics calculator edgeStats edgeCalc(mesh); diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L index e0525a0b61..f569b19612 100644 --- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L +++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -313,7 +313,7 @@ int main(int argc, char *argv[]) const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0); -# include "createTime.H" + #include "createTime.H" fileName ansysFile(args.additionalArgs()[0]); ifstream ansysStream(ansysFile.c_str()); diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C index 26df789d57..ddcd259f36 100644 --- a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C +++ b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0); -# include "createTime.H" + #include "createTime.H" IFstream cfxFile(args[1]); diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L index 1b44415f89..f318903f7d 100644 --- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L +++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -814,7 +814,7 @@ int main(int argc, char *argv[]) } -# include "createTime.H" + #include "createTime.H" const fileName fluentFile = args[1]; IFstream fluentStream(fluentFile); diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L index 4273c130b7..ad55312e1c 100644 --- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L +++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -894,7 +894,7 @@ int main(int argc, char *argv[]) const bool writeSets = args.optionFound("writeSets"); const bool writeZones = args.optionFound("writeZones"); -# include "createTime.H" + #include "createTime.H" const fileName fluentFile = args[1]; std::ifstream fluentStream(fluentFile.c_str()); diff --git a/applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C b/applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C index 16f71860b1..31ca1f9db4 100644 --- a/applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C +++ b/applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,8 +40,8 @@ using namespace Foam; int main(int argc, char *argv[]) { argList::noParallel(); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" Info<< "Create mesh for time = " << runTime.timeName() << nl << endl; diff --git a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C index 9a239cf5a2..a345d30015 100644 --- a/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C +++ b/applications/utilities/mesh/conversion/foamToStarMesh/foamToStarMesh.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -80,8 +80,8 @@ int main(int argc, char *argv[]) "suppress writing a boundary (.bnd) file" ); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" instantList timeDirs = timeSelector::select0(runTime, args); @@ -101,13 +101,13 @@ int main(int argc, char *argv[]) } } -# include "createPolyMesh.H" + #include "createPolyMesh.H" forAll(timeDirs, timeI) { runTime.setTime(timeDirs[timeI], timeI); -# include "getTimeIndex.H" + #include "getTimeIndex.H" polyMesh::readUpdateState state = mesh.readUpdate(); diff --git a/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C b/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C index 64c6e9dffd..9654b33fc2 100644 --- a/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C +++ b/applications/utilities/mesh/conversion/foamToSurface/foamToSurface.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -69,7 +69,7 @@ int main(int argc, char *argv[]) "triangulate surface" ); -# include "setRootCase.H" + #include "setRootCase.H" fileName exportName = args[1]; @@ -85,14 +85,14 @@ int main(int argc, char *argv[]) return 1; } -# include "createTime.H" + #include "createTime.H" instantList timeDirs = timeSelector::select0(runTime, args); -# include "createPolyMesh.H" + #include "createPolyMesh.H" forAll(timeDirs, timeI) { runTime.setTime(timeDirs[timeI], timeI); -# include "getTimeIndex.H" + #include "getTimeIndex.H" polyMesh::readUpdateState state = mesh.readUpdate(); diff --git a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L index edd5d7d271..ef3f3c3b2a 100644 --- a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L +++ b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -644,7 +644,7 @@ int main(int argc, char *argv[]) const scalar scaleFactor = args.optionLookupOrDefault("scale", 1.0); -# include "createTime.H" + #include "createTime.H" const fileName gambitFile = args[1]; ifstream gambitStream(gambitFile.c_str()); diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C index 1e807f38b7..e606af501e 100644 --- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C +++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -761,10 +761,10 @@ int main(int argc, char *argv[]) "retain raw orientation for prisms/hexs" ); -# include "addRegionOption.H" + #include "addRegionOption.H" -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" Foam::word regionName; diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C index fb5df1f370..a0b6465a95 100644 --- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C +++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -664,8 +664,8 @@ int main(int argc, char *argv[]) "dump boundary faces as boundaryFaces.obj (for debugging)" ); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" const fileName ideasName = args[1]; IFstream inFile(ideasName); diff --git a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C index 35160836ee..36067bd18e 100644 --- a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C +++ b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -77,8 +77,8 @@ int main(int argc, char *argv[]) "minimum z-height for transferring liner faces to cylinder-head" ); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" const fileName kivaFileName = args.optionLookupOrDefault("file", "otape17"); @@ -110,7 +110,7 @@ int main(int argc, char *argv[]) scalar zHeadMin = -GREAT; args.optionReadIfPresent("zHeadMin", zHeadMin); -# include "readKivaGrid.H" + #include "readKivaGrid.H" Info<< "End\n" << endl; diff --git a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H index 1a559559e9..585282235a 100644 --- a/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H +++ b/applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H @@ -250,7 +250,7 @@ for (label i=0; i processorsAttached(const CellType& c); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "indexedCellOpsTemplates.C" + #include "indexedCellOpsTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H index dd13623398..e4b012e668 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H @@ -359,7 +359,7 @@ namespace Foam #include "indexedVertexI.H" #ifdef NoRepository -# include "indexedVertex.C" + #include "indexedVertex.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOps.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOps.H index 3794042d9c..657275c618 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOps.H +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexOps.H @@ -67,7 +67,7 @@ inline bool uninitialised(const VertexType& v); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "indexedVertexOpsTemplates.C" + #include "indexedVertexOpsTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.H index 30d1ddfcf6..44a6aa88c8 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.H +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.H @@ -153,7 +153,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "pointPairs.C" + #include "pointPairs.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C index bc61706fa8..fc99f0fd05 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C @@ -517,7 +517,7 @@ int main(int argc, char *argv[]) // Distribute the initial mesh if (Pstream::parRun()) { -# include "createMesh.H" + #include "createMesh.H" Info<< "Loaded mesh:" << endl; printMeshData(mesh); diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C index d7eeb9185b..c6906a6c92 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C +++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -607,7 +607,7 @@ void writeMesh int main(int argc, char *argv[]) { -# include "addOverwriteOption.H" + #include "addOverwriteOption.H" Foam::argList::addBoolOption ( "checkGeometry", @@ -631,10 +631,10 @@ int main(int argc, char *argv[]) "fileName", "name of the file to save the simplified surface to" ); -# include "addDictOption.H" + #include "addDictOption.H" -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" runTime.functionObjects().off(); const bool overwrite = args.optionFound("overwrite"); diff --git a/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C b/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C index 6cc4729c6c..bf0dff94b0 100644 --- a/applications/utilities/mesh/manipulation/attachMesh/attachMesh.C +++ b/applications/utilities/mesh/manipulation/attachMesh/attachMesh.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,13 +40,13 @@ using namespace Foam; int main(int argc, char *argv[]) { -# include "addOverwriteOption.H" + #include "addOverwriteOption.H" argList::noParallel(); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" runTime.functionObjects().off(); -# include "createPolyMesh.H" + #include "createPolyMesh.H" const word oldInstance = mesh.pointsInstance(); const bool overwrite = args.optionFound("overwrite"); diff --git a/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C b/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C index 359dcdd87f..f35f70b45b 100644 --- a/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C +++ b/applications/utilities/mesh/manipulation/autoPatch/autoPatch.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -70,14 +70,14 @@ void collectFeatureEdges(const boundaryMesh& bMesh, labelList& markedEdges) int main(int argc, char *argv[]) { -# include "addOverwriteOption.H" + #include "addOverwriteOption.H" argList::noParallel(); argList::validArgs.append("feature angle[0-180]"); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" runTime.functionObjects().off(); -# include "createPolyMesh.H" + #include "createPolyMesh.H" const word oldInstance = mesh.pointsInstance(); Info<< "Mesh read in = " diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C index 3245db0370..b11946a28f 100644 --- a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C +++ b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -63,7 +63,7 @@ using namespace Foam; int main(int argc, char *argv[]) { timeSelector::addOptions(); -# include "addRegionOption.H" + #include "addRegionOption.H" argList::addBoolOption ( "noTopology", @@ -85,10 +85,10 @@ int main(int argc, char *argv[]) "read user-defined mesh quality criterions from system/meshQualityDict" ); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" instantList timeDirs = timeSelector::select0(runTime, args); -# include "createNamedPolyMesh.H" + #include "createNamedPolyMesh.H" const bool noTopology = args.optionFound("noTopology"); const bool allGeometry = args.optionFound("allGeometry"); diff --git a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C index b83f02d747..a542323874 100644 --- a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C +++ b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,12 +44,12 @@ int main(int argc, char *argv[]) { argList::validArgs.append("scaling factor"); -# include "setRootCase.H" + #include "setRootCase.H" const scalar scaleFactor = args.argRead(1); -# include "createTime.H" -# include "createMesh.H" + #include "createTime.H" + #include "createMesh.H" volPointInterpolation pInterp(mesh); diff --git a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C index 4d87cf6728..6aed660ed8 100644 --- a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C +++ b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,9 +41,9 @@ using namespace Foam; int main(int argc, char *argv[]) { -# include "setRootCase.H" -# include "createTime.H" -# include "createPolyMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createPolyMesh.H" pointIOField points ( diff --git a/applications/utilities/mesh/manipulation/insideCells/insideCells.C b/applications/utilities/mesh/manipulation/insideCells/insideCells.C index 58c8516450..4b0845abcb 100644 --- a/applications/utilities/mesh/manipulation/insideCells/insideCells.C +++ b/applications/utilities/mesh/manipulation/insideCells/insideCells.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -55,9 +55,9 @@ int main(int argc, char *argv[]) argList::validArgs.append("surfaceFile"); argList::validArgs.append("cellSet"); -# include "setRootCase.H" -# include "createTime.H" -# include "createPolyMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createPolyMesh.H" const fileName surfName = args[1]; const fileName setName = args[2]; diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C index 0682682b02..f90ed99eef 100644 --- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C +++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,9 +40,9 @@ using namespace Foam; int main(int argc, char *argv[]) { -# include "addOverwriteOption.H" -# include "setRootCase.H" -# include "createTime.H" + #include "addOverwriteOption.H" + #include "setRootCase.H" + #include "createTime.H" const bool overwrite = args.optionFound("overwrite"); diff --git a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C index a01507aef8..aa1488bade 100644 --- a/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C +++ b/applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -111,16 +111,16 @@ void writeWeights(const polyMesh& mesh) int main(int argc, char *argv[]) { -# include "addRegionOption.H" + #include "addRegionOption.H" argList::addBoolOption ( "checkAMI", "check AMI weights" ); -# include "setRootCase.H" -# include "createTime.H" -# include "createNamedDynamicFvMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createNamedDynamicFvMesh.H" const bool checkAMI = args.optionFound("checkAMI"); diff --git a/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C b/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C index a804a1ab6e..54727b825a 100644 --- a/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C +++ b/applications/utilities/mesh/manipulation/moveEngineMesh/moveEngineMesh.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,10 +37,10 @@ Description int main(int argc, char *argv[]) { -# include "setRootCase.H" + #include "setRootCase.H" -# include "createEngineTime.H" -# include "createEngineMesh.H" + #include "createEngineTime.H" + #include "createEngineMesh.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C b/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C index dd30d5d038..f2ef289053 100644 --- a/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C +++ b/applications/utilities/mesh/manipulation/moveMesh/moveMesh.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,9 +41,9 @@ using namespace Foam; int main(int argc, char *argv[]) { -# include "setRootCase.H" -# include "createTime.H" -# include "createMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createMesh.H" autoPtr motionPtr = motionSolver::New(mesh); diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C b/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C index af6ab5aadb..98666dbde1 100644 --- a/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C +++ b/applications/utilities/mesh/manipulation/orientFaceZone/orientFaceZone.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,13 +46,13 @@ using namespace Foam; int main(int argc, char *argv[]) { -# include "addRegionOption.H" + #include "addRegionOption.H" argList::validArgs.append("faceZone"); argList::validArgs.append("outsidePoint"); -# include "setRootCase.H" -# include "createTime.H" -# include "createNamedPolyMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createNamedPolyMesh.H" const word zoneName = args[1]; const point outsidePoint = args.argRead(2); diff --git a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C index 431656fefa..9f7b6057ed 100644 --- a/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C +++ b/applications/utilities/mesh/manipulation/polyDualMesh/polyDualMeshApp.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -354,7 +354,7 @@ void dumpFeatures int main(int argc, char *argv[]) { -# include "addOverwriteOption.H" + #include "addOverwriteOption.H" argList::noParallel(); argList::validArgs.append("featureAngle [0-180]"); @@ -375,9 +375,9 @@ int main(int argc, char *argv[]) " multiple faces inbetween cells" ); -# include "setRootCase.H" -# include "createTime.H" -# include "createMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createMesh.H" const word oldInstance = mesh.pointsInstance(); diff --git a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C index 666293c558..e247d842d6 100644 --- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C +++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C @@ -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-2015 OpenFOAM Foundation \\/ M anispulation | ------------------------------------------------------------------------------- License @@ -48,7 +48,7 @@ Description #include "fvMeshSubset.H" #ifdef FOAM_USE_ZOLTAN -# include "zoltanRenumber.H" + #include "zoltanRenumber.H" #endif @@ -625,10 +625,10 @@ int main(int argc, char *argv[]) "Renumber mesh to minimise bandwidth" ); -# include "addRegionOption.H" -# include "addOverwriteOption.H" -# include "addTimeOptions.H" -# include "addDictOption.H" + #include "addRegionOption.H" + #include "addOverwriteOption.H" + #include "addTimeOptions.H" + #include "addDictOption.H" argList::addBoolOption ( "frontWidth", @@ -644,19 +644,19 @@ int main(int argc, char *argv[]) #endif -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" runTime.functionObjects().off(); // Get times list instantList Times = runTime.times(); // set startTime and endTime depending on -time and -latestTime options -# include "checkTimeOptions.H" + #include "checkTimeOptions.H" runTime.setTime(Times[startTime], startTime); -# include "createNamedMesh.H" + #include "createNamedMesh.H" const word oldInstance = mesh.pointsInstance(); const bool readDict = args.optionFound("dict"); diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C index 7caeb3fd0d..a30f49767e 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-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,8 +53,8 @@ Description #ifdef HAS_READLINE -# include -# include + #include + #include #endif using namespace Foam; @@ -813,7 +813,7 @@ commandStatus parseAction(const word& actionName) int main(int argc, char *argv[]) { timeSelector::addOptions(true, false); -# include "addRegionOption.H" + #include "addRegionOption.H" argList::addBoolOption("noVTK", "do not write VTK files"); argList::addBoolOption("loop", "execute batch commands for all timesteps"); argList::addOption @@ -828,8 +828,8 @@ int main(int argc, char *argv[]) "do not synchronise selection across coupled patches" ); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" instantList timeDirs = timeSelector::select0(runTime, args); const bool writeVTK = !args.optionFound("noVTK"); @@ -845,7 +845,7 @@ int main(int argc, char *argv[]) } -# include "createNamedPolyMesh.H" + #include "createNamedPolyMesh.H" // Print some mesh info printMesh(runTime, mesh); diff --git a/applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C b/applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C index bef13a2dca..5289a03d9d 100644 --- a/applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C +++ b/applications/utilities/mesh/manipulation/singleCellMesh/singleCellMesh.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -73,12 +73,12 @@ int main(int argc, char *argv[]) // constant, not false timeSelector::addOptions(true, false); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" instantList timeDirs = timeSelector::select0(runTime, args); -# include "createNamedMesh.H" + #include "createNamedMesh.H" if (regionName == singleCellName) { diff --git a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C index 46f3ca3137..f1ed44e653 100644 --- a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C +++ b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -112,16 +112,16 @@ void checkPatch(const polyBoundaryMesh& bMesh, const word& name) int main(int argc, char *argv[]) { argList::noParallel(); -# include "addOverwriteOption.H" + #include "addOverwriteOption.H" argList::validArgs.append("faceSet"); argList::validArgs.append("masterPatch"); argList::validArgs.append("slavePatch"); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" runTime.functionObjects().off(); -# include "createPolyMesh.H" + #include "createPolyMesh.H" const word oldInstance = mesh.pointsInstance(); const word setName = args[1]; diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C index aec7160e8e..6565776cdf 100644 --- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C +++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -1408,7 +1408,7 @@ int main(int argc, char *argv[]) ( "splits mesh into multiple regions (detected by walking across faces)" ); -# include "addRegionOption.H" + #include "addRegionOption.H" #include "addOverwriteOption.H" argList::addBoolOption ( diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C index e5714eeaa8..692cfd76db 100644 --- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C +++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -94,7 +94,7 @@ void readAndRotateFields void rotateFields(const argList& args, const Time& runTime, const tensor& T) { -# include "createNamedMesh.H" + #include "createNamedMesh.H" // Read objects in time directory IOobjectList objects(mesh, runTime.timeName()); @@ -178,9 +178,9 @@ int main(int argc, char *argv[]) "uniform [mm] to [m] scaling" ); -# include "addRegionOption.H" -# include "setRootCase.H" -# include "createTime.H" + #include "addRegionOption.H" + #include "setRootCase.H" + #include "createTime.H" word regionName = polyMesh::defaultRegion; fileName meshDir; diff --git a/applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.C b/applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.C index 380b4b08d5..f4df1dd062 100644 --- a/applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.C +++ b/applications/utilities/mesh/manipulation/zipUpMesh/zipUpMesh.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,11 +45,11 @@ using namespace Foam; int main(int argc, char *argv[]) { -# include "addRegionOption.H" + #include "addRegionOption.H" -# include "setRootCase.H" -# include "createTime.H" -# include "createNamedPolyMesh.H" + #include "setRootCase.H" + #include "createTime.H" + #include "createNamedPolyMesh.H" if (polyMeshZipUpCells(mesh)) { diff --git a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C index 661a79237a..62bb65f89f 100644 --- a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C +++ b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -149,8 +149,8 @@ int main(int argc, char *argv[]) "exclude the 'constant/' dir in the times list" ); -# include "addRegionOption.H" -# include "setRootCase.H" + #include "addRegionOption.H" + #include "setRootCase.H" // enable noConstant by switching if (!args.optionFound("noConstant")) @@ -164,7 +164,7 @@ int main(int argc, char *argv[]) } -# include "createTime.H" + #include "createTime.H" // Make sure we do not use the master-only reading since we read diff --git a/applications/utilities/miscellaneous/patchSummary/patchSummary.C b/applications/utilities/miscellaneous/patchSummary/patchSummary.C index 01b2137f15..c5951b3865 100644 --- a/applications/utilities/miscellaneous/patchSummary/patchSummary.C +++ b/applications/utilities/miscellaneous/patchSummary/patchSummary.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,21 +47,21 @@ int main(int argc, char *argv[]) { timeSelector::addOptions(); -# include "addRegionOption.H" + #include "addRegionOption.H" argList::addBoolOption ( "expand", "Do not combine patches" ); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" instantList timeDirs = timeSelector::select0(runTime, args); const bool expand = args.optionFound("expand"); -# include "createNamedMesh.H" + #include "createNamedMesh.H" const polyBoundaryMesh& bm = mesh.boundaryMesh(); diff --git a/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.H b/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.H index 8689ed84fa..534715ae46 100644 --- a/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.H +++ b/applications/utilities/miscellaneous/patchSummary/patchSummaryTemplates.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -62,7 +62,7 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "patchSummaryTemplates.C" + #include "patchSummaryTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposer.H index 5de5733013..ad04f4689e 100644 --- a/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposer.H +++ b/applications/utilities/parallelProcessing/decomposePar/dimFieldDecomposer.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -119,7 +119,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "dimFieldDecomposerDecomposeFields.C" + #include "dimFieldDecomposerDecomposeFields.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H index e9b5b89b29..023ca93fb0 100644 --- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H +++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -156,7 +156,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "lagrangianFieldDecomposerDecomposeFields.C" + #include "lagrangianFieldDecomposerDecomposeFields.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H index 7214b9419a..cf9e4badf8 100644 --- a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H +++ b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -172,7 +172,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "pointFieldDecomposerDecomposeFields.C" + #include "pointFieldDecomposerDecomposeFields.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/parallelProcessing/decomposePar/readFields.H b/applications/utilities/parallelProcessing/decomposePar/readFields.H index c96edd8ce1..0ff4c1f92b 100644 --- a/applications/utilities/parallelProcessing/decomposePar/readFields.H +++ b/applications/utilities/parallelProcessing/decomposePar/readFields.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -55,7 +55,7 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "readFields.C" + #include "readFields.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C index f2a821ae29..7cc21c4adc 100644 --- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C +++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -425,8 +425,8 @@ void compareFields int main(int argc, char *argv[]) { -# include "addRegionOption.H" -# include "addOverwriteOption.H" + #include "addRegionOption.H" + #include "addOverwriteOption.H" argList::addOption ( "mergeTol", @@ -437,7 +437,7 @@ int main(int argc, char *argv[]) // Include explicit constant options, have zero from time range timeSelector::addOptions(); -# include "setRootCase.H" + #include "setRootCase.H" if (env("FOAM_SIGFPE")) { @@ -459,7 +459,7 @@ int main(int argc, char *argv[]) // Make sure we do not use the master-only reading. regIOobject::fileModificationChecking = regIOobject::timeStamp; -# include "createTime.H" + #include "createTime.H" // Allow override of time instantList times = timeSelector::selectIfPresent(runTime, args); runTime.setTime(times[0], 0); diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C index 9d78a3485d..8427f9b1b4 100644 --- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C +++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,12 +41,12 @@ int main(int argc, char *argv[]) argList::noParallel(); timeSelector::addOptions(false); // no constant -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" instantList timeDirs = timeSelector::select0(runTime, args); -# include "createMesh.H" + #include "createMesh.H" // make a directory called proInterface in the case mkDir(runTime.rootPath()/runTime.caseName()/"fluentInterface"); diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.H index a648844587..57016c3254 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.H +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -55,7 +55,7 @@ void ensightCloudField // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "ensightCloudField.C" + #include "ensightCloudField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H index b08bece857..b3469e3572 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -80,7 +80,7 @@ void writePatchField // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "ensightField.C" + #include "ensightField.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.H index 64728e263a..69083404d8 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.H +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -92,7 +92,7 @@ void ensightVolField } // namespace Foam #ifdef NoRepository -# include "ensightOutputFunctions.C" + #include "ensightOutputFunctions.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C b/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C index 7195ec2ced..9014f10ffd 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C +++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,12 +54,12 @@ int main(int argc, char *argv[]) cloud::prefix }; -# include "setRootCase.H" + #include "setRootCase.H" -# include "createTime.H" -# include "createMesh.H" + #include "createTime.H" + #include "createMesh.H" -# include "readConversionProperties.H" + #include "readConversionProperties.H" // get the available time-steps instantList TimeList = runTime.times(); @@ -78,15 +78,15 @@ int main(int argc, char *argv[]) IOobjectList objects(mesh, runTime.timeName()); -# include "moveMesh.H" + #include "moveMesh.H" // set the filename of the GMV file fileName gmvFileName = "plotGMV." + itoa(n); OFstream gmvFile(args.rootPath()/args.caseName()/gmvFileName); -# include "gmvOutputHeader.H" -# include "gmvOutput.H" -# include "gmvOutputTail.H" + #include "gmvOutputHeader.H" + #include "gmvOutput.H" + #include "gmvOutputTail.H" } } diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H index 61833a245e..a6c0c7dd36 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H +++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H @@ -82,7 +82,7 @@ for (label i=0; i < nTypes; i++) if (particles.size()) { -# include "gmvOutputLagrangian.H" + #include "gmvOutputLagrangian.H" } } } diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C index 870f33f24b..617811cfec 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C +++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -270,7 +270,7 @@ int main(int argc, char *argv[]) instantList timeDirs = timeSelector::select0(runTime, args); -# include "createNamedMesh.H" + #include "createNamedMesh.H" // TecplotData/ directory in the case fileName fvPath(runTime.path()/"Tecplot360"); diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.H b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.H index a82cfcea5c..b25c56755c 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.H +++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,7 +60,7 @@ void readFields // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "readFields.C" + #include "readFields.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H index 5b7be5c5f3..60836e9a24 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H +++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -167,7 +167,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "tecplotWriterTemplates.C" + #include "tecplotWriterTemplates.C" #endif diff --git a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C index 00db027b20..2fe59bdc5a 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C +++ b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -145,19 +145,19 @@ void ReadAndMapFields int main(int argc, char *argv[]) { -# include "addOverwriteOption.H" -# include "addTimeOptions.H" + #include "addOverwriteOption.H" + #include "addTimeOptions.H" -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" // Get times list instantList Times = runTime.times(); -# include "checkTimeOptions.H" + #include "checkTimeOptions.H" runTime.setTime(Times[startTime], startTime); // Read the mesh -# include "createMesh.H" + #include "createMesh.H" // Read the tetDualMesh Info<< "Create tetDualMesh for time = " diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H index f342c455b5..9c456f843c 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -111,7 +111,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "internalWriterTemplates.C" + #include "internalWriterTemplates.C" #endif diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.H index 53ae51b887..ec73f5e5c1 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/lagrangianWriter.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -107,7 +107,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "lagrangianWriterTemplates.C" + #include "lagrangianWriterTemplates.C" #endif diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.H index a976692d59..730f68098e 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -141,7 +141,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "patchWriterTemplates.C" + #include "patchWriterTemplates.C" #endif diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H index a82cfcea5c..b25c56755c 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,7 +60,7 @@ void readFields // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "readFields.C" + #include "readFields.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriter.H index a89ba19582..0a5936cfa1 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriter.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/surfaceMeshWriter.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -111,7 +111,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "surfaceMeshWriterTemplates.C" + #include "surfaceMeshWriterTemplates.C" #endif diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H index 50a1cf0a13..11f18b3d76 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -170,7 +170,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "writeFunsTemplates.C" + #include "writeFunsTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C b/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C index 506166a409..7c6c462a39 100644 --- a/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C +++ b/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) FatalError.exit(); } -# include "createTime.H" + #include "createTime.H" fileNameList fieldNames = readDir(runTime.timePath(), fileName::FILE); dictionary fieldNameDict; @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) if (fieldNameDict.found("epsilon")) nameMap.add("ED", word("epsilon")); if (fieldNameDict.found("nuEff")) nameMap.add("VIS", word("nuEff")); -# include "createMesh.H" + #include "createMesh.H" IFstream smapFile(args[1]); diff --git a/applications/utilities/postProcessing/foamCalc/foamCalcApp.C b/applications/utilities/postProcessing/foamCalc/foamCalcApp.C index 3e5c99f3e4..0a24afc131 100644 --- a/applications/utilities/postProcessing/foamCalc/foamCalcApp.C +++ b/applications/utilities/postProcessing/foamCalc/foamCalcApp.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,13 +43,13 @@ Description int main(int argc, char *argv[]) { Foam::timeSelector::addOptions(); -# include "addRegionOption.H" + #include "addRegionOption.H" Foam::argList::addBoolOption ( "noWrite", "suppress writing results" ); -# include "addDictOption.H" + #include "addDictOption.H" if (argc < 2) { @@ -67,10 +67,10 @@ int main(int argc, char *argv[]) utility().tryInit(); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" Foam::instantList timeDirs = Foam::timeSelector::select0(runTime, args); -# include "createNamedMesh.H" + #include "createNamedMesh.H" utility().tryPreCalc(args, runTime, mesh); diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H index 363f09d7f3..b7e37a81bb 100644 --- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H +++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -731,7 +731,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "vtkPV3FoamTemplates.C" + #include "vtkPV3FoamTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H index bd5c22a22f..8fdc74b750 100644 --- a/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.H +++ b/applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4Foam.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -731,7 +731,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "vtkPV4FoamTemplates.C" + #include "vtkPV4FoamTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_gold_part_build_info.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_gold_part_build_info.H index 3d278c0367..299ec5a67d 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_gold_part_build_info.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_gold_part_build_info.H @@ -12,11 +12,9 @@ int USERD_get_gold_part_build_info int *iblanking_options[6] ) { -#ifdef ENSIGHTDEBUG + #ifdef ENSIGHTDEBUG Info<< "Entering: USERD_get_gold_part_build_info" << endl << flush; -#endif - - //# include "checkForNewMesh.H" + #endif const cellShapeList& cellShapes = meshPtr->cellShapes(); const cellList& cells = meshPtr->cells(); @@ -153,4 +151,3 @@ int USERD_get_gold_part_build_info return Z_OK; } - diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_coords.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_coords.H index de8c90d7ae..6b6476086c 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_coords.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_coords.H @@ -6,17 +6,13 @@ int USERD_get_part_coords float **coord_array ) { - -#ifdef ENSIGHTDEBUG + #ifdef ENSIGHTDEBUG Info<< "Entering: USERD_get_part_coords" << endl << "part_number = " << part_number << endl << flush; -#endif + #endif if (part_number == 1) { - - //# include "checkForNewMesh.H" - const vectorField& points = meshPtr->points(); label nPoints = points.size(); @@ -29,9 +25,6 @@ int USERD_get_part_coords } else if (part_number < nPatches+2) { - - //# include "checkForNewMesh.H" - label patchi = part_number-2; const polyBoundaryMesh& bMesh = meshPtr->boundaryMesh(); const vectorField& points = bMesh[patchi].points(); @@ -63,9 +56,9 @@ int USERD_get_part_coords return Z_ERR; } -#ifdef ENSIGHTDEBUG + #ifdef ENSIGHTDEBUG Info<< "Leaving: USERD_get_part_coords" << endl << flush; -#endif + #endif return Z_OK; } diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_var_by_component.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_var_by_component.H index 89c0140b4a..f6c437450f 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_var_by_component.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_var_by_component.H @@ -32,15 +32,15 @@ int USERD_get_var_by_component { if (which_part == 1) { -# include "getFieldScalar.H" + #include "getFieldScalar.H" } else if (which_part < nPatches+2) { -# include "getPatchFieldScalar.H" + #include "getPatchFieldScalar.H" } else if (which_part == nPatches+2) { -# include "getLagrangianScalar.H" + #include "getLagrangianScalar.H" } else { @@ -51,15 +51,15 @@ int USERD_get_var_by_component { if (which_part == 1) { -# include "getFieldVector.H" + #include "getFieldVector.H" } else if (which_part < nPatches+2) { -# include "getPatchFieldVector.H" + #include "getPatchFieldVector.H" } else if (which_part == nPatches+2) { -# include "getLagrangianVector.H" + #include "getLagrangianVector.H" } else { @@ -73,11 +73,11 @@ int USERD_get_var_by_component if (which_part == 1) { -# include "getFieldTensor.H" + #include "getFieldTensor.H" } else if (which_part < nPatches+2) { -# include "getPatchFieldTensor.H" + #include "getPatchFieldTensor.H" } else if (which_part == nPatches+2) { diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/getFieldTensor.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/getFieldTensor.H index 059c0f0678..c2c729ba2b 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/getFieldTensor.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/getFieldTensor.H @@ -48,7 +48,7 @@ if (which_type == Z_HEX08) if (cellModel == hex) // || (cellModel == wedge)) { -# include "tensorConversion.H" + #include "tensorConversion.H" } } } @@ -66,7 +66,7 @@ if (which_type == Z_PEN06) if (cellModel == prism) { -# include "tensorConversion.H" + #include "tensorConversion.H" } } } @@ -84,7 +84,7 @@ if (which_type == Z_PYR05) if (cellModel == pyr) { -# include "tensorConversion.H" + #include "tensorConversion.H" } } } @@ -104,7 +104,7 @@ if (which_type == Z_TET04) if (cellModel == tet) { -# include "tensorConversion.H" + #include "tensorConversion.H" } } } @@ -131,12 +131,12 @@ if (which_type == Z_NFACED) {} else { -# include "tensorConversion.H" + #include "tensorConversion.H" } } else { -# include "tensorConversion.H" + #include "tensorConversion.H" } } } diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/getPatchFieldTensor.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/getPatchFieldTensor.H index 67e68359a6..9321619b33 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/getPatchFieldTensor.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/getPatchFieldTensor.H @@ -44,7 +44,7 @@ if (which_type == Z_TRI03) label nPoints = bMesh[patchi][n].size(); if (nPoints == 3) { -# include "tensorConversion.H" + #include "tensorConversion.H" } } } @@ -57,7 +57,7 @@ if (which_type == Z_QUA04) label nPoints = bMesh[patchi][n].size(); if (nPoints == 4) { -# include "tensorConversion.H" + #include "tensorConversion.H" } } } @@ -70,7 +70,7 @@ if (which_type == Z_NSIDED) label nPoints = bMesh[patchi][n].size(); if ((nPoints != 3) && (nPoints != 4)) { -# include "tensorConversion.H" + #include "tensorConversion.H" } } } diff --git a/applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C b/applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C index 8d4c0b1200..b2e43e5b33 100644 --- a/applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C +++ b/applications/utilities/postProcessing/miscellaneous/foamListTimes/foamListTimes.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -59,7 +59,7 @@ int main(int argc, char *argv[]) "processor", "list times from processor0/ directory" ); -# include "setRootCase.H" + #include "setRootCase.H" label nProcs = 0; diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.H b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.H index 6d48c54e5f..dc05052dbf 100644 --- a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.H +++ b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndex.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -147,7 +147,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "channelIndexTemplates.C" + #include "channelIndexTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C index 7c31a03e98..93373ee6a9 100644 --- a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C +++ b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,14 +48,14 @@ int main(int argc, char *argv[]) argList::noParallel(); timeSelector::addOptions(); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" // Get times list instantList timeDirs = timeSelector::select0(runTime, args); -# include "createMesh.H" -# include "readTransportProperties.H" + #include "createMesh.H" + #include "readTransportProperties.H" const word& gFormat = runTime.graphFormat(); @@ -81,11 +81,11 @@ int main(int argc, char *argv[]) runTime.setTime(timeDirs[timeI], timeI); Info<< "Collapsing fields for time " << runTime.timeName() << endl; -# include "readFields.H" -# include "calculateFields.H" + #include "readFields.H" + #include "calculateFields.H" // Average fields over channel down to a line -# include "collapse.H" + #include "collapse.H" } Info<< "\nEnd\n" << endl; diff --git a/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C b/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C index 3c91405e23..1977bb7476 100644 --- a/applications/utilities/postProcessing/miscellaneous/ptot/ptot.C +++ b/applications/utilities/postProcessing/miscellaneous/ptot/ptot.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,12 +37,12 @@ int main(int argc, char *argv[]) { timeSelector::addOptions(); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" instantList timeDirs = timeSelector::select0(runTime, args); -# include "createMesh.H" + #include "createMesh.H" forAll(timeDirs, timeI) { diff --git a/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C b/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C index 698a0e986a..e670d9150f 100644 --- a/applications/utilities/postProcessing/miscellaneous/wdot/wdot.C +++ b/applications/utilities/postProcessing/miscellaneous/wdot/wdot.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,12 +38,12 @@ int main(int argc, char *argv[]) { timeSelector::addOptions(); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" instantList timeDirs = timeSelector::select0(runTime, args); -# include "createMesh.H" + #include "createMesh.H" forAll(timeDirs, timeI) { diff --git a/applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C b/applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C index ef8fe01b83..0025015339 100644 --- a/applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C +++ b/applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,14 +42,14 @@ using namespace Foam; int main(int argc, char *argv[]) { timeSelector::addOptions(); -# include "addRegionOption.H" + #include "addRegionOption.H" -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" instantList timeDirs = timeSelector::select0(runTime, args); -# include "createNamedMesh.H" + #include "createNamedMesh.H" forAll(timeDirs, timeI) { diff --git a/applications/utilities/postProcessing/patch/patchAverage/patchAverage.C b/applications/utilities/postProcessing/patch/patchAverage/patchAverage.C index 9464734307..acdc968fa7 100644 --- a/applications/utilities/postProcessing/patch/patchAverage/patchAverage.C +++ b/applications/utilities/postProcessing/patch/patchAverage/patchAverage.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -80,10 +80,10 @@ int main(int argc, char *argv[]) #include "addRegionOption.H" argList::validArgs.append("fieldName"); argList::validArgs.append("patchName"); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" instantList timeDirs = timeSelector::select0(runTime, args); -# include "createNamedMesh.H" + #include "createNamedMesh.H" const word fieldName = args[1]; const word patchName = args[2]; diff --git a/applications/utilities/postProcessing/sampling/probeLocations/probeLocations.C b/applications/utilities/postProcessing/sampling/probeLocations/probeLocations.C index 09daaee277..daf48a3f68 100644 --- a/applications/utilities/postProcessing/sampling/probeLocations/probeLocations.C +++ b/applications/utilities/postProcessing/sampling/probeLocations/probeLocations.C @@ -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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,12 +40,12 @@ using namespace Foam; int main(int argc, char *argv[]) { timeSelector::addOptions(); -# include "addRegionOption.H" + #include "addRegionOption.H" -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" instantList timeDirs = timeSelector::select0(runTime, args); -# include "createNamedMesh.H" + #include "createNamedMesh.H" IOprobes sniff ( diff --git a/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C b/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C index c7132078c2..e217bfd6a5 100644 --- a/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.C +++ b/applications/utilities/postProcessing/scalarField/pPrime2/pPrime2.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,12 +39,12 @@ int main(int argc, char *argv[]) { timeSelector::addOptions(); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" instantList timeDirs = timeSelector::select0(runTime, args); -# include "createMesh.H" + #include "createMesh.H" runTime.setTime(timeDirs.last(), timeDirs.size()-1); diff --git a/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C b/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C index 12941e9b06..86ffee3d6a 100644 --- a/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.C +++ b/applications/utilities/postProcessing/stressField/stressComponents/stressComponents.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-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,12 +40,12 @@ int main(int argc, char *argv[]) { timeSelector::addOptions(); -# include "setRootCase.H" -# include "createTime.H" + #include "setRootCase.H" + #include "createTime.H" instantList timeDirs = timeSelector::select0(runTime, args); -# include "createMesh.H" + #include "createMesh.H" forAll(timeDirs, timeI) { @@ -69,7 +69,7 @@ int main(int argc, char *argv[]) Info<< " Reading U" << endl; volVectorField U(Uheader, mesh); -# include "createPhi.H" + #include "createPhi.H" singlePhaseTransportModel laminarTransport(U, phi); diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H index d069c4545d..7c07f44f8b 100644 --- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H +++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createFields.H @@ -12,7 +12,7 @@ mesh ); -# include "createPhi.H" + #include "createPhi.H" singlePhaseTransportModel laminarTransport(U, phi); diff --git a/applications/utilities/postProcessing/velocityField/Mach/thermodynamicMach.H b/applications/utilities/postProcessing/velocityField/Mach/thermodynamicMach.H index 9ee57ae830..00d1717f7d 100644 --- a/applications/utilities/postProcessing/velocityField/Mach/thermodynamicMach.H +++ b/applications/utilities/postProcessing/velocityField/Mach/thermodynamicMach.H @@ -1,4 +1,4 @@ -# include "readThermodynamicProperties.H" + #include "readThermodynamicProperties.H" for (label i=startTime; i