From fa93ce8cd78b83396fa759f25c1bc81623e849aa Mon Sep 17 00:00:00 2001 From: Mark Olesen <Mark.Olesen@Germany> Date: Fri, 27 Nov 2009 15:39:14 +0100 Subject: [PATCH] coding style adherence - markup codingStyleGuide.org examples so they actually indent correctly - use 'Info<<' as per codingStyleGuide instead of 'Info <<' --- .../dieselEngineFoam/dieselEngineFoam.C | 4 +- .../combustion/dieselFoam/dieselFoam.C | 6 +- .../combustion/engineFoam/engineFoam.C | 2 +- .../combustion/reactingFoam/chemistry.H | 2 +- .../combustion/reactingFoam/reactingFoam.C | 2 +- .../combustion/rhoReactingFoam/chemistry.H | 2 +- .../rhoReactingFoam/rhoReactingFoam.C | 2 +- .../mdEquilibrationFoam/mdEquilibrationFoam.C | 8 +- .../molecularDynamics/mdFoam/mdFoam.C | 8 +- .../chtMultiRegionFoam/chtMultiRegionFoam.C | 2 +- .../porousSimpleFoam/createFields.H | 4 +- .../incompressible/simpleFoam/createFields.H | 4 +- .../lagrangian/coalChemistryFoam/chemistry.H | 2 +- .../chemistry.H | 2 +- .../lagrangian/reactingParcelFoam/chemistry.H | 2 +- .../twoPhaseEulerFoam/createFields.H | 2 +- .../dragModels/dragModel/newDragModel.C | 4 +- applications/test/Dictionary/DictionaryTest.C | 14 +-- .../test/IndirectList/IndirectListTest.C | 2 +- applications/test/LduMatrix/LduMatrixTest.C | 2 +- applications/test/LduMatrix/LduMatrixTest2.C | 2 +- applications/test/Map/MapTest.C | 10 +- applications/test/Matrix/MatrixTest.C | 2 +- applications/test/NamedEnum/namedEnumTest.C | 2 +- applications/test/ODETest/ODETest.C | 2 +- applications/test/POSIX/POSIXTest.C | 2 +- .../test/PackedList2/PackedListTest2.C | 2 +- applications/test/PtrList/PtrListTest.C | 2 +- applications/test/Tuple2/Tuple2Test.C | 2 +- .../UIndirectListTest/UIndirectListTest.C | 2 +- applications/test/callback/callbackTest.C | 2 +- .../dimensionedType/dimensionedTypeTest.C | 2 +- applications/test/fileName/fileNameTest.C | 3 +- .../test/fileNameClean/fileNameCleanTest.C | 3 +- applications/test/liquid/liquidTest.C | 2 +- applications/test/mesh/meshTest.C | 2 +- applications/test/pTraits/pTraitsTest.C | 2 +- .../test/primitivePatch/testPrimitivePatch.C | 6 +- .../test/readCHEMKINIII/readCHEMKINIII.C | 2 +- .../test/simpleMatrix/simpleMatrixTest.C | 2 +- applications/test/string/stringTest.C | 3 +- .../testPointEdgeWave/testPointEdgeWave.C | 5 +- .../estimateScalarError/estimateScalarError.C | 4 +- .../icoErrorEstimate/icoErrorEstimate.C | 4 +- .../icoMomentError/icoMomentError.C | 4 +- .../momentScalarError/momentScalarError.C | 4 +- .../advanced/autoRefineMesh/autoRefineMesh.C | 2 +- .../advanced/collapseEdges/collapseEdges.C | 2 +- .../combinePatchFaces/combinePatchFaces.C | 2 +- .../mesh/advanced/modifyMesh/modifyMesh.C | 9 +- .../refineWallLayer/refineWallLayer.C | 4 +- .../refinementLevel/refinementLevel.C | 3 +- .../mesh/advanced/selectCells/selectCells.C | 4 +- .../mesh/advanced/splitCells/splitCells.C | 2 +- .../mesh/conversion/ansysToFoam/ansysToFoam.L | 12 +-- .../mesh/conversion/cfx4ToFoam/cfx4ToFoam.C | 44 ++++---- .../mesh/conversion/cfx4ToFoam/hexBlock.C | 4 +- .../fluent3DMeshToFoam/fluent3DMeshToFoam.L | 2 +- .../fluentMeshToFoam/fluentMeshToFoam.L | 2 +- .../foamMeshToFluent/fluentFvMesh.C | 2 +- .../foamMeshToFluent/foamMeshToFluent.C | 2 +- .../conversion/gambitToFoam/gambitToFoam.L | 28 ++--- .../mesh/conversion/kivaToFoam/kivaToFoam.C | 2 +- .../mesh/conversion/plot3dToFoam/hexBlock.C | 2 +- .../sammToFoam/createPolyBoundary.C | 4 +- .../conversion/sammToFoam/createPolyCells.C | 6 +- .../conversion/sammToFoam/purgeCellShapes.C | 4 +- .../mesh/conversion/sammToFoam/readCouples.C | 8 +- .../mesh/conversion/sammToFoam/sammMesh.C | 6 +- .../mesh/conversion/sammToFoam/sammToFoam.C | 4 +- .../mesh/conversion/sammToFoam/writeMesh.C | 8 +- .../starToFoam/createBoundaryFaces.C | 10 +- .../starToFoam/createCoupleMatches.C | 62 +++++------ .../starToFoam/createPolyBoundary.C | 40 +++---- .../conversion/starToFoam/createPolyCells.C | 6 +- .../starToFoam/mergeCoupleFacePoints.C | 14 +-- .../conversion/starToFoam/purgeCellShapes.C | 4 +- .../mesh/conversion/starToFoam/readCouples.C | 4 +- .../mesh/conversion/starToFoam/starMesh.C | 10 +- .../mesh/conversion/starToFoam/starToFoam.C | 4 +- .../mesh/conversion/starToFoam/writeMesh.C | 10 +- .../conversion/writeMeshObj/writeMeshObj.C | 28 ++--- .../mesh/generation/blockMesh/blockMeshApp.C | 2 +- .../generation/blockMesh/mergePatchPairs.H | 4 +- .../mesh/generation/extrudeMesh/extrudeMesh.C | 2 +- .../mesh/manipulation/cellSet/cellSet.C | 2 +- .../mesh/manipulation/checkMesh/checkMesh.C | 2 +- .../mesh/manipulation/faceSet/faceSet.C | 2 +- .../manipulation/flattenMesh/flattenMesh.C | 2 +- .../manipulation/insideCells/insideCells.C | 2 +- .../manipulation/mergeMeshes/mergeMeshes.C | 2 +- .../manipulation/mergeMeshes/mergePolyMesh.C | 4 +- .../manipulation/mirrorMesh/mirrorFvMesh.C | 18 ++-- .../mesh/manipulation/mirrorMesh/mirrorMesh.C | 4 +- .../mesh/manipulation/objToVTK/objToVTK.C | 2 +- .../mesh/manipulation/pointSet/pointSet.C | 2 +- .../mesh/manipulation/rotateMesh/rotateMesh.C | 2 +- .../mesh/manipulation/setSet/setSet.C | 6 +- .../manipulation/setsToZones/setsToZones.C | 2 +- .../mesh/manipulation/splitMesh/splitMesh.C | 2 +- .../mesh/manipulation/stitchMesh/stitchMesh.C | 10 +- .../mesh/manipulation/subsetMesh/subsetMesh.C | 2 +- .../transformPoints/transformPoints.C | 2 +- .../miscellaneous/patchSummary/patchSummary.C | 4 +- .../decomposePar/domainDecompositionMesh.C | 20 ++-- .../reconstructPar/reconstructPar.C | 12 +-- .../foamDataToFluent/foamDataToFluent.C | 2 +- .../foamToEnsight/ensightCaseTail.H | 2 +- .../foamToFieldview9/foamToFieldview9.C | 2 +- .../dataConversion/foamToGMV/foamToGMV.C | 4 +- .../dataConversion/foamToGMV/moveMesh.H | 6 +- .../dataConversion/smapToFoam/smapToFoam.C | 2 +- .../PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C | 2 +- .../vtkPV3Foam/vtkPV3FoamUtils.C | 2 +- .../graphics/ensightFoamReader/USERD_bkup.H | 2 +- .../ensightFoamReader/USERD_exit_routine.H | 2 +- .../USERD_get_border_availability.H | 4 +- .../USERD_get_border_elements_by_type.H | 2 +- .../USERD_get_changing_geometry_status.H | 2 +- .../USERD_get_constant_val.H | 2 +- .../USERD_get_descrip_lines.H | 4 +- .../USERD_get_element_label_status.H | 2 +- .../USERD_get_geom_timeset_number.H | 2 +- .../USERD_get_gold_part_build_info.H | 14 +-- .../USERD_get_gold_variable_info.H | 4 +- .../USERD_get_matf_set_info.H | 2 +- .../USERD_get_matf_var_info.H | 2 +- .../USERD_get_maxsize_info.H | 8 +- .../USERD_get_model_extents.H | 2 +- .../USERD_get_name_of_reader.H | 2 +- .../ensightFoamReader/USERD_get_nfaced_conn.H | 10 +- .../USERD_get_nfaced_nodes_per_face.H | 8 +- .../USERD_get_node_label_status.H | 2 +- .../ensightFoamReader/USERD_get_nsided_conn.H | 10 +- .../USERD_get_num_of_time_steps.H | 2 +- .../USERD_get_number_of_files_in_dataset.H | 4 +- .../USERD_get_number_of_material_sets.H | 8 +- .../USERD_get_number_of_materials.H | 2 +- .../USERD_get_number_of_model_parts.H | 2 +- .../USERD_get_number_of_variables.H | 2 +- .../USERD_get_number_timesets.H | 2 +- .../ensightFoamReader/USERD_get_part_coords.H | 8 +- .../USERD_get_part_element_ids_by_type.H | 18 ++-- .../USERD_get_part_elements_by_type.H | 30 +++--- .../USERD_get_part_node_ids.H | 8 +- .../USERD_get_reader_release.H | 4 +- .../USERD_get_reader_version.H | 4 +- .../ensightFoamReader/USERD_get_sol_times.H | 2 +- .../USERD_get_var_by_component.H | 14 +-- .../USERD_get_var_value_at_specific.H | 4 +- .../ensightFoamReader/USERD_load_matf_data.H | 4 +- .../ensightFoamReader/USERD_set_filenames.H | 6 +- .../USERD_set_server_number.H | 2 +- .../USERD_set_time_set_and_step.H | 2 +- .../ensightFoamReader/USERD_size_matf_data.H | 4 +- .../USERD_stop_part_building.H | 2 +- .../ensightFoamReader/getLagrangianScalar.H | 2 +- .../engineCompRatio/engineCompRatio.C | 2 +- .../miscellaneous/pdfPlot/pdfPlot.C | 2 +- .../miscellaneous/postChannel/postChannel.C | 2 +- .../writeCellCentres/writeCellCentres.C | 2 +- .../velocityField/Lambda2/Lambda2.C | 2 +- .../postProcessing/velocityField/Pe/Pe.C | 2 +- .../streamFunction/streamFunction.C | 2 +- .../postProcessing/wall/yPlusRAS/yPlusRAS.C | 4 +- .../preProcessing/engineSwirl/engineSwirl.C | 4 +- .../preProcessing/mapFields/createTimes.H | 2 +- .../preProcessing/mdInitialise/mdInitialise.C | 2 +- .../preProcessing/setFields/setFields.C | 2 +- .../wallFunctionTable/wallFunctionTableApp.C | 2 +- .../utilities/surface/surfaceAdd/surfaceAdd.C | 4 +- .../surfaceAutoPatch/surfaceAutoPatch.C | 6 +- .../surface/surfaceCoarsen/surfaceCoarsen.C | 10 +- .../surface/surfaceFind/surfaceFind.C | 2 +- .../surfaceMeshTriangulate.C | 2 +- .../surface/surfaceOrient/surfaceOrient.C | 2 +- .../surfacePointMerge/surfacePointMerge.C | 2 +- .../surfaceRefineRedGreen.C | 2 +- .../surface/surfaceSmooth/surfaceSmooth.C | 2 +- .../surfaceSplitByPatch/surfaceSplitByPatch.C | 2 +- .../surfaceSplitNonManifolds.C | 2 +- .../surface/surfaceSubset/surfaceSubset.C | 12 +-- .../surface/surfaceToPatch/surfaceToPatch.C | 2 +- .../surfaceTransformPoints.C | 2 +- .../chemkinToFoam/chemkinToFoam.C | 2 +- .../mixtureAdiabaticFlameT.C | 2 +- bin/templates/source/_TemplateApp.C | 3 +- doc/codingStyleGuide.org | 102 +++++++++++++++--- .../dictionaryEntry/dictionaryEntryIO.C | 2 +- src/OpenFOAM/db/dictionary/entry/entry.C | 1 - src/OpenFOAM/db/dictionary/entry/entry.H | 6 +- src/OpenFOAM/db/scalarRange/scalarRange.C | 2 +- .../CalcPatchToPatchWeights.C | 8 +- .../matrices/scalarMatrices/SVD/SVD.C | 6 +- .../polyBoundaryMesh/polyBoundaryMesh.C | 2 +- .../meshes/polyMesh/polyMeshFromShapeMesh.C | 2 +- src/OpenFOAM/meshes/polyMesh/polyMeshIO.C | 8 +- .../meshes/polyMesh/zones/faceZone/faceZone.C | 4 +- .../preservePatchTypes/preservePatchTypes.C | 6 +- .../PrimitivePatchProjectPoints.C | 4 +- src/conversion/meshReader/meshReaderAux.C | 6 +- .../meshWriter/starcd/STARCDMeshWriter.C | 4 +- src/dynamicMesh/motionSolver/motionSolver.C | 2 +- .../polyTopoChanger/polyTopoChanger.C | 10 +- .../enrichedPatch/enrichedPatchFaces.C | 6 +- .../include/readGravitationalAcceleration.H | 2 +- .../quadraticFitSnGradData.C | 2 +- src/finiteVolume/fvMesh/fvMesh.C | 8 +- .../schemes/FitData/FitData.C | 4 +- .../motionDiffusivity/motionDiffusivity.C | 2 +- .../commonRailInjector/commonRailInjector.C | 2 +- .../multiHoleInjector/multiHoleInjector.C | 6 +- src/lagrangian/dieselSpray/parcel/parcel.C | 2 +- src/lagrangian/dieselSpray/spray/spray.C | 4 +- .../RutlandFlashBoil/RutlandFlashBoil.C | 4 +- .../wallModel/reflectParcel/reflectParcel.C | 2 +- .../referredCellList/referredCellList.C | 2 +- .../molecule/mdTools/createMDFields.H | 10 +- .../molecule/mdTools/createRefUnits.H | 2 +- .../mdTools/meanMomentumEnergyAndNMols.H | 2 +- .../molecule/mdTools/temperatureAndPressure.H | 4 +- .../potential/potential/potential.C | 4 +- .../polyMeshZipUpCells/polyMeshZipUpCells.C | 20 ++-- src/sampling/include/mapPatch.H | 22 ++-- src/surfMesh/surfMesh/surfMeshIO.C | 6 +- .../radiationModel/fvDOM/fvDOM/fvDOM.C | 2 +- .../linearValveFvMesh/linearValveFvMesh.C | 20 ++-- .../linearValveLayersFvMesh.C | 16 +-- .../mixerFvMesh/mixerFvMesh.C | 8 +- .../movingConeTopoFvMesh.C | 20 ++-- .../analyticalCylinder/analyticalCylinder.C | 8 +- .../biconic25-55Run35/datToFoam/datToFoam.C | 4 +- .../MRFSimpleFoam/createFields.H | 4 +- .../simpleSRFFoam/createFields.H | 2 +- .../ras/sloshingTank3D6DoF/gen6DoF/gen6DoF.C | 2 +- 235 files changed, 702 insertions(+), 634 deletions(-) diff --git a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C index ce80690224e..6507c117a01 100644 --- a/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C +++ b/applications/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - Info << "\nStarting time loop\n" << endl; + Info<< "\nStarting time loop\n" << endl; while (runTime.run()) { @@ -85,7 +85,7 @@ int main(int argc, char *argv[]) dieselSpray.evolve(); - Info << "Solving chemistry" << endl; + Info<< "Solving chemistry" << endl; chemistry.solve ( diff --git a/applications/solvers/combustion/dieselFoam/dieselFoam.C b/applications/solvers/combustion/dieselFoam/dieselFoam.C index 42d95346544..4769a00c77e 100644 --- a/applications/solvers/combustion/dieselFoam/dieselFoam.C +++ b/applications/solvers/combustion/dieselFoam/dieselFoam.C @@ -61,7 +61,7 @@ int main(int argc, char *argv[]) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - Info << "\nStarting time loop\n" << endl; + Info<< "\nStarting time loop\n" << endl; while (runTime.run()) { @@ -72,11 +72,11 @@ int main(int argc, char *argv[]) runTime++; Info<< "Time = " << runTime.timeName() << nl << endl; - Info << "Evolving Spray" << endl; + Info<< "Evolving Spray" << endl; dieselSpray.evolve(); - Info << "Solving chemistry" << endl; + Info<< "Solving chemistry" << endl; chemistry.solve ( diff --git a/applications/solvers/combustion/engineFoam/engineFoam.C b/applications/solvers/combustion/engineFoam/engineFoam.C index dd584d03e2b..5895c82b92f 100644 --- a/applications/solvers/combustion/engineFoam/engineFoam.C +++ b/applications/solvers/combustion/engineFoam/engineFoam.C @@ -78,7 +78,7 @@ int main(int argc, char *argv[]) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - Info << "\nStarting time loop\n" << endl; + Info<< "\nStarting time loop\n" << endl; while (runTime.run()) { diff --git a/applications/solvers/combustion/reactingFoam/chemistry.H b/applications/solvers/combustion/reactingFoam/chemistry.H index 691b6dcb920..a1a978210dd 100644 --- a/applications/solvers/combustion/reactingFoam/chemistry.H +++ b/applications/solvers/combustion/reactingFoam/chemistry.H @@ -1,5 +1,5 @@ { - Info << "Solving chemistry" << endl; + Info<< "Solving chemistry" << endl; chemistry.solve ( diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C index 875191eea41..2d4ae7589ad 100644 --- a/applications/solvers/combustion/reactingFoam/reactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C @@ -54,7 +54,7 @@ int main(int argc, char *argv[]) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - Info << "\nStarting time loop\n" << endl; + Info<< "\nStarting time loop\n" << endl; while (runTime.run()) { diff --git a/applications/solvers/combustion/rhoReactingFoam/chemistry.H b/applications/solvers/combustion/rhoReactingFoam/chemistry.H index 691b6dcb920..a1a978210dd 100644 --- a/applications/solvers/combustion/rhoReactingFoam/chemistry.H +++ b/applications/solvers/combustion/rhoReactingFoam/chemistry.H @@ -1,5 +1,5 @@ { - Info << "Solving chemistry" << endl; + Info<< "Solving chemistry" << endl; chemistry.solve ( diff --git a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C index 777718b3eac..cc37dd09c18 100644 --- a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C +++ b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - Info << "\nStarting time loop\n" << endl; + Info<< "\nStarting time loop\n" << endl; while (runTime.run()) { diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C index 66619cfc674..8869f52a278 100644 --- a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C +++ b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C @@ -50,14 +50,14 @@ int main(int argc, char *argv[]) label nAveragingSteps = 0; - Info << "\nStarting time loop\n" << endl; + Info<< "\nStarting time loop\n" << endl; while (runTime.loop()) { nAveragingSteps++; - Info << "Time = " << runTime.timeName() << endl; + Info<< "Time = " << runTime.timeName() << endl; molecules.evolve(); @@ -74,12 +74,12 @@ int main(int argc, char *argv[]) nAveragingSteps = 0; } - Info << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" + Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C index 4f2eea1ccc7..0bd07d0330d 100644 --- a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C +++ b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C @@ -48,14 +48,14 @@ int main(int argc, char *argv[]) label nAveragingSteps = 0; - Info << "\nStarting time loop\n" << endl; + Info<< "\nStarting time loop\n" << endl; while (runTime.loop()) { nAveragingSteps++; - Info << "Time = " << runTime.timeName() << endl; + Info<< "Time = " << runTime.timeName() << endl; molecules.evolve(); @@ -70,12 +70,12 @@ int main(int argc, char *argv[]) nAveragingSteps = 0; } - Info << "ExecutionTime = " << runTime.elapsedCpuTime() << " s" + Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C index 54e1c8cb184..5a56c2709ff 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C @@ -117,7 +117,7 @@ int main(int argc, char *argv[]) << nl << endl; } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/solvers/incompressible/porousSimpleFoam/createFields.H b/applications/solvers/incompressible/porousSimpleFoam/createFields.H index 04d57d05714..6861ae0005e 100644 --- a/applications/solvers/incompressible/porousSimpleFoam/createFields.H +++ b/applications/solvers/incompressible/porousSimpleFoam/createFields.H @@ -1,4 +1,4 @@ - Info << "Reading field p\n" << endl; + Info<< "Reading field p\n" << endl; volScalarField p ( IOobject @@ -12,7 +12,7 @@ mesh ); - Info << "Reading field U\n" << endl; + Info<< "Reading field U\n" << endl; volVectorField U ( IOobject diff --git a/applications/solvers/incompressible/simpleFoam/createFields.H b/applications/solvers/incompressible/simpleFoam/createFields.H index ab424962554..b957c726505 100644 --- a/applications/solvers/incompressible/simpleFoam/createFields.H +++ b/applications/solvers/incompressible/simpleFoam/createFields.H @@ -1,4 +1,4 @@ - Info << "Reading field p\n" << endl; + Info<< "Reading field p\n" << endl; volScalarField p ( IOobject @@ -12,7 +12,7 @@ mesh ); - Info << "Reading field U\n" << endl; + Info<< "Reading field U\n" << endl; volVectorField U ( IOobject diff --git a/applications/solvers/lagrangian/coalChemistryFoam/chemistry.H b/applications/solvers/lagrangian/coalChemistryFoam/chemistry.H index 3a8a5c20f1e..5489dfefbaa 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/chemistry.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/chemistry.H @@ -1,5 +1,5 @@ { - Info << "Solving chemistry" << endl; + Info<< "Solving chemistry" << endl; chemistry.solve ( diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H index 3a8a5c20f1e..5489dfefbaa 100644 --- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H +++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/chemistry.H @@ -1,5 +1,5 @@ { - Info << "Solving chemistry" << endl; + Info<< "Solving chemistry" << endl; chemistry.solve ( diff --git a/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H b/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H index 3a8a5c20f1e..5489dfefbaa 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/chemistry.H @@ -1,5 +1,5 @@ { - Info << "Solving chemistry" << endl; + Info<< "Solving chemistry" << endl; chemistry.solve ( diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H index e422fe845b6..8a126905810 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H @@ -190,7 +190,7 @@ } } - Info << "dragPhase is " << dragPhase << endl; + Info<< "dragPhase is " << dragPhase << endl; kineticTheoryModel kineticTheory ( phasea, diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C index 582fa4cdd35..8fb79ad403d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C @@ -41,7 +41,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New interfaceDict.lookup("dragModel" + phasea.name()) ); - Info << "Selecting dragModel for phase " + Info<< "Selecting dragModel for phase " << phasea.name() << ": " << dragModelType << endl; @@ -57,7 +57,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New << dragModelType << ", constructor not in hash table" << endl << endl << " Valid dragModel types are : " << endl; - Info << dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError); + Info<< dictionaryConstructorTablePtr_->sortedToc() << abort(FatalError); } return cstrIter()(interfaceDict, alpha, phasea, phaseb); diff --git a/applications/test/Dictionary/DictionaryTest.C b/applications/test/Dictionary/DictionaryTest.C index 0af4dab6612..0f09f4f4a65 100644 --- a/applications/test/Dictionary/DictionaryTest.C +++ b/applications/test/Dictionary/DictionaryTest.C @@ -84,7 +84,7 @@ public: ~Scalar() { - Info <<"delete Scalar: " << data_ << endl; + Info<<"delete Scalar: " << data_ << endl; } friend Ostream& operator<<(Ostream& os, const Scalar& val) @@ -169,7 +169,7 @@ int main(int argc, char *argv[]) { Info<< " = " << iter() << endl; } - + PtrDictionary<Scalar> scalarDict2; for (int i = 8; i<15; i++) { @@ -186,22 +186,22 @@ int main(int argc, char *argv[]) { Info<< "elem = " << *iter << endl; } - + scalarDict.transfer(scalarDict2); - + Scalar* p = scalarDict.lookupPtr("ent8"); - + // This does not (yet) work // Scalar* q = scalarDict.remove("ent10"); if (p) { - Info << "found: " << *p << endl; + Info<< "found: " << *p << endl; } else { - Info << "no p: " << endl; + Info<< "no p: " << endl; } scalarDict.clear(); diff --git a/applications/test/IndirectList/IndirectListTest.C b/applications/test/IndirectList/IndirectListTest.C index 365c58a3830..b8abff97739 100644 --- a/applications/test/IndirectList/IndirectListTest.C +++ b/applications/test/IndirectList/IndirectListTest.C @@ -72,7 +72,7 @@ int main(int argc, char *argv[]) << "list: " << idl() << nl << endl; - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/test/LduMatrix/LduMatrixTest.C b/applications/test/LduMatrix/LduMatrixTest.C index 91a6dfb68d2..bc244ff525a 100644 --- a/applications/test/LduMatrix/LduMatrixTest.C +++ b/applications/test/LduMatrix/LduMatrixTest.C @@ -155,7 +155,7 @@ int main(int argc, char *argv[]) Info<< psi << endl; - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/test/LduMatrix/LduMatrixTest2.C b/applications/test/LduMatrix/LduMatrixTest2.C index 02db866ae51..5e47df1daf4 100644 --- a/applications/test/LduMatrix/LduMatrixTest2.C +++ b/applications/test/LduMatrix/LduMatrixTest2.C @@ -155,7 +155,7 @@ int main(int argc, char *argv[]) Info<< psi << endl; - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/test/Map/MapTest.C b/applications/test/Map/MapTest.C index 7fb05e76a51..117f4337b6f 100644 --- a/applications/test/Map/MapTest.C +++ b/applications/test/Map/MapTest.C @@ -53,15 +53,15 @@ int main(int argc, char *argv[]) if (bananaIter == banana.end()) { - Info << "not found" << endl; + Info<< "not found" << endl; } else { - Info << "5 is " << bananaIter() << endl; + Info<< "5 is " << bananaIter() << endl; } // Same with STL - Info << "Same with STL" << endl; + Info<< "Same with STL" << endl; std::map<label, bool> STLbanana; STLbanana[5] = true; @@ -69,11 +69,11 @@ int main(int argc, char *argv[]) if (STLbananaIter == STLbanana.end()) { - Info << "not found" << endl; + Info<< "not found" << endl; } else { - Info << "5 is " << STLbananaIter->second << endl; + Info<< "5 is " << STLbananaIter->second << endl; } diff --git a/applications/test/Matrix/MatrixTest.C b/applications/test/Matrix/MatrixTest.C index 5576291fd50..fabbb5c5f93 100644 --- a/applications/test/Matrix/MatrixTest.C +++ b/applications/test/Matrix/MatrixTest.C @@ -71,7 +71,7 @@ int main(int argc, char *argv[]) hmm4 = hmm5; Info<< hmm5 << endl; - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/test/NamedEnum/namedEnumTest.C b/applications/test/NamedEnum/namedEnumTest.C index 918e3b63b2a..728d54ecb81 100644 --- a/applications/test/NamedEnum/namedEnumTest.C +++ b/applications/test/NamedEnum/namedEnumTest.C @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) namedEnumTest::options hmm(namedEnumTest::namedEnum.read(Sin)); Info<< namedEnumTest::namedEnum[hmm] << endl; - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/test/ODETest/ODETest.C b/applications/test/ODETest/ODETest.C index 2d8cecfa9ac..acb444a0a52 100644 --- a/applications/test/ODETest/ODETest.C +++ b/applications/test/ODETest/ODETest.C @@ -167,7 +167,7 @@ int main(int argc, char *argv[]) Info<< nl << "Analytical: y(2.0) = " << yEnd << endl; Info << "Numerical: y(2.0) = " << y << ", hEst = " << hEst << endl; - Info << "\nEnd\n" << endl; + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/test/POSIX/POSIXTest.C b/applications/test/POSIX/POSIXTest.C index 86679c2c907..08052ecba9b 100644 --- a/applications/test/POSIX/POSIXTest.C +++ b/applications/test/POSIX/POSIXTest.C @@ -37,7 +37,7 @@ int main(int argc, char *argv[]) { rmDir("hmm"); - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/test/PackedList2/PackedListTest2.C b/applications/test/PackedList2/PackedListTest2.C index ef027fee2e4..d6e8c93bc26 100644 --- a/applications/test/PackedList2/PackedListTest2.C +++ b/applications/test/PackedList2/PackedListTest2.C @@ -386,7 +386,7 @@ int main(int argc, char *argv[]) << " s" << endl; - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/test/PtrList/PtrListTest.C b/applications/test/PtrList/PtrListTest.C index 7fbff08d11c..61f0985ea39 100644 --- a/applications/test/PtrList/PtrListTest.C +++ b/applications/test/PtrList/PtrListTest.C @@ -54,7 +54,7 @@ public: ~Scalar() { - Info <<"delete Scalar: " << data_ << endl; + Info<<"delete Scalar: " << data_ << endl; } autoPtr<Scalar> clone() const; diff --git a/applications/test/Tuple2/Tuple2Test.C b/applications/test/Tuple2/Tuple2Test.C index d770b4f8391..b535f6a45c7 100644 --- a/applications/test/Tuple2/Tuple2Test.C +++ b/applications/test/Tuple2/Tuple2Test.C @@ -44,7 +44,7 @@ int main() Info<< t2 << " " << t2.first() << " " << t2.second() << endl; - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/test/UIndirectListTest/UIndirectListTest.C b/applications/test/UIndirectListTest/UIndirectListTest.C index 67943b7d942..120217b673b 100644 --- a/applications/test/UIndirectListTest/UIndirectListTest.C +++ b/applications/test/UIndirectListTest/UIndirectListTest.C @@ -100,7 +100,7 @@ int main(int argc, char *argv[]) dynList.append(UIndirectList<double>(completeList, addresses)); Info<< "DynamicList::append(UIndirectList): " << dynList << endl; - Info << "\nEnd\n" << endl; + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/test/callback/callbackTest.C b/applications/test/callback/callbackTest.C index dc344246783..f9d35dd0239 100644 --- a/applications/test/callback/callbackTest.C +++ b/applications/test/callback/callbackTest.C @@ -118,7 +118,7 @@ int main(int argc, char *argv[]) cbr.testCallbackFunction(); - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/test/dimensionedType/dimensionedTypeTest.C b/applications/test/dimensionedType/dimensionedTypeTest.C index d87391ab6d8..400d9a5d212 100644 --- a/applications/test/dimensionedType/dimensionedTypeTest.C +++ b/applications/test/dimensionedType/dimensionedTypeTest.C @@ -42,7 +42,7 @@ int main(int argc, char *argv[]) Info<< ds*dt << " " << dt*ds << endl; - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/test/fileName/fileNameTest.C b/applications/test/fileName/fileNameTest.C index c4791f6f385..81ebd5c255b 100644 --- a/applications/test/fileName/fileNameTest.C +++ b/applications/test/fileName/fileNameTest.C @@ -108,8 +108,7 @@ int main() Info<< " badName(die) => " << findEtcFile("badName", true) << nl << endl; - Info<< "\nEnd" << endl; - + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/test/fileNameClean/fileNameCleanTest.C b/applications/test/fileNameClean/fileNameCleanTest.C index b41cc434ca0..2d791439e99 100644 --- a/applications/test/fileNameClean/fileNameCleanTest.C +++ b/applications/test/fileNameClean/fileNameCleanTest.C @@ -95,8 +95,7 @@ int main(int argc, char *argv[]) printCleaning(pathName); } - Info<< "\nEnd" << endl; - + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/test/liquid/liquidTest.C b/applications/test/liquid/liquidTest.C index 34837df39a3..fe32c13e280 100644 --- a/applications/test/liquid/liquidTest.C +++ b/applications/test/liquid/liquidTest.C @@ -39,7 +39,7 @@ int main() Info<< fuel.rho(1e5, 300) << endl; Info<< fuel << endl; - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/test/mesh/meshTest.C b/applications/test/mesh/meshTest.C index 50419836759..91a003bc17d 100644 --- a/applications/test/mesh/meshTest.C +++ b/applications/test/mesh/meshTest.C @@ -59,7 +59,7 @@ int main(int argc, char *argv[]) Info<< Cf << endl; - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/test/pTraits/pTraitsTest.C b/applications/test/pTraits/pTraitsTest.C index 4fcdfce7198..2697e6b7326 100644 --- a/applications/test/pTraits/pTraitsTest.C +++ b/applications/test/pTraits/pTraitsTest.C @@ -38,7 +38,7 @@ int main() { Info<< pTraits<scalar>::typeName << endl; - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/test/primitivePatch/testPrimitivePatch.C b/applications/test/primitivePatch/testPrimitivePatch.C index e19b7d0512b..cf24ab3435f 100644 --- a/applications/test/primitivePatch/testPrimitivePatch.C +++ b/applications/test/primitivePatch/testPrimitivePatch.C @@ -137,7 +137,7 @@ void writeFaceEdges const labelList& myEdges = faceEdges[faceI]; forAll(myEdges, i) - { + { const edge& e = edges[myEdges[i]]; feStream<< "l " << e.start()+1 << ' ' << e.end()+1 << endl; @@ -172,7 +172,7 @@ void writeEdgeFaces const labelList& myFaces = edgeFaces[edgeI]; forAll(myFaces, i) - { + { efStream<< "l " << myFaces[0]+1 << ' ' << myFaces[i]+1 << endl; } } @@ -249,7 +249,7 @@ int main(int argc, char *argv[]) writeFaceFaces(localPoints, localFaces, faceFaces); - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/test/readCHEMKINIII/readCHEMKINIII.C b/applications/test/readCHEMKINIII/readCHEMKINIII.C index 50721d64ead..10514de3fe1 100644 --- a/applications/test/readCHEMKINIII/readCHEMKINIII.C +++ b/applications/test/readCHEMKINIII/readCHEMKINIII.C @@ -91,7 +91,7 @@ int main(int argc, char *argv[]) Info<< testReactions << endl; } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/test/simpleMatrix/simpleMatrixTest.C b/applications/test/simpleMatrix/simpleMatrixTest.C index e26c4ea4a75..709eb819f31 100644 --- a/applications/test/simpleMatrix/simpleMatrixTest.C +++ b/applications/test/simpleMatrix/simpleMatrixTest.C @@ -56,7 +56,7 @@ int main(int argc, char *argv[]) Info<< hmm.LUsolve() << endl; Info<< hmm << endl; - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/test/string/stringTest.C b/applications/test/string/stringTest.C index 2ed59bf88f7..7c74de93ed2 100644 --- a/applications/test/string/stringTest.C +++ b/applications/test/string/stringTest.C @@ -102,8 +102,7 @@ int main(int argc, char *argv[]) Info<< "Ostream<< >" << s2 << "<\n"; Info<< "hash:" << hex << string::hash()(s2) << endl; - Info << "End\n" << endl; - + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/test/testPointEdgeWave/testPointEdgeWave.C b/applications/test/testPointEdgeWave/testPointEdgeWave.C index 124b7a921ab..10856cbead9 100644 --- a/applications/test/testPointEdgeWave/testPointEdgeWave.C +++ b/applications/test/testPointEdgeWave/testPointEdgeWave.C @@ -52,7 +52,7 @@ int main(int argc, char *argv[]) // Get name of patch word patchName(args.additionalArgs()[0]); - + // Find the label in patches by name. label patchI = patches.findPatchID(patchName); @@ -131,8 +131,7 @@ int main(int argc, char *argv[]) psf.write(); - Info << nl << "End" << endl; - + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C b/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C index 9fb3a646d65..76f67f6cdba 100644 --- a/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C +++ b/applications/utilities/errorEstimation/estimateScalarError/estimateScalarError.C @@ -98,10 +98,10 @@ int main(int argc, char *argv[]) if (THeader.headerOk() && Uheader.headerOk()) { - Info << "Reading T" << endl; + Info<< "Reading T" << endl; volScalarField T(THeader, mesh); - Info << "Reading U" << endl; + Info<< "Reading U" << endl; volVectorField U(Uheader, mesh); # include "createPhi.H" diff --git a/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C b/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C index c236b76eb40..df1069f0bfc 100644 --- a/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C +++ b/applications/utilities/errorEstimation/icoErrorEstimate/icoErrorEstimate.C @@ -93,10 +93,10 @@ int main(int argc, char *argv[]) if (pHeader.headerOk() && Uheader.headerOk()) { - Info << "Reading p" << endl; + Info<< "Reading p" << endl; volScalarField p(pHeader, mesh); - Info << "Reading U" << endl; + Info<< "Reading U" << endl; volVectorField U(Uheader, mesh); # include "createPhi.H" diff --git a/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C b/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C index 67551e1eecc..edfe1a3b598 100644 --- a/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C +++ b/applications/utilities/errorEstimation/icoMomentError/icoMomentError.C @@ -94,10 +94,10 @@ int main(int argc, char *argv[]) if (pHeader.headerOk() && Uheader.headerOk()) { - Info << "Reading p" << endl; + Info<< "Reading p" << endl; volScalarField p(pHeader, mesh); - Info << "Reading U" << endl; + Info<< "Reading U" << endl; volVectorField U(Uheader, mesh); # include "createPhi.H" diff --git a/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C b/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C index f1767e75b01..145f03f737c 100644 --- a/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C +++ b/applications/utilities/errorEstimation/momentScalarError/momentScalarError.C @@ -99,10 +99,10 @@ int main(int argc, char *argv[]) if (THeader.headerOk() && Uheader.headerOk()) { - Info << "Reading T" << endl; + Info<< "Reading T" << endl; volScalarField T(THeader, mesh); - Info << "Reading U" << endl; + Info<< "Reading U" << endl; volVectorField U(Uheader, mesh); # include "createPhi.H" diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C index 82e6f2c4c91..858ceb2fdb9 100644 --- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C +++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C @@ -1015,7 +1015,7 @@ int main(int argc, char *argv[]) } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C index 51ae42fb25c..bc0a575207d 100644 --- a/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C +++ b/applications/utilities/mesh/advanced/collapseEdges/collapseEdges.C @@ -596,7 +596,7 @@ int main(int argc, char *argv[]) mesh.write(); } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C index 5e240daff16..5fc2803c8d8 100644 --- a/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C +++ b/applications/utilities/mesh/advanced/combinePatchFaces/combinePatchFaces.C @@ -510,7 +510,7 @@ int main(int argc, char *argv[]) Info<< "Mesh unchanged." << endl; } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C index a91361897d5..efe2b761ed4 100644 --- a/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C +++ b/applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C @@ -560,7 +560,7 @@ int main(int argc, char *argv[]) } // Write resulting mesh - Info << "Writing modified mesh to time " << runTime.timeName() << endl; + Info<< "Writing modified mesh to time " << runTime.timeName() << endl; mesh.write(); } else if (edgeToPos.size()) @@ -613,7 +613,7 @@ int main(int argc, char *argv[]) } // Write resulting mesh - Info << "Writing modified mesh to time " << runTime.timeName() << endl; + Info<< "Writing modified mesh to time " << runTime.timeName() << endl; mesh.write(); } else @@ -656,13 +656,12 @@ int main(int argc, char *argv[]) } // Write resulting mesh - Info << "Writing modified mesh to time " << runTime.timeName() << endl; + Info<< "Writing modified mesh to time " << runTime.timeName() << endl; mesh.write(); } - Info << nl << "End" << endl; - + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C index 4e48feeea54..7e42676f3a4 100644 --- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C +++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C @@ -234,11 +234,11 @@ int main(int argc, char *argv[]) } // Write resulting mesh - Info << "Writing refined morphMesh to time " << runTime.timeName() << endl; + Info<< "Writing refined morphMesh to time " << runTime.timeName() << endl; mesh.write(); - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C index 402b26295d5..d3b1e14c63e 100644 --- a/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C +++ b/applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C @@ -355,8 +355,7 @@ int main(int argc, char *argv[]) << nl << endl; } - Info << nl << "End" << endl; - + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/mesh/advanced/selectCells/selectCells.C b/applications/utilities/mesh/advanced/selectCells/selectCells.C index c7dbdd8e42d..4d690016be3 100644 --- a/applications/utilities/mesh/advanced/selectCells/selectCells.C +++ b/applications/utilities/mesh/advanced/selectCells/selectCells.C @@ -469,7 +469,7 @@ int main(int argc, char *argv[]) MESH, // meshType NONMESH, // fill type mesh.nCells() - ); + ); Info<< "Removing points connecting cells unconnected by faces ..." @@ -510,7 +510,7 @@ int main(int argc, char *argv[]) writeSet(selectedCells, "cells selected for meshing"); - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/mesh/advanced/splitCells/splitCells.C b/applications/utilities/mesh/advanced/splitCells/splitCells.C index c916be8daa1..6cad468c2c3 100644 --- a/applications/utilities/mesh/advanced/splitCells/splitCells.C +++ b/applications/utilities/mesh/advanced/splitCells/splitCells.C @@ -701,7 +701,7 @@ int main(int argc, char *argv[]) mesh.write(); } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L index cbb52ab0e0a..c985d3ab4f4 100644 --- a/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L +++ b/applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L @@ -267,7 +267,7 @@ int main(int argc, char *argv[]) while(lexer.yylex() != 0) {} - Info << "Creating points" << endl; + Info<< "Creating points" << endl; pointField points(slPoints.size()); @@ -297,7 +297,7 @@ int main(int argc, char *argv[]) pointMap[pointMapIter()] = i++; } - Info << "Creating cells" << endl; + Info<< "Creating cells" << endl; labelList cellMap(maxCelli+1); @@ -409,7 +409,7 @@ int main(int argc, char *argv[]) { 4, 2, 1, 3, 0, 5}, // hex }; - Info << "Creating boundary patches" << endl; + Info<< "Creating boundary patches" << endl; faceListList boundary(slPatchCells.size()); wordList patchNames(slPatchCells.size()); @@ -442,11 +442,11 @@ int main(int argc, char *argv[]) boundary[patchI] = patchFaces; patchNames[patchI] = word("patch") + name(patchI + 1); - Info << "Patch " << patchI << " named " << patchNames[patchI] + Info<< "Patch " << patchI << " named " << patchNames[patchI] << ": " << boundary[patchI].size() << " faces" << endl; } - Info << "ansysToFoam: " << endl + Info<< "ansysToFoam: " << endl << "Ansys file format does not provide information about the type of " << "the patch (eg. wall, symmetry plane, cyclic etc)." << endl << "All the patches have been created " @@ -491,7 +491,7 @@ int main(int argc, char *argv[]) // Set the precision of the points data to 10 IOstream::defaultPrecision(10); - Info << "Writing polyMesh" << endl; + Info<< "Writing polyMesh" << endl; pShapeMesh.write(); Info<< nl << "end" << endl; diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C index d193a481330..7684db4c32f 100644 --- a/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C +++ b/applications/utilities/mesh/conversion/cfx4ToFoam/cfx4ToFoam.C @@ -73,7 +73,7 @@ int main(int argc, char *argv[]) cfxFile >> nblock >> npatch >> nglue >> nelem >> npoint; - Info << "Reading blocks" << endl; + Info<< "Reading blocks" << endl; PtrList<hexBlock> blocks(nblock); @@ -90,7 +90,7 @@ int main(int argc, char *argv[]) } } - Info << "Reading patch definitions" << endl; + Info<< "Reading patch definitions" << endl; wordList cfxPatchTypes(npatch); wordList cfxPatchNames(npatch); @@ -126,7 +126,7 @@ int main(int argc, char *argv[]) } } - Info << "Reading block glueing information" << endl; + Info<< "Reading block glueing information" << endl; labelList glueMasterPatches(nglue, -1); labelList glueSlavePatches(nglue, -1); @@ -145,15 +145,15 @@ int main(int argc, char *argv[]) } } - Info << "Reading block points" << endl; + Info<< "Reading block points" << endl; forAll (blocks, blockI) { - Info << "block " << blockI << " is a "; + Info<< "block " << blockI << " is a "; blocks[blockI].readPoints(cfxFile); } - Info << "Calculating block offsets" << endl; + Info<< "Calculating block offsets" << endl; labelList blockOffsets(nblock, -1); @@ -172,7 +172,7 @@ int main(int argc, char *argv[]) + blocks[blockI - 1].nBlockPoints(); } - Info << "Assembling patches" << endl; + Info<< "Assembling patches" << endl; faceListList rawPatches(npatch); @@ -203,13 +203,13 @@ int main(int argc, char *argv[]) } } - Info << "Merging points "; + Info<< "Merging points "; labelList pointMergeList(nMeshPoints, -1); // In order to ensure robust merging, it is necessary to traverse // the patch glueing list until the pointMergeList stops changing. - // + // // For efficiency, create merge pairs in the first pass labelListListList glueMergePairs(glueMasterPatches.size()); @@ -396,7 +396,7 @@ int main(int argc, char *argv[]) ) { changedPointMerge = true; - + pointMergeList[PpointLabel] = pointMergeList[NpointLabel] = min @@ -408,10 +408,10 @@ int main(int argc, char *argv[]) } } } - Info << "." << flush; + Info<< "." << flush; } while (changedPointMerge && nPasses < 8); - Info << endl; + Info<< endl; if (changedPointMerge == true) { @@ -509,7 +509,7 @@ int main(int argc, char *argv[]) nMeshPoints = nNewPoints; - Info << "Creating points" << endl; + Info<< "Creating points" << endl; pointField points(nMeshPoints); @@ -536,7 +536,7 @@ int main(int argc, char *argv[]) points *= scaleFactor; } - Info << "Creating cells" << endl; + Info<< "Creating cells" << endl; cellShapeList cellShapes(nMeshCells); @@ -568,7 +568,7 @@ int main(int argc, char *argv[]) } } - Info << "Creating boundary patches" << endl; + Info<< "Creating boundary patches" << endl; faceListList boundary(npatch); wordList patchNames(npatch); @@ -600,7 +600,7 @@ int main(int argc, char *argv[]) if (existingPatch >= 0) { - Info << "CFX patch " << patchI + Info<< "CFX patch " << patchI << ", of type " << cfxPatchTypes[patchI] << ", name " << cfxPatchNames[patchI] << " already exists as FOAM patch " << existingPatch @@ -652,7 +652,7 @@ int main(int argc, char *argv[]) } } - Info << "CFX patch " << patchI + Info<< "CFX patch " << patchI << ", of type " << cfxPatchTypes[patchI] << ", name " << cfxPatchNames[patchI] << " converted into FOAM patch " << nCreatedPatches @@ -660,7 +660,7 @@ int main(int argc, char *argv[]) if (cfxPatchTypes[patchI] == "WALL") { - Info << "wall." << endl; + Info<< "wall." << endl; patchTypes[nCreatedPatches] = wallPolyPatch::typeName; patchNames[nCreatedPatches] = cfxPatchNames[patchI]; @@ -668,7 +668,7 @@ int main(int argc, char *argv[]) } else if (cfxPatchTypes[patchI] == "SYMMET") { - Info << "symmetryPlane." << endl; + Info<< "symmetryPlane." << endl; patchTypes[nCreatedPatches] = symmetryPolyPatch::typeName; patchNames[nCreatedPatches] = cfxPatchNames[patchI]; @@ -683,7 +683,7 @@ int main(int argc, char *argv[]) || cfxPatchTypes[patchI] == "USER2D" ) { - Info << "generic." << endl; + Info<< "generic." << endl; patchTypes[nCreatedPatches] = polyPatch::typeName; patchNames[nCreatedPatches] = cfxPatchNames[patchI]; @@ -737,10 +737,10 @@ int main(int argc, char *argv[]) // Set the precision of the points data to 10 IOstream::defaultPrecision(10); - Info << "Writing polyMesh" << endl; + Info<< "Writing polyMesh" << endl; pShapeMesh.write(); - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C b/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C index b9bfee00ffb..bf16792211a 100644 --- a/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C +++ b/applications/utilities/mesh/conversion/cfx4ToFoam/hexBlock.C @@ -70,12 +70,12 @@ void hexBlock::readPoints(Istream& is) if (((i ^ j) & k) > 0) { - Info << "right-handed block" << endl; + Info<< "right-handed block" << endl; blockHandedness_ = right; } else { - Info << "left-handed block" << endl; + Info<< "left-handed block" << endl; blockHandedness_ = left; } } diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L index 35b268d3e8c..6ccb2697f4f 100644 --- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L +++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L @@ -1356,7 +1356,7 @@ int main(int argc, char *argv[]) mesh.write(); - Info<< nl << "End" << endl; + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L index d1afc4523a5..bcba234fe14 100644 --- a/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L +++ b/applications/utilities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L @@ -1729,7 +1729,7 @@ int main(int argc, char *argv[]) } } - Info<< nl << "End" << endl; + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C index 65ee7d1b497..228194e4c30 100644 --- a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C +++ b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C @@ -63,7 +63,7 @@ void Foam::fluentFvMesh::writeFluentMesh() const ).c_str() ); - Info << "Writing Header" << endl; + Info<< "Writing Header" << endl; fluentMeshFile << "(0 \"FOAM to Fluent Mesh File\")" << std::endl << std::endl diff --git a/applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C b/applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C index a276e534a17..a4d8b25f3be 100644 --- a/applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C +++ b/applications/utilities/mesh/conversion/foamMeshToFluent/foamMeshToFluent.C @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) mesh.writeFluentMesh(); - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L index d349f7709c1..4f8708710d1 100644 --- a/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L +++ b/applications/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L @@ -233,7 +233,7 @@ mtype {space}"MTYPE:"{space} <readProgramID>{space}{word} { - Info << "Written by " << YYText() << " "; + Info<< "Written by " << YYText() << " "; BEGIN(controlInfo); } @@ -245,20 +245,20 @@ mtype {space}"MTYPE:"{space} <readVersionID>{space}{versionNumber} { - Info << " version " << YYText() << endl; + Info<< " version " << YYText() << endl; BEGIN(controlInfo); } <controlInfo>{space}{dateDDMonYYYY}{space}{time} { - Info << "File written on " << YYText() << endl; + Info<< "File written on " << YYText() << endl; } <controlInfo>{space}{dateDDMMYYYY}{space}{time} { - Info << "File written on " << YYText() << endl; + Info<< "File written on " << YYText() << endl; } @@ -304,7 +304,7 @@ mtype {space}"MTYPE:"{space} {nodalCoords}{spaceNl} { curNumberOfNodes = 0; - Info << "Reading nodal coordinates" << endl; + Info<< "Reading nodal coordinates" << endl; BEGIN(nodalCoords); } @@ -332,7 +332,7 @@ mtype {space}"MTYPE:"{space} {cellsAndElements}{spaceNl} { curNumberOfCells = 0; - Info << "Reading cells" << endl; + Info<< "Reading cells" << endl; BEGIN(cellsAndElements); } @@ -422,7 +422,7 @@ mtype {space}"MTYPE:"{space} /* ------ Reading element group information ------ */ {cellStreams}{spaceNl} { - Info << "Reading cell streams" << endl; + Info<< "Reading cell streams" << endl; BEGIN(cellStreams); } @@ -504,7 +504,7 @@ mtype {space}"MTYPE:"{space} <cellStreamFlags>{labelList} { - Info << "Reading cell stream labels" << endl; + Info<< "Reading cell stream labels" << endl; BEGIN(cellStreamLabels); } @@ -529,7 +529,7 @@ mtype {space}"MTYPE:"{space} <cellStreamLabels>{endOfSection}\n { - Info << "Finished reading cell stream labels" << endl; + Info<< "Finished reading cell stream labels" << endl; // reset current group ID and a number of flags curGroupID = 0; @@ -541,7 +541,7 @@ mtype {space}"MTYPE:"{space} {boundaryPatch}{spaceNl} { curPatchFace = 0; - Info << "Reading patches" << endl; + Info<< "Reading patches" << endl; BEGIN(boundaryPatchParams); } @@ -668,7 +668,7 @@ int main(int argc, char *argv[]) while(lexer.yylex() != 0) {} - Info << "Finished lexing" << endl; + Info<< "Finished lexing" << endl; // make a point mapping array label maxPointIndex = 0; @@ -815,7 +815,7 @@ int main(int argc, char *argv[]) } } - Info << "gambitToFoam: " << endl + Info<< "gambitToFoam: " << endl << "Gambit file format does not provide information about the type of " << "the patch (eg. wall, symmetry plane, cyclic etc)." << endl << "All the patches have been created " @@ -864,10 +864,10 @@ int main(int argc, char *argv[]) // Set the precision of the points data to 10 IOstream::defaultPrecision(10); - Info << "Writing polyMesh" << endl; + Info<< "Writing polyMesh" << endl; pShapeMesh.write(); - Info<< nl << "End" << endl; + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C index f76e4dae462..551741974bf 100644 --- a/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C +++ b/applications/utilities/mesh/conversion/kivaToFoam/kivaToFoam.C @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) # include "readKivaGrid.H" - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.C b/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.C index c1f781f8998..3ed248a86eb 100644 --- a/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.C +++ b/applications/utilities/mesh/conversion/plot3dToFoam/hexBlock.C @@ -70,7 +70,7 @@ void hexBlock::setHandedness() } else { - Info << "Left-handed block." << endl; + Info<< "Left-handed block." << endl; blockHandedness_ = left; } return; diff --git a/applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C b/applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C index efca6a37b58..f3fc9a6e1dc 100644 --- a/applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C +++ b/applications/utilities/mesh/conversion/sammToFoam/createPolyBoundary.C @@ -111,8 +111,8 @@ void sammMesh::createPolyBoundary() // reset the size of the face list meshFaces_.setSize(nCreatedFaces); - Info << "Number of boundary faces: " << nBoundaryFacesFound << endl; - Info << "Total number of faces: " << nCreatedFaces << endl; + Info<< "Number of boundary faces: " << nBoundaryFacesFound << endl; + Info<< "Total number of faces: " << nCreatedFaces << endl; } diff --git a/applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C b/applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C index b2f1a54c4f5..80dd2e7541c 100644 --- a/applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C +++ b/applications/utilities/mesh/conversion/sammToFoam/createPolyCells.C @@ -55,7 +55,7 @@ void sammMesh::createPolyCells() maxFaces += cellFaces_[cellI].size(); } - Info << "Maximum possible number of faces in mesh: " << maxFaces << endl; + Info<< "Maximum possible number of faces in mesh: " << maxFaces << endl; meshFaces_.setSize(maxFaces); @@ -72,7 +72,7 @@ void sammMesh::createPolyCells() // Insertion cannot be done in one go as the faces need to be // added into the list in the increasing order of neighbour // cells. Therefore, all neighbours will be detected first - // and then added in the correct order. + // and then added in the correct order. const faceList& curFaces = cellFaces_[cellI]; @@ -109,7 +109,7 @@ void sammMesh::createPolyCells() label curNei = curNeighbours[neiI]; // reject neighbours with the lower label. This should - // also reject current cell. + // also reject current cell. if (curNei > cellI) { // get the list of search faces diff --git a/applications/utilities/mesh/conversion/sammToFoam/purgeCellShapes.C b/applications/utilities/mesh/conversion/sammToFoam/purgeCellShapes.C index 50fd89ce8f7..3abcdd645fa 100644 --- a/applications/utilities/mesh/conversion/sammToFoam/purgeCellShapes.C +++ b/applications/utilities/mesh/conversion/sammToFoam/purgeCellShapes.C @@ -55,12 +55,12 @@ void sammMesh::purgeCellShapes() if (!found) { - Info << "Purging cell shape " << cellI << endl; + Info<< "Purging cell shape " << cellI << endl; cellShapes_[cellI] = cellShape(*unknownPtr_, labelList(0)); break; } } - } + } } diff --git a/applications/utilities/mesh/conversion/sammToFoam/readCouples.C b/applications/utilities/mesh/conversion/sammToFoam/readCouples.C index 161123803ec..3d9609e84de 100644 --- a/applications/utilities/mesh/conversion/sammToFoam/readCouples.C +++ b/applications/utilities/mesh/conversion/sammToFoam/readCouples.C @@ -40,7 +40,7 @@ void sammMesh::readCouples() if (couplesFile.good()) { - Info << "\nReading couples" << endl; + Info<< "\nReading couples" << endl; // A mesh with couples cannot be a shape mesh isShapeMesh_ = false; @@ -71,7 +71,7 @@ void sammMesh::readCouples() // get reference to master cell faces faceList& masterFaces = cellFaces_[masterCell - 1]; -// Info << "Master cell: " << masterCell - 1 << " index: " +// Info<< "Master cell: " << masterCell - 1 << " index: " // << cellShapes_[masterCell - 1].model().index() // << " face: " << // masterFaces @@ -116,14 +116,14 @@ void sammMesh::readCouples() [slaveFace] ].reverseFace(); -// Info << " slave cell: " << slaveCell - 1 << " index: " +// Info<< " slave cell: " << slaveCell - 1 << " index: " // << cellShapes_[slaveCell - 1].model().index() // << " face: " << masterFaces[slaveToAdd] << endl; slaveToAdd++; } -// Info << endl; +// Info<< endl; } diff --git a/applications/utilities/mesh/conversion/sammToFoam/sammMesh.C b/applications/utilities/mesh/conversion/sammToFoam/sammMesh.C index a5bfd9791c2..8ed4ddea84b 100644 --- a/applications/utilities/mesh/conversion/sammToFoam/sammMesh.C +++ b/applications/utilities/mesh/conversion/sammToFoam/sammMesh.C @@ -104,7 +104,7 @@ List<const label*> sammMesh::sammAddressingTable // Make polyhedral mesh data (packing) void sammMesh::createPolyMeshData() { - Info << "Creating a polyMesh" << endl; + Info<< "Creating a polyMesh" << endl; createPolyCells(); @@ -124,7 +124,7 @@ void sammMesh::createPolyMeshData() { if (curFaceLabels[faceI] == -1) { - Info << "cell " << cellI + Info<< "cell " << cellI << " has got an unmatched face. " << "Index: " << cellShapes_[cellI].model().index() << endl // << "cell shape: " << cellShapes_[cellI] << endl @@ -142,7 +142,7 @@ void sammMesh::createPolyMeshData() if (nProblemCells > 0) { - Info << "Number of problem cells: " << nProblemCells << endl; + Info<< "Number of problem cells: " << nProblemCells << endl; } } diff --git a/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C b/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C index 8095529d327..0f5f2a2eb83 100644 --- a/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C +++ b/applications/utilities/mesh/conversion/sammToFoam/sammToFoam.C @@ -61,10 +61,10 @@ int main(int argc, char *argv[]) // Set the precision of the points data to 10 IOstream::defaultPrecision(10); - Info << "Writing mesh" << endl; + Info<< "Writing mesh" << endl; makeMesh.writeMesh(); - Info<< nl << "End" << nl << endl; + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/mesh/conversion/sammToFoam/writeMesh.C b/applications/utilities/mesh/conversion/sammToFoam/writeMesh.C index 546b6e24de4..141765be351 100644 --- a/applications/utilities/mesh/conversion/sammToFoam/writeMesh.C +++ b/applications/utilities/mesh/conversion/sammToFoam/writeMesh.C @@ -37,7 +37,7 @@ void sammMesh::writeMesh() { if (isShapeMesh_) { - Info << "This is a shapeMesh." << endl; + Info<< "This is a shapeMesh." << endl; polyMesh pShapeMesh ( @@ -57,7 +57,7 @@ void sammMesh::writeMesh() patchPhysicalTypes_ ); - Info << "Writing polyMesh" << endl; + Info<< "Writing polyMesh" << endl; pShapeMesh.write(); } else @@ -66,7 +66,7 @@ void sammMesh::writeMesh() createPolyMeshData(); - Info << "This is a polyMesh" << endl; + Info<< "This is a polyMesh" << endl; polyMesh pMesh ( @@ -83,7 +83,7 @@ void sammMesh::writeMesh() pMesh.addPatches(polyBoundaryPatches(pMesh)); - Info << "Writing polyMesh" << endl; + Info<< "Writing polyMesh" << endl; pMesh.write(); } } diff --git a/applications/utilities/mesh/conversion/starToFoam/createBoundaryFaces.C b/applications/utilities/mesh/conversion/starToFoam/createBoundaryFaces.C index 09a09de8d31..3875b68345a 100644 --- a/applications/utilities/mesh/conversion/starToFoam/createBoundaryFaces.C +++ b/applications/utilities/mesh/conversion/starToFoam/createBoundaryFaces.C @@ -127,7 +127,7 @@ void starMesh::markBoundaryFaces() { const label curCellIndex = facePointCells[cellI]; - const faceList& curCellFaces = + const faceList& curCellFaces = cellFaces_[curCellIndex]; forAll(curCellFaces, cellFaceI) @@ -159,11 +159,11 @@ void starMesh::markBoundaryFaces() { if (curFace[spI] > -1 && curFace[spI] < starPointID_.size()) { - Info << "," << starPointID_[curFace[spI]]; + Info<< "," << starPointID_[curFace[spI]]; } else { - Info << ",???"; + Info<< ",???"; } } @@ -176,7 +176,7 @@ void starMesh::markBoundaryFaces() void starMesh::collectBoundaryFaces() { - Info << "Collecting boundary faces" << endl; + Info<< "Collecting boundary faces" << endl; forAll(boundary_, patchI) { faceList& patchFaces = boundary_[patchI]; @@ -193,7 +193,7 @@ void starMesh::collectBoundaryFaces() } } - Info << "Finished collecting boundary faces" << endl; + Info<< "Finished collecting boundary faces" << endl; } diff --git a/applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C b/applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C index 5857f03e243..f2fcc8c7c8a 100644 --- a/applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C +++ b/applications/utilities/mesh/conversion/starToFoam/createCoupleMatches.C @@ -67,7 +67,7 @@ void starMesh::createCoupleMatches() { if (coupleI % infoJump == 0) { - Info << "Doing couple " << coupleI << ". STAR couple ID: " + Info<< "Doing couple " << coupleI << ". STAR couple ID: " << couples_[coupleI].coupleID() << endl; } @@ -179,7 +179,7 @@ void starMesh::createCoupleMatches() d -= n*(n & d); # ifdef DEBUG_COUPLE_INTERSECTION - Info << "curMasterEdge: " << curMasterEdge << endl + Info<< "curMasterEdge: " << curMasterEdge << endl << "P: " << P << endl << "d: " << d << endl; # endif @@ -198,7 +198,7 @@ void starMesh::createCoupleMatches() scalar det = -(e & (n ^ d)); # ifdef DEBUG_COUPLE_INTERSECTION - Info << "curSlaveEdge: " << curSlaveEdge << endl + Info<< "curSlaveEdge: " << curSlaveEdge << endl << "S: " << S << endl << "e: " << e << endl; # endif @@ -209,7 +209,7 @@ void starMesh::createCoupleMatches() scalar beta = ((S - P) & (n ^ d))/det; # ifdef DEBUG_COUPLE_INTERSECTION - Info << " beta: " << beta << endl; + Info<< " beta: " << beta << endl; # endif if (beta > -smallMergeTol_ && beta < 1 + smallMergeTol_) @@ -219,7 +219,7 @@ void starMesh::createCoupleMatches() (((S - P) & d) + beta*(d & e))/magSqr(d); # ifdef DEBUG_COUPLE_INTERSECTION - Info << " alpha: " << alpha << endl; + Info<< " alpha: " << alpha << endl; # endif if @@ -413,7 +413,7 @@ void starMesh::createCoupleMatches() scalar beta1 = (sp & e)/magSqr(e); # ifdef DEBUG_COUPLE_INTERSECTION - Info << "P: " << P << " S: " << S << " d: " << d + Info<< "P: " << P << " S: " << S << " d: " << d << " e: " << e << " sp: " << sp << " beta1: " << beta1 << endl; # endif @@ -446,7 +446,7 @@ void starMesh::createCoupleMatches() ) { # ifdef DEBUG_COUPLE_INTERSECTION - Info << "adding irregular slave " + Info<< "adding irregular slave " << "intersection2: " << points_[masterEdges[masterEdgeI].end()] << endl; @@ -463,10 +463,10 @@ void starMesh::createCoupleMatches() } // end of master edges # ifdef DEBUG_COUPLE_INTERSECTION - Info << "additional slave edge points: " << endl; + Info<< "additional slave edge points: " << endl; forAll (slaveEdgePoints, edgeI) { - Info << "edge: " << edgeI << ": " << slaveEdgePoints[edgeI] + Info<< "edge: " << edgeI << ": " << slaveEdgePoints[edgeI] << endl; } # endif @@ -475,7 +475,7 @@ void starMesh::createCoupleMatches() if (nLivePoints + coupleFacePoints.size() >= points_.size()) { // increase the size of the points list - Info << "Resizing points list" << endl; + Info<< "Resizing points list" << endl; points_.setSize(points_.size() + couples_.size()); } @@ -511,7 +511,7 @@ void starMesh::createCoupleMatches() label nTmpMasterLabels = 0; # ifdef DEBUG_COUPLE_INTERSECTION - Info << "masterFace: " << masterFace << endl + Info<< "masterFace: " << masterFace << endl << "nAdditionalMasterPoints: " << nAdditionalMasterPoints << endl; # endif @@ -588,7 +588,7 @@ void starMesh::createCoupleMatches() } # ifdef DEBUG_FACE_ORDERING - Info << "nextPointLabel: " << nextPointLabel << endl; + Info<< "nextPointLabel: " << nextPointLabel << endl; # endif i++; @@ -619,7 +619,7 @@ void starMesh::createCoupleMatches() tmpMasterFace.setSize(nTmpMasterLabels); # ifdef DEBUG_FACE_ORDERING - Info << "tmpMasterFace: " << tmpMasterFace << endl; + Info<< "tmpMasterFace: " << tmpMasterFace << endl; # endif // Eliminate all zero-length edges @@ -657,7 +657,7 @@ void starMesh::createCoupleMatches() ); # ifdef DEBUG_FACE_ORDERING - Info << "Collapsed: nMaster: " << nMaster + Info<< "Collapsed: nMaster: " << nMaster << " label: " << newMasterFace[nMaster] << endl; # endif @@ -727,7 +727,7 @@ void starMesh::createCoupleMatches() vector edgeVector = slaveEdges[slaveEdgeI].vec(points_); # ifdef DEBUG_FACE_ORDERING - Info << "curSEdgePoints.size(): " + Info<< "curSEdgePoints.size(): " << curSEdgePoints.size() << endl << "edgeVector: " << edgeVector << endl; # endif @@ -782,7 +782,7 @@ void starMesh::createCoupleMatches() } # ifdef DEBUG_FACE_ORDERING - Info << "nextPointLabel: " << nextPointLabel << endl; + Info<< "nextPointLabel: " << nextPointLabel << endl; # endif i++; @@ -813,7 +813,7 @@ void starMesh::createCoupleMatches() tmpSlaveFace.setSize(nTmpSlaveLabels); # ifdef DEBUG_FACE_ORDERING - Info << "tmpSlaveFace: " << tmpSlaveFace << endl; + Info<< "tmpSlaveFace: " << tmpSlaveFace << endl; # endif // Eliminate all zero-length edges @@ -834,7 +834,7 @@ void starMesh::createCoupleMatches() forAll(slvEdgesToCollapse, edgeI) { # ifdef DEBUG_FACE_ORDERING - Info << "slave edge length: " << edgeI << ", " + Info<< "slave edge length: " << edgeI << ", " << slvEdgesToCollapse[edgeI].mag(points_)<< endl; # endif @@ -880,7 +880,7 @@ void starMesh::createCoupleMatches() edgeList newSlaveEdges = newSlaveFace.edges(); # ifdef DEBUG_RIGHT_HAND_WALK - Info << "newMasterEdges: " << newMasterEdges << endl + Info<< "newMasterEdges: " << newMasterEdges << endl << "newSlaveEdges: " << newSlaveEdges << endl; # endif @@ -926,7 +926,7 @@ void starMesh::createCoupleMatches() startEdgeFound = 2; # ifdef DEBUG_RIGHT_HAND_WALK - Info << "slave edge found" << endl; + Info<< "slave edge found" << endl; # endif break; @@ -969,7 +969,7 @@ void starMesh::createCoupleMatches() startEdgeFound = 1; # ifdef DEBUG_RIGHT_HAND_WALK - Info << "master edge found" << endl; + Info<< "master edge found" << endl; # endif break; @@ -986,7 +986,7 @@ void starMesh::createCoupleMatches() if (startEdgeFound > 0) { # ifdef DEBUG_RIGHT_HAND_WALK - Info << "start edge: " << startEdge << endl; + Info<< "start edge: " << startEdge << endl; # endif // Loop through both faces and add all edges @@ -1004,7 +1004,7 @@ void starMesh::createCoupleMatches() planeNormal /= mag(planeNormal) + VSMALL; # ifdef DEBUG_RIGHT_HAND_WALK - Info << "planeNormal: " << planeNormal << endl; + Info<< "planeNormal: " << planeNormal << endl; # endif // Do a check to control the right-hand turn. This is @@ -1034,7 +1034,7 @@ void starMesh::createCoupleMatches() if (tripleProduct < 0) { # ifdef DEBUG_RIGHT_HAND_WALK - Info << "Turning edge for right-hand turn rule" << endl; + Info<< "Turning edge for right-hand turn rule" << endl; # endif startEdge = startEdge.reverseEdge(); } @@ -1155,7 +1155,7 @@ void starMesh::createCoupleMatches() scalar curGoStraight = newDir & ahead; # ifdef DEBUG_RIGHT_HAND_WALK - Info << "curRightTurn: " << curRightTurn + Info<< "curRightTurn: " << curRightTurn << " curGoStraight: " << curGoStraight << endl; # endif @@ -1167,7 +1167,7 @@ void starMesh::createCoupleMatches() if (curGoStraight > goStraight) { # ifdef DEBUG_RIGHT_HAND_WALK - Info << "a" << endl; + Info<< "a" << endl; # endif // Good edge, turning left less than before @@ -1179,7 +1179,7 @@ void starMesh::createCoupleMatches() else // new edge turning right { # ifdef DEBUG_RIGHT_HAND_WALK - Info << "b" << endl; + Info<< "b" << endl; # endif // good edge, turning right @@ -1197,7 +1197,7 @@ void starMesh::createCoupleMatches() if (curGoStraight < goStraight) { # ifdef DEBUG_RIGHT_HAND_WALK - Info << "c" << endl; + Info<< "c" << endl; # endif // good edge, turning right more than before @@ -1256,7 +1256,7 @@ void starMesh::createCoupleMatches() intersectedFace.setSize(nIntFacePoints); # ifdef DEBUG_COUPLE - Info << "intersectedFace: " << intersectedFace << endl; + Info<< "intersectedFace: " << intersectedFace << endl; # endif // check the intersection face for duplicate points @@ -1315,7 +1315,7 @@ void starMesh::createCoupleMatches() forAll (intersectedFace, intPointI) { # ifdef DEBUG_COUPLE_PROJECTION - Info << "Proj: old point: " + Info<< "Proj: old point: " << points_[intersectedFace[intPointI]] << endl; # endif @@ -1501,7 +1501,7 @@ void starMesh::createCoupleMatches() points_.setSize(nLivePoints); // Finished - Info << "Finished doing couples" << endl; + Info<< "Finished doing couples" << endl; } } diff --git a/applications/utilities/mesh/conversion/starToFoam/createPolyBoundary.C b/applications/utilities/mesh/conversion/starToFoam/createPolyBoundary.C index 5f1e4b72604..e8eb4ec479c 100644 --- a/applications/utilities/mesh/conversion/starToFoam/createPolyBoundary.C +++ b/applications/utilities/mesh/conversion/starToFoam/createPolyBoundary.C @@ -99,7 +99,7 @@ void starMesh::createPolyBoundary() << curCellFaces[cellFaceI] << endl; - Info << "PROSTAR Command: vset,news,vlis"; + Info<< "PROSTAR Command: vset,news,vlis"; forAll (curCellFaces[cellFaceI], spI) { // check if the point is given by STAR @@ -118,10 +118,10 @@ void starMesh::createPolyBoundary() } else { - Info << ",???"; + Info<< ",???"; } } - Info << " $ bset,add,vset,all" << endl; + Info<< " $ bset,add,vset,all" << endl; } else { @@ -135,7 +135,7 @@ void starMesh::createPolyBoundary() << curCellFaces[cellFaceI] << endl; - Info << "PROSTAR Command: vset,news,vlis"; + Info<< "PROSTAR Command: vset,news,vlis"; forAll (curCellFaces[cellFaceI], spI) { // check if the point is given by STAR @@ -154,10 +154,10 @@ void starMesh::createPolyBoundary() } else { - Info << ",???"; + Info<< ",???"; } } - Info << " $ bset,add,vset,all" << endl; + Info<< " $ bset,add,vset,all" << endl; } } @@ -191,7 +191,7 @@ void starMesh::createPolyBoundary() { const face& missingFace = cellFaces_[cellI][faceI]; - Info << "starMesh::createPolyBoundary() : " + Info<< "starMesh::createPolyBoundary() : " << "missing face found in cell " << cellI << ".\nType: " << cellShapes_[cellI].model().name() << ". STAR cell number: " << starCellID_[cellI] @@ -199,7 +199,7 @@ void starMesh::createPolyBoundary() nMissingFaceFound++; - Info << "PROSTAR Command: vset,news,vlis"; + Info<< "PROSTAR Command: vset,news,vlis"; forAll (missingFace, spI) { // check if the point is given by STAR or created locally @@ -209,21 +209,21 @@ void starMesh::createPolyBoundary() && missingFace[spI] < starPointID_.size() ) { - Info << "," << starPointID_[missingFace[spI]]; + Info<< "," << starPointID_[missingFace[spI]]; } else { - Info << ",???"; + Info<< ",???"; } } - Info << " $ bset,add,vset,all" << endl; + Info<< " $ bset,add,vset,all" << endl; } } } if (nMissingFaceFound > 0) { - Info << "Number of unmatched faces: " << nMissingFaceFound << endl; + Info<< "Number of unmatched faces: " << nMissingFaceFound << endl; } // reset the size of the face list @@ -256,14 +256,14 @@ void starMesh::createPolyBoundary() { const face& problemFace = meshFaces_[faceI]; - Info << "starMesh::createPolyBoundary() : " + Info<< "starMesh::createPolyBoundary() : " << "problem with face " << faceI << ": addressed " << markupFaces[faceI] << " times (should be 2!). Face: " << problemFace << endl; nProblemFacesFound++; - Info << "PROSTAR Command: vset,news,vlis"; + Info<< "PROSTAR Command: vset,news,vlis"; forAll (problemFace, spI) { // check if the point is given by STAR or created locally @@ -273,25 +273,25 @@ void starMesh::createPolyBoundary() && problemFace[spI] < starPointID_.size() ) { - Info << "," << starPointID_[problemFace[spI]]; + Info<< "," << starPointID_[problemFace[spI]]; } else { - Info << ",???"; + Info<< ",???"; } } - Info << " $ bset,add,vset,all" << endl; + Info<< " $ bset,add,vset,all" << endl; } } if (nProblemFacesFound > 0) { - Info << "Number of incorrectly matched faces: " + Info<< "Number of incorrectly matched faces: " << nProblemFacesFound << endl; } - Info << "Number of boundary faces: " << nBoundaryFacesFound << endl; - Info << "Total number of faces: " << nCreatedFaces << endl; + Info<< "Number of boundary faces: " << nBoundaryFacesFound << endl; + Info<< "Total number of faces: " << nCreatedFaces << endl; } diff --git a/applications/utilities/mesh/conversion/starToFoam/createPolyCells.C b/applications/utilities/mesh/conversion/starToFoam/createPolyCells.C index fc2e65a0b98..c4847fc3903 100644 --- a/applications/utilities/mesh/conversion/starToFoam/createPolyCells.C +++ b/applications/utilities/mesh/conversion/starToFoam/createPolyCells.C @@ -55,7 +55,7 @@ void starMesh::createPolyCells() maxFaces += cellFaces_[cellI].size(); } - Info << "Maximum possible number of faces in mesh: " << maxFaces << endl; + Info<< "Maximum possible number of faces in mesh: " << maxFaces << endl; meshFaces_.setSize(maxFaces); @@ -72,7 +72,7 @@ void starMesh::createPolyCells() // Insertion cannot be done in one go as the faces need to be // added into the list in the increasing order of neighbour // cells. Therefore, all neighbours will be detected first - // and then added in the correct order. + // and then added in the correct order. const faceList& curFaces = cellFaces_[cellI]; @@ -109,7 +109,7 @@ void starMesh::createPolyCells() label curNei = curNeighbours[neiI]; // reject neighbours with the lower label. This should - // also reject current cell. + // also reject current cell. if (curNei > cellI) { // get the list of search faces diff --git a/applications/utilities/mesh/conversion/starToFoam/mergeCoupleFacePoints.C b/applications/utilities/mesh/conversion/starToFoam/mergeCoupleFacePoints.C index 5850c723e0f..73ca9628d8d 100644 --- a/applications/utilities/mesh/conversion/starToFoam/mergeCoupleFacePoints.C +++ b/applications/utilities/mesh/conversion/starToFoam/mergeCoupleFacePoints.C @@ -48,9 +48,9 @@ void starMesh::mergeCoupleFacePoints() // merge set. Once all cells (and thus points) are visited, go // through the renumbering list and for each merging point use the // label of the merge set as the new point label. - // This is VERY fancy. Use care if/when changing. + // This is VERY fancy. Use care if/when changing. - Info << endl << "Creating merge sets" << endl; + Info<< endl << "Creating merge sets" << endl; // Create a renumbering list for points // In the first instance the renumbering list is used as a @@ -162,7 +162,7 @@ void starMesh::mergeCoupleFacePoints() if (nMergeSets >= mergeSetID.size()) { - Info << "Resizing mergeSetID" << endl; + Info<< "Resizing mergeSetID" << endl; mergeSetID.setSize (mergeSetID.size() + mergeIncrement); @@ -327,7 +327,7 @@ void starMesh::mergeCoupleFacePoints() // This should be OK as the compressed points list will always // have less points that the original lists. Even if there is // no points removed, this will copy the list back onto itself - // + // renumberPoints[pointI] = nUsedPoints; points_[nUsedPoints] = points_[pointI]; @@ -345,7 +345,7 @@ void starMesh::mergeCoupleFacePoints() // reset number of points which need to be sorted points_.setSize(nUsedPoints); - Info << "Renumbering all faces" << endl; + Info<< "Renumbering all faces" << endl; forAll (cellFaces_, cellI) { @@ -374,7 +374,7 @@ void starMesh::mergeCoupleFacePoints() } } - Info << "Renumbering all cell shapes" << endl; + Info<< "Renumbering all cell shapes" << endl; forAll (cellShapes_, cellI) { @@ -402,7 +402,7 @@ void starMesh::mergeCoupleFacePoints() } } - Info << "Renumbering STAR point lookup" << endl; + Info<< "Renumbering STAR point lookup" << endl; labelList oldStarPointID = starPointID_; diff --git a/applications/utilities/mesh/conversion/starToFoam/purgeCellShapes.C b/applications/utilities/mesh/conversion/starToFoam/purgeCellShapes.C index 88f62252361..92dedc00e62 100644 --- a/applications/utilities/mesh/conversion/starToFoam/purgeCellShapes.C +++ b/applications/utilities/mesh/conversion/starToFoam/purgeCellShapes.C @@ -55,12 +55,12 @@ void starMesh::purgeCellShapes() if (!found) { - Info << "Purging cell shape " << cellI << endl; + Info<< "Purging cell shape " << cellI << endl; cellShapes_[cellI] = cellShape(*unknownPtr_, labelList(0)); break; } } - } + } } diff --git a/applications/utilities/mesh/conversion/starToFoam/readCouples.C b/applications/utilities/mesh/conversion/starToFoam/readCouples.C index 975dab47d81..4d586c3da7f 100644 --- a/applications/utilities/mesh/conversion/starToFoam/readCouples.C +++ b/applications/utilities/mesh/conversion/starToFoam/readCouples.C @@ -44,7 +44,7 @@ void starMesh::readCouples() if (couplesFile.good()) { - Info << "\nReading couples" << endl; + Info<< "\nReading couples" << endl; label matchLabel, nEntries, typeFlag; label starMasterCell, rotXMasterFace; @@ -178,7 +178,7 @@ void starMesh::readCouples() } } - Info << "finished reading couples" << endl; + Info<< "finished reading couples" << endl; } } diff --git a/applications/utilities/mesh/conversion/starToFoam/starMesh.C b/applications/utilities/mesh/conversion/starToFoam/starMesh.C index a495ae03624..9f9ddfe94b5 100644 --- a/applications/utilities/mesh/conversion/starToFoam/starMesh.C +++ b/applications/utilities/mesh/conversion/starToFoam/starMesh.C @@ -87,7 +87,7 @@ const label starMesh::sammAddressingTable[9][12] = // (first index) and STAR face number // - first column is always -1 // - last column is -1 for all but hexagonal prism -// WARNING: Possible bug for sammTrim2 +// WARNING: Possible bug for sammTrim2 // The lookup table for SAMM shapes is based on the rotation of the // shape. This would imply that the table below needs to be split between // the regular shapes (3-9), which are OK, and the SAMM shapes, for which @@ -95,7 +95,7 @@ const label starMesh::sammAddressingTable[9][12] = // cell, firts find out the face index in the normal rotation using the cell // face permutation table and then use the index from the shape face lookup. // Additionally, have in mind that this silliness does not allow matches -// on face 7 and 8 of the samm cell. +// on face 7 and 8 of the samm cell. const label starMesh::sammFacePermutationTable[24][8] = { @@ -180,7 +180,7 @@ const label starMesh::shapeFaceLookup[19][9] = // samm trim 8: // star number: 1 2 3 4 5 6 7 8 In ROTATION 0 // foam number: 2 5 4 7 1 0 3 6 -// confirmed: 1 0 6 +// confirmed: 1 0 6 // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // @@ -188,7 +188,7 @@ const label starMesh::shapeFaceLookup[19][9] = // Make polyhedral mesh data (packing) void starMesh::createPolyMeshData() { - Info << "Creating a polyMesh" << endl; + Info<< "Creating a polyMesh" << endl; createPolyCells(); @@ -203,7 +203,7 @@ void starMesh::createPolyMeshData() // a memory peak void starMesh::clearExtraStorage() { - Info << "Clearing extra storage" << endl; + Info<< "Clearing extra storage" << endl; starPointLabelLookup_.setSize(0); starPointID_.setSize(0); diff --git a/applications/utilities/mesh/conversion/starToFoam/starToFoam.C b/applications/utilities/mesh/conversion/starToFoam/starToFoam.C index 2c2aeaa76b5..7ed1cddd368 100644 --- a/applications/utilities/mesh/conversion/starToFoam/starToFoam.C +++ b/applications/utilities/mesh/conversion/starToFoam/starToFoam.C @@ -61,10 +61,10 @@ int main(int argc, char *argv[]) // Set the precision of the points data to 10 IOstream::defaultPrecision(10); - Info << "Writing mesh" << endl; + Info<< "Writing mesh" << endl; makeMesh.writeMesh(); - Info<< nl << "End" << nl << endl; + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/mesh/conversion/starToFoam/writeMesh.C b/applications/utilities/mesh/conversion/starToFoam/writeMesh.C index 3e0cdee1fbc..746087fb7e3 100644 --- a/applications/utilities/mesh/conversion/starToFoam/writeMesh.C +++ b/applications/utilities/mesh/conversion/starToFoam/writeMesh.C @@ -37,9 +37,9 @@ void starMesh::writeMesh() { if (isShapeMesh_) { - Info << "This is a shapeMesh." << endl; + Info<< "This is a shapeMesh." << endl; - Info << "Default patch type set to empty" << endl; + Info<< "Default patch type set to empty" << endl; clearExtraStorage(); @@ -61,7 +61,7 @@ void starMesh::writeMesh() patchPhysicalTypes_ ); - Info << "Writing polyMesh" << endl; + Info<< "Writing polyMesh" << endl; pShapeMesh.write(); } else @@ -70,7 +70,7 @@ void starMesh::writeMesh() createPolyMeshData(); - Info << "This is a polyMesh" << endl; + Info<< "This is a polyMesh" << endl; clearExtraStorage(); @@ -90,7 +90,7 @@ void starMesh::writeMesh() // adding patches also checks the mesh pMesh.addPatches(polyBoundaryPatches(pMesh)); - Info << "Writing polyMesh" << endl; + Info<< "Writing polyMesh" << endl; pMesh.write(); } } diff --git a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C index d2b23fef161..c00be771118 100644 --- a/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C +++ b/applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C @@ -62,7 +62,7 @@ void writePoints(const polyMesh& mesh, const fileName& timeName) fileName pointFile(mesh.time().path()/"meshPoints_" + timeName + ".obj"); - Info << "Writing mesh points and edges to " << pointFile << endl; + Info<< "Writing mesh points and edges to " << pointFile << endl; OFstream pointStream(pointFile); @@ -91,7 +91,7 @@ void writePoints { fileName fName(mesh.time().path()/"meshPoints_" + timeName + ".obj"); - Info << "Writing mesh points and edges to " << fName << endl; + Info<< "Writing mesh points and edges to " << fName << endl; OFstream str(fName); @@ -162,7 +162,7 @@ void writePoints / "meshPoints_" + timeName + '_' + name(cellI) + ".obj" ); - Info << "Writing mesh points and edges to " << fName << endl; + Info<< "Writing mesh points and edges to " << fName << endl; OFstream pointStream(fName); @@ -182,7 +182,7 @@ void writeFaceCentres(const polyMesh& mesh,const fileName& timeName) / "meshFaceCentres_" + timeName + ".obj" ); - Info << "Writing mesh face centres to " << faceFile << endl; + Info<< "Writing mesh face centres to " << faceFile << endl; OFstream faceStream(faceFile); @@ -200,7 +200,7 @@ void writeCellCentres(const polyMesh& mesh, const fileName& timeName) mesh.time().path()/"meshCellCentres_" + timeName + ".obj" ); - Info << "Writing mesh cell centres to " << cellFile << endl; + Info<< "Writing mesh cell centres to " << cellFile << endl; OFstream cellStream(cellFile); @@ -228,7 +228,7 @@ void writePatchCentres mesh.time().path()/"patch_" + pp.name() + '_' + timeName + ".obj" ); - Info << "Writing patch face centres to " << faceFile << endl; + Info<< "Writing patch face centres to " << faceFile << endl; OFstream patchFaceStream(faceFile); @@ -258,7 +258,7 @@ void writePatchFaces / "patchFaces_" + pp.name() + '_' + timeName + ".obj" ); - Info << "Writing patch faces to " << faceFile << endl; + Info<< "Writing patch faces to " << faceFile << endl; OFstream patchFaceStream(faceFile); @@ -301,7 +301,7 @@ void writePatchBoundaryEdges / "patchEdges_" + pp.name() + '_' + timeName + ".obj" ); - Info << "Writing patch edges to " << edgeFile << endl; + Info<< "Writing patch edges to " << edgeFile << endl; OFstream patchEdgeStream(edgeFile); @@ -351,7 +351,7 @@ void writePointCells / "pointEdges_" + timeName + '_' + name(pointI) + ".obj" ); - Info << "Writing pointEdges to " << pFile << endl; + Info<< "Writing pointEdges to " << pFile << endl; OFstream pointStream(pFile); @@ -492,7 +492,7 @@ int main(int argc, char *argv[]) + ".obj" ); - Info << "Writing mesh points and edges to " << fName << endl; + Info<< "Writing mesh points and edges to " << fName << endl; OFstream str(fName); @@ -506,7 +506,7 @@ int main(int argc, char *argv[]) } else if ( - !patchFaces + !patchFaces && !patchEdges && !doCell && !doPoint @@ -530,14 +530,14 @@ int main(int argc, char *argv[]) } else { - Info << "No mesh." << endl; + Info<< "No mesh." << endl; } - Info << nl << endl; + Info<< nl << endl; } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C index 6cdec703dcd..bb30cfd4a56 100644 --- a/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C +++ b/applications/utilities/mesh/generation/blockMesh/blockMeshApp.C @@ -382,7 +382,7 @@ int main(int argc, char *argv[]) } } - Info<< nl << "End" << endl; + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.H b/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.H index aeb3137adfe..2fd2fe2dc1d 100644 --- a/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.H +++ b/applications/utilities/mesh/generation/blockMesh/mergePatchPairs.H @@ -83,11 +83,11 @@ ); } // end of all merge pairs - Info << "Adding point and face zones" << endl; + Info<< "Adding point and face zones" << endl; mesh.addZones(pz, fz, cz); - Info << "Creating attachPolyTopoChanger" << endl; + Info<< "Creating attachPolyTopoChanger" << endl; attachPolyTopoChanger polyMeshAttacher(mesh); polyMeshAttacher.setSize(mergePatchPairs.size()); diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C index 5ce4ec94465..f970c80e71c 100644 --- a/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C +++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeMesh.C @@ -693,7 +693,7 @@ int main(int argc, char *argv[]) << exit(FatalError); } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/mesh/manipulation/cellSet/cellSet.C b/applications/utilities/mesh/manipulation/cellSet/cellSet.C index e8036274261..9edfa8d44a2 100644 --- a/applications/utilities/mesh/manipulation/cellSet/cellSet.C +++ b/applications/utilities/mesh/manipulation/cellSet/cellSet.C @@ -189,7 +189,7 @@ int main(int argc, char *argv[]) currentSet.write(); } - Info << nl << "End" << endl; + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C index 6caeffbd4ec..0ce3a9d8e64 100644 --- a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C +++ b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C @@ -120,7 +120,7 @@ int main(int argc, char *argv[]) } else { - Info << "\nMesh OK.\n" << endl; + Info<< "\nMesh OK.\n" << endl; } } } diff --git a/applications/utilities/mesh/manipulation/faceSet/faceSet.C b/applications/utilities/mesh/manipulation/faceSet/faceSet.C index 8441a1cdbe2..9bd9736cab3 100644 --- a/applications/utilities/mesh/manipulation/faceSet/faceSet.C +++ b/applications/utilities/mesh/manipulation/faceSet/faceSet.C @@ -189,7 +189,7 @@ int main(int argc, char *argv[]) currentSet.write(); } - Info << nl << "End" << endl; + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C index 69ba27f1175..81fd297a888 100644 --- a/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C +++ b/applications/utilities/mesh/manipulation/flattenMesh/flattenMesh.C @@ -95,7 +95,7 @@ int main(int argc, char *argv[]) // Set the precision of the points data to 10 IOstream::defaultPrecision(10); - Info << "Writing points into directory " << points.path() << nl << endl; + Info<< "Writing points into directory " << points.path() << nl << endl; points.write(); return 0; diff --git a/applications/utilities/mesh/manipulation/insideCells/insideCells.C b/applications/utilities/mesh/manipulation/insideCells/insideCells.C index 7087e050625..22f99465632 100644 --- a/applications/utilities/mesh/manipulation/insideCells/insideCells.C +++ b/applications/utilities/mesh/manipulation/insideCells/insideCells.C @@ -89,7 +89,7 @@ int main(int argc, char *argv[]) insideCells.write(); - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C index b13dfb86ef0..620201ba917 100644 --- a/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C +++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergeMeshes.C @@ -77,7 +77,7 @@ int main(int argc, char *argv[]) masterMesh.merge(); masterMesh.polyMesh::write(); - Info << nl << "End" << endl; + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C index 616cfb4ce74..d1b633a4b9e 100644 --- a/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C +++ b/applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C @@ -385,7 +385,7 @@ void Foam::mergePolyMesh::merge() // Add the patches if necessary if (patchNames_.size() != boundaryMesh().size()) { - Info << "Copying old patches" << endl; + Info<< "Copying old patches" << endl; List<polyPatch*> newPatches(patchNames_.size()); @@ -399,7 +399,7 @@ void Foam::mergePolyMesh::merge() newPatches[patchI] = oldPatches[patchI].clone(oldPatches).ptr(); } - Info << "Adding new patches. " << endl; + Info<< "Adding new patches. " << endl; label endOfLastPatch = oldPatches[patchI - 1].start() + oldPatches[patchI - 1].size(); diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C index 9876f4a06f7..0c976715904 100644 --- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C +++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.C @@ -33,8 +33,8 @@ License const Foam::label Foam::mirrorFvMesh::cellRenumber[8][8] = { {-1, -1, -1, -1, -1, -1, -1, -1}, // unknown - {-1, -1, -1, -1, -1, -1, -1, -1}, // - {-1, -1, -1, -1, -1, -1, -1, -1}, // + {-1, -1, -1, -1, -1, -1, -1, -1}, // + {-1, -1, -1, -1, -1, -1, -1, -1}, // { 0, 3, 2, 1, 4, 7, 6, 5}, // hex { 2, 1, 0, 5, 4, 3, 6, -1}, // wedge { 0, 2, 1, 3, 5, 4, -1, -1}, // prism @@ -74,7 +74,7 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io) const polyPatchList& oldPatches = boundaryMesh(); // Mirror the points - Info << "Mirroring points. Old points: " << oldPoints.size(); + Info<< "Mirroring points. Old points: " << oldPoints.size(); pointField newPoints(2*oldPoints.size()); label nNewPoints = 0; @@ -120,10 +120,10 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io) } // Reset the size of the point list - Info << " New points: " << nNewPoints << endl; + Info<< " New points: " << nNewPoints << endl; newPoints.setSize(nNewPoints); - Info << "Mirroring faces. Old faces: " << oldFaces.size(); + Info<< "Mirroring faces. Old faces: " << oldFaces.size(); // Algorithm: // During mirroring, the faces that were previously boundary faces @@ -329,14 +329,14 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io) // Tidy up the lists newFaces.setSize(nNewFaces); - Info << " New faces: " << nNewFaces << endl; + Info<< " New faces: " << nNewFaces << endl; newPatchTypes.setSize(nNewPatches); newPatchNames.setSize(nNewPatches); newPatchSizes.setSize(nNewPatches); newPatchStarts.setSize(nNewPatches); - Info << "Mirroring patches. Old patches: " << boundary().size() + Info<< "Mirroring patches. Old patches: " << boundary().size() << " New patches: " << nNewPatches << endl; Info<< "Mirroring cells. Old cells: " << oldCells.size() @@ -378,9 +378,9 @@ Foam::mirrorFvMesh::mirrorFvMesh(const IOobject& io) } // Mirror the cell shapes - Info << "Mirroring cell shapes." << endl; + Info<< "Mirroring cell shapes." << endl; - Info << nl << "Creating new mesh" << endl; + Info<< nl << "Creating new mesh" << endl; mirrorMeshPtr_ = new fvMesh ( io, diff --git a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C index a8b93b8d682..a762dda0da4 100644 --- a/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C +++ b/applications/utilities/mesh/manipulation/mirrorMesh/mirrorMesh.C @@ -54,10 +54,10 @@ int main(int argc, char *argv[]) // Set the precision of the points data to 10 IOstream::defaultPrecision(10); - Info << "Writing mirrored mesh" << endl; + Info<< "Writing mirrored mesh" << endl; mesh.mirrorMesh().write(); - Info << "End" << endl; + Info<< "End" << endl; return 0; } diff --git a/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C b/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C index 07190e49f98..cf0b6ccd279 100644 --- a/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C +++ b/applications/utilities/mesh/manipulation/objToVTK/objToVTK.C @@ -266,7 +266,7 @@ int main(int argc, char *argv[]) } } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/mesh/manipulation/pointSet/pointSet.C b/applications/utilities/mesh/manipulation/pointSet/pointSet.C index 1aa70191f84..fb0c7b12fd7 100644 --- a/applications/utilities/mesh/manipulation/pointSet/pointSet.C +++ b/applications/utilities/mesh/manipulation/pointSet/pointSet.C @@ -189,7 +189,7 @@ int main(int argc, char *argv[]) currentSet.write(); } - Info << nl << "End" << endl; + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C b/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C index d7a84ee45a8..84b2ed78a79 100644 --- a/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C +++ b/applications/utilities/mesh/manipulation/rotateMesh/rotateMesh.C @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) // Set the precision of the points data to 10 IOstream::defaultPrecision(10); - Info << "Writing points into directory " << points.path() << nl << endl; + Info<< "Writing points into directory " << points.path() << nl << endl; points.write(); } diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C index 7b348015d40..b704c71a5de 100644 --- a/applications/utilities/mesh/manipulation/setSet/setSet.C +++ b/applications/utilities/mesh/manipulation/setSet/setSet.C @@ -284,10 +284,10 @@ void printHelp(Ostream& os) << endl << "Zones can be set using zoneSets from corresponding sets:" << endl << " cellZoneSet c0Zone new setToCellZone c0" << endl - << " faceZoneSet f0Zone new setToFaceZone f0" << endl + << " faceZoneSet f0Zone new setToFaceZone f0" << endl << endl << "or if orientation is important:" << endl - << " faceZoneSet f0Zone new setsToFaceZone f0 c0" << endl + << " faceZoneSet f0Zone new setsToFaceZone f0 c0" << endl << endl << "ZoneSets can be manipulated using the general actions:" << endl << " list - prints the contents of the set" << endl @@ -992,7 +992,7 @@ int main(int argc, char *argv[]) delete fileStreamPtr; } - Pout<< "\nEnd" << endl; + Pout<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C index df419e118b7..30aba0f5ab8 100644 --- a/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C +++ b/applications/utilities/mesh/manipulation/setsToZones/setsToZones.C @@ -341,7 +341,7 @@ int main(int argc, char *argv[]) << exit(FatalError); } - Info<< nl << "End" << endl; + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C index de6d5c10e4e..d1455a55c56 100644 --- a/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C +++ b/applications/utilities/mesh/manipulation/splitMesh/splitMesh.C @@ -236,7 +236,7 @@ int main(int argc, char *argv[]) mesh.faceZones() ); - Info << "Adding point and face zones" << endl; + Info<< "Adding point and face zones" << endl; mesh.addZones(pz, fz, cz); attachPolyTopoChanger splitter(mesh); diff --git a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C index a5adac74e87..9d164f35538 100644 --- a/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C +++ b/applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C @@ -172,7 +172,7 @@ int main(int argc, char *argv[]) // set up the tolerances for the sliding mesh dictionary slidingTolerances; - if (args.options().found("toleranceDict")) + if (args.options().found("toleranceDict")) { IOdictionary toleranceFile( IOobject( @@ -180,7 +180,7 @@ int main(int argc, char *argv[]) runTime.constant(), mesh, IOobject::MUST_READ, - IOobject::NO_WRITE + IOobject::NO_WRITE ) ); slidingTolerances += toleranceFile; @@ -231,7 +231,7 @@ int main(int argc, char *argv[]) // Note: make sure to add the zones BEFORE constructing polyMeshModifier // (since looks up various zones at construction time) - Info << "Adding point and face zones" << endl; + Info<< "Adding point and face zones" << endl; mesh.addZones(pz.shrink(), fz.shrink(), cz.shrink()); // Add the perfect interface mesh modifier @@ -316,7 +316,7 @@ int main(int argc, char *argv[]) // Note: make sure to add the zones BEFORE constructing polyMeshModifier // (since looks up various zones at construction time) - Info << "Adding point and face zones" << endl; + Info<< "Adding point and face zones" << endl; mesh.addZones(pz.shrink(), fz.shrink(), cz.shrink()); // Add the sliding interface mesh modifier @@ -393,7 +393,7 @@ int main(int argc, char *argv[]) mesh.setInstance(oldInstance); stitcher.instance() = oldInstance; } - Info << nl << "Writing polyMesh to time " << runTime.timeName() << endl; + Info<< nl << "Writing polyMesh to time " << runTime.timeName() << endl; IOstream::defaultPrecision(10); diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C index f00cc8716fe..303df1cbae0 100644 --- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C +++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C @@ -439,7 +439,7 @@ int main(int argc, char *argv[]) } - Info << nl << "End" << endl; + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C index a76c4ad327b..f9b6354dd4e 100644 --- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C +++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C @@ -267,7 +267,7 @@ int main(int argc, char *argv[]) // Set the precision of the points data to 10 IOstream::defaultPrecision(10); - Info << "Writing points into directory " << points.path() << nl << endl; + Info<< "Writing points into directory " << points.path() << nl << endl; points.write(); return 0; diff --git a/applications/utilities/miscellaneous/patchSummary/patchSummary.C b/applications/utilities/miscellaneous/patchSummary/patchSummary.C index 67ae5270274..33028ea017f 100644 --- a/applications/utilities/miscellaneous/patchSummary/patchSummary.C +++ b/applications/utilities/miscellaneous/patchSummary/patchSummary.C @@ -98,11 +98,11 @@ int main(int argc, char *argv[]) outputFieldList<sphericalTensor>(vsptf, patchI); outputFieldList<symmTensor>(vsytf, patchI); outputFieldList<tensor>(vtf, patchI); - Info << endl; + Info<< endl; } } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C index e00130a99c3..1b31d9edd59 100644 --- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C +++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C @@ -87,7 +87,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches) } } - Info << "\nDistributing faces to processors" << endl; + Info<< "\nDistributing faces to processors" << endl; // Loop through all internal faces and decide which processor they belong to // First visit all internal faces. If cells at both sides belong to the @@ -158,7 +158,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches) SLList<label>::iterator curInterProcBdrsNeiIter = interProcBoundaries[neighbourProc].begin(); - SLList<SLList<label> >::iterator + SLList<SLList<label> >::iterator curInterProcBFacesNeiIter = interProcBFaces[neighbourProc].begin(); @@ -307,7 +307,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches) SLList<label>::iterator curInterProcBdrsOwnIter = interProcBoundaries[ownerProc].begin(); - SLList<SLList<label> >::iterator + SLList<SLList<label> >::iterator curInterProcBFacesOwnIter = interProcBFaces[ownerProc].begin(); @@ -432,7 +432,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches) // Note: I cannot add the other side of the cyclic // boundary here because this would violate the order. // They will be added in a separate loop below - // + // } } @@ -483,7 +483,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches) // calculate the size label nFacesOnProcessor = curProcFaces.size(); - for + for ( SLList<SLList<label> >::iterator curInterProcBFacesIter = interProcBFaces[procI].begin(); @@ -506,7 +506,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches) // Add internal and boundary faces // Remember to increment the index by one such that the - // turning index works properly. + // turning index works properly. for ( SLList<label>::iterator curProcFacesIter = curProcFaces.begin(); @@ -576,7 +576,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches) // add the face // Remember to increment the index by one such that the - // turning index works properly. + // turning index works properly. if (cellToProc_[owner[curFacesIter()]] == procI) { curProcFaceAddressing[nFaces] = curFacesIter() + 1; @@ -598,7 +598,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches) } } - Info << "\nCalculating processor boundary addressing" << endl; + Info<< "\nCalculating processor boundary addressing" << endl; // For every patch of processor boundary, find the index of the original // patch. Mis-alignment is caused by the fact that patches with zero size // are omitted. For processor patches, set index to -1. @@ -656,7 +656,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches) curBoundaryAddressing.setSize(nPatches); } - Info << "\nDistributing points to processors" << endl; + Info<< "\nDistributing points to processors" << endl; // For every processor, loop through the list of faces for the processor. // For every face, loop through the list of points and mark the point as // used for the processor. Collect the list of used points for the @@ -748,7 +748,7 @@ void Foam::domainDecomposition::decomposeMesh(const bool filterEmptyPatches) { // Mark the original face as used // Remember to decrement the index by one (turning index) - // + // const label curF = mag(curFaceLabels[facei]) - 1; const face& f = fcs[curF]; diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C index dd014c299fa..fd354a47807 100644 --- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C +++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C @@ -137,7 +137,7 @@ int main(int argc, char *argv[]) // Set time for global database runTime.setTime(timeDirs[timeI], timeI); - Info << "Time = " << runTime.timeName() << endl << endl; + Info<< "Time = " << runTime.timeName() << endl << endl; // Set time for all databases forAll (databases, procI) @@ -183,7 +183,7 @@ int main(int argc, char *argv[]) || objects.lookupClass(surfaceScalarField::typeName).size() ) { - Info << "Reconstructing FV fields" << nl << endl; + Info<< "Reconstructing FV fields" << nl << endl; fvFieldReconstructor fvReconstructor ( @@ -228,7 +228,7 @@ int main(int argc, char *argv[]) } else { - Info << "No FV fields" << nl << endl; + Info<< "No FV fields" << nl << endl; } @@ -242,7 +242,7 @@ int main(int argc, char *argv[]) || objects.lookupClass(pointTensorField::typeName).size() ) { - Info << "Reconstructing point fields" << nl << endl; + Info<< "Reconstructing point fields" << nl << endl; pointMesh pMesh(mesh); PtrList<pointMesh> pMeshes(procMeshes.meshes().size()); @@ -268,7 +268,7 @@ int main(int argc, char *argv[]) } else { - Info << "No point fields" << nl << endl; + Info<< "No point fields" << nl << endl; } @@ -388,7 +388,7 @@ int main(int argc, char *argv[]) } else { - Info << "No lagrangian fields" << nl << endl; + Info<< "No lagrangian fields" << nl << endl; } } diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C index 4a63948f422..41df27a4c8f 100644 --- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C +++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C @@ -183,7 +183,7 @@ int main(int argc, char *argv[]) Info<< endl; } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCaseTail.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCaseTail.H index 43c1a3f801b..0ddde7448a8 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCaseTail.H +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCaseTail.H @@ -16,7 +16,7 @@ if (Pstream::master()) if (Times[0].value() < 0) { Tcorr = - Times[0].value(); - Info << "Correcting time values. Adding " << Tcorr << endl; + Info<< "Correcting time values. Adding " << Tcorr << endl; } for (int n=startTime; n<endTime; n++) diff --git a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C index 87270649df4..8f69fe0b2f6 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C +++ b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C @@ -982,7 +982,7 @@ int main(int argc, char *argv[]) rm(fvParticleFileName); } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C b/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C index 05300da489a..40179616fc4 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C +++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/foamToGMV.C @@ -62,14 +62,14 @@ int main(int argc, char *argv[]) // get the available time-steps instantList TimeList = runTime.times(); - Info << TimeList << endl; + Info<< TimeList << endl; label nTimes = TimeList.size(); for(label n=1; n < nTimes; n++) { if (TimeList[n].value() > startTime) { - Info << "Time = " << TimeList[n].value() << nl; + Info<< "Time = " << TimeList[n].value() << nl; // Set Time runTime.setTime(TimeList[n], n); diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H index ba4e27425a0..e84837fd1c2 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H +++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/moveMesh.H @@ -1,6 +1,6 @@ IOobject ioPoints ( - "points", + "points", runTime.timeName(), mesh.name(), mesh @@ -8,7 +8,7 @@ IOobject ioPoints if (ioPoints.headerOk()) { - Info << "new points available" << endl; + Info<< "new points available" << endl; // Reading new points pointIOField newPoints ( @@ -22,6 +22,6 @@ if (ioPoints.headerOk()) IOobject::NO_WRITE ) ); - + mesh.movePoints(newPoints); } diff --git a/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C b/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C index 748ce3f5991..1a29e876526 100644 --- a/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C +++ b/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C @@ -233,7 +233,7 @@ int main(int argc, char *argv[]) } } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C index 6a5ab601fb4..8989a110cb8 100644 --- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C +++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C @@ -104,7 +104,7 @@ int Foam::vtkPV3Foam::setTime(int nRequest, const double requestTimes[]) Info<< requestTimes[requestI]; } - Info << ") - previousIndex = " << timeIndex_ << endl; + Info<< ") - previousIndex = " << timeIndex_ << endl; } Time& runTime = dbPtr_(); diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtils.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtils.C index 9683a159143..f9112229445 100644 --- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtils.C +++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtils.C @@ -363,7 +363,7 @@ void Foam::vtkPV3Foam::printMemory() } } - Info << "memUsed: " << (memTotal - memFree) << " kB\n"; + Info<< "memUsed: " << (memTotal - memFree) << " kB\n"; } } diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_bkup.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_bkup.H index ce9277dceab..6a47c6ecf29 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_bkup.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_bkup.H @@ -7,7 +7,7 @@ int USERD_bkup int backup_type) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_bkup" << endl + Info<< "Entering: USERD_bkup" << endl << flush; #endif return Z_ERR; diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_exit_routine.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_exit_routine.H index d00b5de8bbb..b6fdf9c2c46 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_exit_routine.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_exit_routine.H @@ -5,7 +5,7 @@ void USERD_exit_routine ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_exit_routine" << endl + Info<< "Entering: USERD_exit_routine" << endl << flush; #endif diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_border_availability.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_border_availability.H index 39399cf9eaa..5ea3202b8ce 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_border_availability.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_border_availability.H @@ -8,8 +8,8 @@ int USERD_get_border_availability ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_border_availability for part_number " - << part_number << endl + Info<< "Entering: USERD_get_border_availability for part_number " + << part_number << endl << flush; #endif diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_border_elements_by_type.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_border_elements_by_type.H index e4f75704b0a..29536014be4 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_border_elements_by_type.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_border_elements_by_type.H @@ -11,7 +11,7 @@ int USERD_get_border_elements_by_type ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_border_elements_by_type" << endl + Info<< "Entering: USERD_get_border_elements_by_type" << endl << flush; #endif diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_changing_geometry_status.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_changing_geometry_status.H index 9b0970f3d90..2df1e6a7617 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_changing_geometry_status.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_changing_geometry_status.H @@ -2,7 +2,7 @@ int USERD_get_changing_geometry_status(void) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_changing_geometry_status" << endl << flush; + Info<< "Entering: USERD_get_changing_geometry_status" << endl << flush; #endif // Choose the most general option diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_constant_val.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_constant_val.H index 1b87e2c8a90..d14dc7a17a5 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_constant_val.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_constant_val.H @@ -9,7 +9,7 @@ float USERD_get_constant_val ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_constant_val" << endl << flush; + Info<< "Entering: USERD_get_constant_val" << endl << flush; #endif return 0.0; } diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_descrip_lines.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_descrip_lines.H index 3de57267f0e..1076d2de38d 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_descrip_lines.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_descrip_lines.H @@ -9,7 +9,7 @@ int USERD_get_descrip_lines ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_descrip_lines" << endl + Info<< "Entering: USERD_get_descrip_lines" << endl << flush; #endif @@ -24,7 +24,7 @@ int USERD_get_descrip_lines } #ifdef ENSIGHTDEBUG - Info << "Leaving: USERD_get_descrip_lines" << endl + Info<< "Leaving: USERD_get_descrip_lines" << endl << flush; #endif return Z_OK; diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_element_label_status.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_element_label_status.H index 3aae59c84e5..d65e7bad70f 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_element_label_status.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_element_label_status.H @@ -4,7 +4,7 @@ int USERD_get_element_label_status(void) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_element_label_status" << endl << flush; + Info<< "Entering: USERD_get_element_label_status" << endl << flush; #endif return TRUE; } diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_geom_timeset_number.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_geom_timeset_number.H index 59dd293f516..9b0df36a20d 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_geom_timeset_number.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_geom_timeset_number.H @@ -4,7 +4,7 @@ int USERD_get_geom_timeset_number ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_geom_timeset_number" << endl + Info<< "Entering: USERD_get_geom_timeset_number" << endl << flush; #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 ca8da4727c3..3805a1e498e 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 @@ -13,7 +13,7 @@ int USERD_get_gold_part_build_info ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_gold_part_build_info" << endl << flush; + Info<< "Entering: USERD_get_gold_part_build_info" << endl << flush; #endif //# include "checkForNewMesh.H" @@ -93,11 +93,11 @@ int USERD_get_gold_part_build_info number_of_elements[0][Z_NFACED] = nFaced; /* - Info << "nTet04 = " << nTet04 << endl; - Info << "nPyr05 = " << nPyr05 << endl; - Info << "nHex08 = " << nHex08 << endl; - Info << "nPen06 = " << nPen06 << endl; - Info << "nFaced = " << nFaced << endl; + Info<< "nTet04 = " << nTet04 << endl; + Info<< "nPyr05 = " << nPyr05 << endl; + Info<< "nHex08 = " << nHex08 << endl; + Info<< "nPen06 = " << nPen06 << endl; + Info<< "nFaced = " << nFaced << endl; */ number_of_nodes[0] = meshPtr->nPoints(); @@ -148,7 +148,7 @@ int USERD_get_gold_part_build_info } #ifdef ENSIGHTDEBUG - Info << "Leaving: USERD_get_gold_part_build_info" << endl << flush; + Info<< "Leaving: USERD_get_gold_part_build_info" << endl << flush; #endif return Z_OK; diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_gold_variable_info.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_gold_variable_info.H index 7a17f74f0fd..91c205b0b5b 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_gold_variable_info.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_gold_variable_info.H @@ -15,7 +15,7 @@ int USERD_get_gold_variable_info ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_gold_variable_info" << endl + Info<< "Entering: USERD_get_gold_variable_info" << endl << flush; #endif @@ -112,7 +112,7 @@ int USERD_get_gold_variable_info } #ifdef ENSIGHTDEBUG - Info << "Leaving: USERD_get_gold_variable_info" << endl + Info<< "Leaving: USERD_get_gold_variable_info" << endl << flush; #endif diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_matf_set_info.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_matf_set_info.H index 87b3af93f4c..8f1b417ee47 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_matf_set_info.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_matf_set_info.H @@ -6,7 +6,7 @@ int USERD_get_matf_set_info ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_matf_set_info" << endl + Info<< "Entering: USERD_get_matf_set_info" << endl << flush; #endif diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_matf_var_info.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_matf_var_info.H index 980415b76ed..9f4bf9c8cd0 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_matf_var_info.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_matf_var_info.H @@ -7,7 +7,7 @@ int USERD_get_matf_var_info ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_matf_var_info" << endl + Info<< "Entering: USERD_get_matf_var_info" << endl << flush; #endif diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_maxsize_info.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_maxsize_info.H index 7c4ef69a4fd..c47d153f962 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_maxsize_info.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_maxsize_info.H @@ -5,10 +5,10 @@ int USERD_get_maxsize_info int *max_ijk_dimensions[3] ) { - return Z_ERR; + return Z_ERR; #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_maxsize_info" << endl; + Info<< "Entering: USERD_get_maxsize_info" << endl; #endif label maxNPoints = 0; @@ -34,10 +34,10 @@ int USERD_get_maxsize_info Info<< "Checking time = " << runTimePtr->timeName() << endl; const cellShapeList& cells = meshPtr->cellShapes(); - + const label nPoints = meshPtr->nPoints(); const label nCells = cells.size(); - + maxNPoints = max(maxNPoints, nPoints); for (label n=0; n<nCells;n++) diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_model_extents.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_model_extents.H index c65fa09691b..b78438ae7d7 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_model_extents.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_model_extents.H @@ -7,7 +7,7 @@ int USERD_get_model_extents ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_model_extents" << endl + Info<< "Entering: USERD_get_model_extents" << endl << flush; #endif diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_name_of_reader.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_name_of_reader.H index eceaf3cb9c9..c055407b534 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_name_of_reader.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_name_of_reader.H @@ -8,7 +8,7 @@ int USERD_get_name_of_reader ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_name_of_reader" << endl << flush; + Info<< "Entering: USERD_get_name_of_reader" << endl << flush; #endif strncpy(reader_name, readerName, Z_MAX_USERD_NAME); diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_nfaced_conn.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_nfaced_conn.H index 20e4b4b62bf..74289710fc6 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_nfaced_conn.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_nfaced_conn.H @@ -6,9 +6,9 @@ int USERD_get_nfaced_conn ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_nfaced_conn" + Info<< "Entering: USERD_get_nfaced_conn" << ", part_number = " << part_number - << endl + << endl << flush; #endif @@ -60,11 +60,11 @@ int USERD_get_nfaced_conn } } } - + } else if (part_number < nPatches+2) { - + } else { @@ -72,7 +72,7 @@ int USERD_get_nfaced_conn } #ifdef ENSIGHTDEBUG - Info << "Exiting: USERD_get_nfaced_conn" << endl + Info<< "Exiting: USERD_get_nfaced_conn" << endl << flush; #endif return Z_OK; diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_nfaced_nodes_per_face.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_nfaced_nodes_per_face.H index 9fd57aa82ab..4629c57c387 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_nfaced_nodes_per_face.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_nfaced_nodes_per_face.H @@ -6,9 +6,9 @@ int USERD_get_nfaced_nodes_per_face ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_nfaced_nodes_per_face" + Info<< "Entering: USERD_get_nfaced_nodes_per_face" << ", part_number = " << part_number - << endl + << endl << flush; #endif @@ -56,7 +56,7 @@ int USERD_get_nfaced_nodes_per_face } } } - + } else if (part_number < nPatches+2) { @@ -67,7 +67,7 @@ int USERD_get_nfaced_nodes_per_face return Z_ERR; } #ifdef ENSIGHTDEBUG - Info << "Exiting: USERD_get_nfaced_nodes_per_face" << endl + Info<< "Exiting: USERD_get_nfaced_nodes_per_face" << endl << flush; #endif return Z_OK; diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_node_label_status.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_node_label_status.H index f45f20e63ab..65791f70f72 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_node_label_status.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_node_label_status.H @@ -4,7 +4,7 @@ int USERD_get_node_label_status(void) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_node_label_status" << endl << flush; + Info<< "Entering: USERD_node_label_status" << endl << flush; #endif return TRUE; diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_nsided_conn.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_nsided_conn.H index 370fb341adb..d5baece99bd 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_nsided_conn.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_nsided_conn.H @@ -2,18 +2,18 @@ int USERD_get_nsided_conn ( int part_number, - int *nsided_conn_array + int *nsided_conn_array ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_nsided_conn" + Info<< "Entering: USERD_get_nsided_conn" << ", part_number = " << part_number - << endl + << endl << flush; #endif if (part_number == 1) { - Info << "************* EEEEEEEEERRRRRRRRRRRRRRRRRR *************** " << endl << flush; + Info<< "************* EEEEEEEEERRRRRRRRRRRRRRRRRR *************** " << endl << flush; } else if (part_number < nPatches+2) @@ -42,7 +42,7 @@ int USERD_get_nsided_conn return Z_ERR; } #ifdef ENSIGHTDEBUG - Info << "Exiting: USERD_get_nsided_conn" << endl + Info<< "Exiting: USERD_get_nsided_conn" << endl << flush; #endif return Z_OK; diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_num_of_time_steps.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_num_of_time_steps.H index f780b95c40f..37a1a5c06e0 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_num_of_time_steps.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_num_of_time_steps.H @@ -7,7 +7,7 @@ int USERD_get_num_of_time_steps ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_num_of_time_steps" << endl + Info<< "Entering: USERD_get_num_of_time_steps" << endl << flush; #endif diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_of_files_in_dataset.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_of_files_in_dataset.H index ac426a7ee0b..e2246d27daa 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_of_files_in_dataset.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_of_files_in_dataset.H @@ -1,10 +1,10 @@ //====================================================================== -// +// //====================================================================== int USERD_get_number_of_files_in_dataset(void) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_number_of_files_in_dataset" << endl << flush; + Info<< "Entering: USERD_get_number_of_files_in_dataset" << endl << flush; #endif // use 1 insted of 0 which gives an un-necessary warning. diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_of_material_sets.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_of_material_sets.H index 39feab9bce5..f8a04776455 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_of_material_sets.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_of_material_sets.H @@ -1,14 +1,14 @@ int USERD_get_number_of_material_sets -( - void +( + void ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_number_of_material_sets" << endl + Info<< "Entering: USERD_get_number_of_material_sets" << endl << flush; #endif // No materials - return 0; + return 0; } diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_of_materials.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_of_materials.H index 8e97d2f1c6e..98162b2e11f 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_of_materials.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_of_materials.H @@ -5,7 +5,7 @@ int USERD_get_number_of_materials ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_number_of_materials" << endl + Info<< "Entering: USERD_get_number_of_materials" << endl << flush; #endif diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_of_model_parts.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_of_model_parts.H index e7a68d2c3a9..cef0a64b1cd 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_of_model_parts.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_of_model_parts.H @@ -2,7 +2,7 @@ int USERD_get_number_of_model_parts(void) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_number_of_model_parts" << endl << flush; + Info<< "Entering: USERD_get_number_of_model_parts" << endl << flush; #endif return Numparts_available; diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_of_variables.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_of_variables.H index b858a801784..acb34213571 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_of_variables.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_of_variables.H @@ -2,7 +2,7 @@ int USERD_get_number_of_variables(void) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_number_of_variables" << endl << flush; + Info<< "Entering: USERD_get_number_of_variables" << endl << flush; #endif return Num_variables; diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_timesets.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_timesets.H index 1844d71e642..e4fc922fbd5 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_timesets.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_number_timesets.H @@ -4,7 +4,7 @@ int USERD_get_number_of_timesets ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_number_of_timesets" << endl + Info<< "Entering: USERD_get_number_of_timesets" << endl << flush; #endif 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 54ab4da3af1..68ebbf768e5 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_coords.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_coords.H @@ -8,7 +8,7 @@ int USERD_get_part_coords { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_part_coords" << endl << + Info<< "Entering: USERD_get_part_coords" << endl << "part_number = " << part_number << endl << flush; #endif @@ -19,7 +19,7 @@ int USERD_get_part_coords const vectorField& points = meshPtr->points(); label nPoints = points.size(); - + for (label indx=0; indx<nPoints; indx++) { coord_array[0][indx+1] = (float)points[indx].x(); @@ -36,7 +36,7 @@ int USERD_get_part_coords const polyBoundaryMesh& bMesh = meshPtr->boundaryMesh(); const vectorField& points = bMesh[patchi].points(); label nPoints = points.size(); - + for (label indx=0; indx<nPoints; indx++) { coord_array[0][indx+1] = (float)points[indx].x(); @@ -70,7 +70,7 @@ int USERD_get_part_coords } #ifdef ENSIGHTDEBUG - Info << "Leaving: USERD_get_part_coords" << endl << flush; + Info<< "Leaving: USERD_get_part_coords" << endl << flush; #endif return Z_OK; diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_element_ids_by_type.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_element_ids_by_type.H index 67c3478880a..4b82c06f33a 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_element_ids_by_type.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_element_ids_by_type.H @@ -7,8 +7,8 @@ int USERD_get_part_element_ids_by_type { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_part_element_ids_by_type" << endl - << "part_number = " << part_number << endl + Info<< "Entering: USERD_get_part_element_ids_by_type" << endl + << "part_number = " << part_number << endl << "element_type = " << element_type << endl << flush; #endif @@ -31,7 +31,7 @@ int USERD_get_part_element_ids_by_type { label nFaces = cells[n].size(); labelList points = cellShapes[n]; - + if ((nFaces == 6) && (points.size() == 8)) { elemid_array[nHex08++] = n + 1; @@ -44,7 +44,7 @@ int USERD_get_part_element_ids_by_type { label nFaces = cells[n].size(); labelList points = cellShapes[n]; - + if ((nFaces == 5) && (points.size() == 6)) { elemid_array[nPen06++] = n + 1; @@ -57,7 +57,7 @@ int USERD_get_part_element_ids_by_type { label nFaces = cells[n].size(); labelList points = cellShapes[n]; - + if ((nFaces == 5) && (points.size() == 5)) { elemid_array[nPyr05++] = n + 1; @@ -70,7 +70,7 @@ int USERD_get_part_element_ids_by_type { label nFaces = cells[n].size(); labelList points = cellShapes[n]; - + if ((nFaces == 4) && (points.size() == 4)) { elemid_array[nTet04++] = n + 1; @@ -101,7 +101,7 @@ int USERD_get_part_element_ids_by_type } else if (part_number < nPatches+2) { - + const polyBoundaryMesh& bMesh = meshPtr->boundaryMesh(); label patchi = part_number - 2; @@ -127,7 +127,7 @@ int USERD_get_part_element_ids_by_type { elemid_array[nQuad04++] = facei + 1; } - } + } } else if (element_type == Z_NSIDED) { @@ -155,7 +155,7 @@ int USERD_get_part_element_ids_by_type } #ifdef ENSIGHTDEBUG - Info << "Leaving: USERD_get_part_element_ids_by_type" << endl << flush; + Info<< "Leaving: USERD_get_part_element_ids_by_type" << endl << flush; #endif return Z_OK; diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_elements_by_type.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_elements_by_type.H index d8713a8224c..cd13e108f91 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_elements_by_type.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_elements_by_type.H @@ -11,47 +11,47 @@ int USERD_get_part_elements_by_type << "element_type = " << element_type; if (element_type == Z_HEX08) { - Info << " Z_HEX08"; + Info<< " Z_HEX08"; } else if (element_type == Z_PEN06) { - Info << " Z_PEN06"; + Info<< " Z_PEN06"; } else if (element_type == Z_PYR05) { - Info << " Z_PYR05"; + Info<< " Z_PYR05"; } else if (element_type == Z_TET04) { - Info << " Z_TET04"; + Info<< " Z_TET04"; } else if (element_type == Z_TRI03) { - Info << " Z_TRI03"; + Info<< " Z_TRI03"; } else if (element_type == Z_QUA04) { - Info << " Z_QUA04"; + Info<< " Z_QUA04"; } else if (element_type == Z_NFACED) { - Info << " Z_NFACED"; + Info<< " Z_NFACED"; } else if (element_type == Z_NSIDED) { - Info << " Z_NSIDED"; + Info<< " Z_NSIDED"; } else { - Info << " unknown"; + Info<< " unknown"; } - Info << endl << flush; + Info<< endl << flush; # endif if (part_number == 1) { const cellShapeList& cellShapes = meshPtr->cellShapes(); - + //================================ // hexahedron //================================ @@ -64,7 +64,7 @@ int USERD_get_part_elements_by_type { const cellShape& cellShape = cellShapes[celli]; const cellModel& cellModel = cellShape.model(); - + if (cellModel == hex) { forAll(cellShape, ip) @@ -87,7 +87,7 @@ int USERD_get_part_elements_by_type { const cellShape& cellShape = cellShapes[celli]; const cellModel& cellModel = cellShape.model(); - + if (cellModel == prism) { forAll(cellShape, ip) @@ -110,7 +110,7 @@ int USERD_get_part_elements_by_type { const cellShape& cellShape = cellShapes[celli]; const cellModel& cellModel = cellShape.model(); - + if (cellModel == pyr) { forAll(cellShape, ip) @@ -133,7 +133,7 @@ int USERD_get_part_elements_by_type { const cellShape& cellShape = cellShapes[celli]; const cellModel& cellModel = cellShape.model(); - + if (cellModel == tet) { forAll(cellShape, ip) diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_node_ids.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_node_ids.H index 3ee4feff131..c05af41ccd6 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_node_ids.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_node_ids.H @@ -5,8 +5,8 @@ int USERD_get_part_node_ids ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_part_node_ids" << endl - << "part_number = " << part_number << endl + Info<< "Entering: USERD_get_part_node_ids" << endl + << "part_number = " << part_number << endl << flush; #endif @@ -25,7 +25,7 @@ int USERD_get_part_node_ids const vectorField& points = bMesh[patchi].points(); label nPoints = points.size(); - + for (label indx=0; indx<nPoints; indx++) { nodeid_array[indx] = indx + 1; @@ -52,7 +52,7 @@ int USERD_get_part_node_ids } #ifdef ENSIGHTDEBUG - Info << "Leaving: USERD_get_part_node_ids" << endl + Info<< "Leaving: USERD_get_part_node_ids" << endl << flush; #endif diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_reader_release.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_reader_release.H index 3a75b16675d..5ebd4425cb7 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_reader_release.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_reader_release.H @@ -5,13 +5,13 @@ int USERD_get_reader_release { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_reader_release" << endl; + Info<< "Entering: USERD_get_reader_release" << endl; #endif strncpy(release_number, Foam::FOAMbuild, Z_MAX_USERD_NAME); #ifdef ENSIGHTDEBUG - Info << "Leaving: USERD_get_reader_release" << endl; + Info<< "Leaving: USERD_get_reader_release" << endl; #endif return Z_OK; diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_reader_version.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_reader_version.H index 7c8206664bd..a8fd102fe3b 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_reader_version.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_reader_version.H @@ -5,13 +5,13 @@ int USERD_get_reader_version { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_reader_version" << endl; + Info<< "Entering: USERD_get_reader_version" << endl; #endif strncpy(version_number, readerVersion, Z_MAX_USERD_NAME); #ifdef ENSIGHTDEBUG - Info << "Leaving: USERD_get_reader_version" << endl; + Info<< "Leaving: USERD_get_reader_version" << endl; #endif return Z_OK; diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_sol_times.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_sol_times.H index dcc64822897..223b0c2164a 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_sol_times.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_sol_times.H @@ -29,7 +29,7 @@ int USERD_get_sol_times { solution_times[n] += addCAD; - Info << "Time[" << n << "] = " << timeDirs[n+1].value() + Info<< "Time[" << n << "] = " << timeDirs[n+1].value() << " was corrected to " << solution_times[n] << endl; } 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 bf811b73220..89c0140b4a8 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 @@ -10,7 +10,7 @@ int USERD_get_var_by_component ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_var_by_component" << endl + Info<< "Entering: USERD_get_var_by_component" << endl << "which_variable = " << which_variable << endl << "which_part = " << which_part << endl << "var_type = " << var_type << endl @@ -32,7 +32,7 @@ int USERD_get_var_by_component { if (which_part == 1) { -# include "getFieldScalar.H" +# include "getFieldScalar.H" } else if (which_part < nPatches+2) { @@ -51,7 +51,7 @@ int USERD_get_var_by_component { if (which_part == 1) { -# include "getFieldVector.H" +# include "getFieldVector.H" } else if (which_part < nPatches+2) { @@ -70,10 +70,10 @@ int USERD_get_var_by_component else if (var_type == Z_TENSOR9) { // all tensor are treated as asymmetric tensors here - + if (which_part == 1) { -# include "getFieldTensor.H" +# include "getFieldTensor.H" } else if (which_part < nPatches+2) { @@ -89,13 +89,13 @@ int USERD_get_var_by_component } } - else + else { return Z_UNDEF; } #ifdef ENSIGHTDEBUG - Info << "Leaving: USERD_get_var_by_component" << endl + Info<< "Leaving: USERD_get_var_by_component" << endl << flush; #endif diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_var_value_at_specific.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_var_value_at_specific.H index d9ea31f4507..d569726f6a3 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_var_value_at_specific.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_var_value_at_specific.H @@ -11,7 +11,7 @@ int USERD_get_var_value_at_specific ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_get_var_value_at_specific" << endl + Info<< "Entering: USERD_get_var_value_at_specific" << endl << flush; #endif // Not sure if it is 0 or 1 based @@ -63,7 +63,7 @@ int USERD_get_var_value_at_specific #ifdef ENSIGHTDEBUG - Info << "Leaving: USERD_get_var_value_at_specific" << endl + Info<< "Leaving: USERD_get_var_value_at_specific" << endl << flush; #endif return Z_OK; diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_load_matf_data.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_load_matf_data.H index 2c03738bd5f..c89cc5f253c 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_load_matf_data.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_load_matf_data.H @@ -6,11 +6,11 @@ int USERD_load_matf_data int wtyp, int mat_type, int *ids_list, - float *val_list + float *val_list ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_load_matf_data" << endl + Info<< "Entering: USERD_load_matf_data" << endl << flush; #endif diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H index 61957c323cd..ccaad12cb3a 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H @@ -10,7 +10,7 @@ int USERD_set_filenames ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_set_filenames" << endl << flush; + Info<< "Entering: USERD_set_filenames" << endl << flush; #endif char tmp[100]; @@ -173,7 +173,7 @@ int USERD_set_filenames if (sprayHeader.headerOk()) { - Info << "[Found lagrangian]" << endl; + Info<< "[Found lagrangian]" << endl; delete sprayPtr; @@ -201,7 +201,7 @@ int USERD_set_filenames Numparts_available = Num_unstructured_parts + Num_structured_parts + nPatches; #ifdef ENSIGHTDEBUG - Info << "Leaving: USERD_set_filenames" << endl << flush; + Info<< "Leaving: USERD_set_filenames" << endl << flush; #endif return Z_OK; diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_server_number.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_server_number.H index 3918280b95f..f0ff4b24fce 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_server_number.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_server_number.H @@ -5,7 +5,7 @@ void USERD_set_server_number ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_set_server_number" << endl + Info<< "Entering: USERD_set_server_number" << endl << flush; #endif diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_time_set_and_step.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_time_set_and_step.H index 5e4c5815323..5459f67ba6b 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_time_set_and_step.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_time_set_and_step.H @@ -6,7 +6,7 @@ void USERD_set_time_set_and_step ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_set_time_set_and_step" << endl << flush; + Info<< "Entering: USERD_set_time_set_and_step" << endl << flush; #endif // update the global pointers and variables // to the current time-step diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_size_matf_data.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_size_matf_data.H index 85cdcfab5c2..c48fa13bfb8 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_size_matf_data.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_size_matf_data.H @@ -5,11 +5,11 @@ int USERD_size_matf_data int part_id, int wtyp, int mat_type, - int *matf_size + int *matf_size ) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_size_matf_data" << endl + Info<< "Entering: USERD_size_matf_data" << endl << flush; #endif diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_stop_part_building.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_stop_part_building.H index 13ac17682e4..c6262b8ee13 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_stop_part_building.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_stop_part_building.H @@ -2,7 +2,7 @@ void USERD_stop_part_building(void) { #ifdef ENSIGHTDEBUG - Info << "Entering: USERD_stop_part_building" << endl << flush; + Info<< "Entering: USERD_stop_part_building" << endl << flush; #endif } diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianScalar.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianScalar.H index 39ccf6c07f2..3c1d5f84cb8 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianScalar.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/getLagrangianScalar.H @@ -29,7 +29,7 @@ if (nVar >= 0) } else { - // Info << "getLagrangianScalar: nVar = " << nVar << endl; + // Info<< "getLagrangianScalar: nVar = " << nVar << endl; return Z_UNDEF; } diff --git a/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C b/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C index 65356b382b2..08ec6431467 100644 --- a/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C +++ b/applications/utilities/postProcessing/miscellaneous/engineCompRatio/engineCompRatio.C @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) Info<< "\nVmax = " << Vmax; Info<< ", Vmin = " << Vmin << endl; Info<< "Vmax/Vmin = " << Vmax/Vmin << endl; - Info<< "\nEnd" << endl; + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C index 09e85cb6492..3347e4dcdb5 100644 --- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C +++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C @@ -77,7 +77,7 @@ int main(int argc, char *argv[]) makeGraph(x, samples, p->type(), pdfPath, runTime.graphFormat()); - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C index 559e769cf1c..53e198c8d98 100644 --- a/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C +++ b/applications/utilities/postProcessing/miscellaneous/postChannel/postChannel.C @@ -90,7 +90,7 @@ int main(int argc, char *argv[]) # include "collapse.H" } - Info<< "\nEnd" << endl; + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C b/applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C index bc26ec509fb..cc4a69944ea 100644 --- a/applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C +++ b/applications/utilities/postProcessing/miscellaneous/writeCellCentres/writeCellCentres.C @@ -101,7 +101,7 @@ int main(int argc, char *argv[]) } } - Info<< "\nEnd" << endl; + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/postProcessing/velocityField/Lambda2/Lambda2.C b/applications/utilities/postProcessing/velocityField/Lambda2/Lambda2.C index d60f18fdafa..84ef1161943 100644 --- a/applications/utilities/postProcessing/velocityField/Lambda2/Lambda2.C +++ b/applications/utilities/postProcessing/velocityField/Lambda2/Lambda2.C @@ -72,7 +72,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh) -eigenValues(SSplusWW)().component(vector::Y) ); - Info << " Writing -Lambda2" << endl; + Info<< " Writing -Lambda2" << endl; Lambda2.write(); } else diff --git a/applications/utilities/postProcessing/velocityField/Pe/Pe.C b/applications/utilities/postProcessing/velocityField/Pe/Pe.C index 27a4576b6f5..68402834e80 100644 --- a/applications/utilities/postProcessing/velocityField/Pe/Pe.C +++ b/applications/utilities/postProcessing/velocityField/Pe/Pe.C @@ -351,7 +351,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh) } */ - Info << "Pe max : " << max(PePtr()).value() << endl; + Info<< "Pe max : " << max(PePtr()).value() << endl; if (writeResults) { diff --git a/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C b/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C index 44ab386d9fa..2b4e3ce58d9 100644 --- a/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C +++ b/applications/utilities/postProcessing/velocityField/streamFunction/streamFunction.C @@ -446,7 +446,7 @@ int main(int argc, char *argv[]) } } while (!finished); - Info << endl; + Info<< endl; } while (!finished); streamFunction.boundaryField() = 0.0; diff --git a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C index a11404646ca..a71e0fb1d25 100644 --- a/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C +++ b/applications/utilities/postProcessing/wall/yPlusRAS/yPlusRAS.C @@ -126,7 +126,7 @@ void calcCompressibleYPlus return; } - Info << "Reading field rho\n" << endl; + Info<< "Reading field rho\n" << endl; volScalarField rho(rhoHeader, mesh); #include "compressibleCreatePhi.H" @@ -236,7 +236,7 @@ int main(int argc, char *argv[]) if (UHeader.headerOk()) { - Info << "Reading field U\n" << endl; + Info<< "Reading field U\n" << endl; volVectorField U(UHeader, mesh); if (compressible) diff --git a/applications/utilities/preProcessing/engineSwirl/engineSwirl.C b/applications/utilities/preProcessing/engineSwirl/engineSwirl.C index 089689b47b0..de6e9a2640d 100644 --- a/applications/utilities/preProcessing/engineSwirl/engineSwirl.C +++ b/applications/utilities/preProcessing/engineSwirl/engineSwirl.C @@ -69,11 +69,11 @@ int main(int argc, char *argv[]) } } - Info << "Umax = " << Umax << endl; + Info<< "Umax = " << Umax << endl; U.write(); - Info << "\n end\n"; + Info<< "\n end\n"; return 0; } diff --git a/applications/utilities/preProcessing/mapFields/createTimes.H b/applications/utilities/preProcessing/mapFields/createTimes.H index 8367e595579..91e6a349aec 100644 --- a/applications/utilities/preProcessing/mapFields/createTimes.H +++ b/applications/utilities/preProcessing/mapFields/createTimes.H @@ -1,4 +1,4 @@ - Info << "\nCreate databases as time" << endl; + Info<< "\nCreate databases as time" << endl; Time runTimeSource ( diff --git a/applications/utilities/preProcessing/mdInitialise/mdInitialise.C b/applications/utilities/preProcessing/mdInitialise/mdInitialise.C index 475aedb66b6..c713a9816df 100644 --- a/applications/utilities/preProcessing/mdInitialise/mdInitialise.C +++ b/applications/utilities/preProcessing/mdInitialise/mdInitialise.C @@ -89,7 +89,7 @@ int main(int argc, char *argv[]) Info<< nl << "ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; - Info << nl << "End\n" << endl; + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/preProcessing/setFields/setFields.C b/applications/utilities/preProcessing/setFields/setFields.C index d164709504a..b33541dc62b 100644 --- a/applications/utilities/preProcessing/setFields/setFields.C +++ b/applications/utilities/preProcessing/setFields/setFields.C @@ -235,7 +235,7 @@ int main(int argc, char *argv[]) ); } - Info<< "\nEnd" << endl; + Info<< "\nEnd\n" << endl; return 0; } diff --git a/applications/utilities/preProcessing/wallFunctionTable/wallFunctionTableApp.C b/applications/utilities/preProcessing/wallFunctionTable/wallFunctionTableApp.C index a729a771c92..17f38bbb16a 100644 --- a/applications/utilities/preProcessing/wallFunctionTable/wallFunctionTableApp.C +++ b/applications/utilities/preProcessing/wallFunctionTable/wallFunctionTableApp.C @@ -59,7 +59,7 @@ int main(int argc, char *argv[]) twf->write(); - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/surface/surfaceAdd/surfaceAdd.C b/applications/utilities/surface/surfaceAdd/surfaceAdd.C index 587461d403a..e8f1d3b7038 100644 --- a/applications/utilities/surface/surfaceAdd/surfaceAdd.C +++ b/applications/utilities/surface/surfaceAdd/surfaceAdd.C @@ -263,12 +263,12 @@ int main(int argc, char *argv[]) Info<< endl; - Info << "Writing : " << outFileName << endl; + Info<< "Writing : " << outFileName << endl; // No need to 'group' while writing since all in correct order anyway. combinedSurf.write(outFileName); - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C b/applications/utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C index 16acfa7415a..0a7d8a2cc59 100644 --- a/applications/utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C +++ b/applications/utilities/surface/surfaceAutoPatch/surfaceAutoPatch.C @@ -64,13 +64,13 @@ int main(int argc, char *argv[]) // Read // ~~~~ - Info << "Reading : " << inFileName << endl; + Info<< "Reading : " << inFileName << endl; triSurface surf(inFileName); Info<< "Read surface:" << endl; surf.writeStats(Info); Info<< endl; - + // Construct features from surface&featureangle @@ -117,7 +117,7 @@ int main(int argc, char *argv[]) } - Info << "Writing : " << outFileName << endl; + Info<< "Writing : " << outFileName << endl; surf.write(outFileName, true); Info<< "End\n" << endl; diff --git a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C index 3ec618189e9..146f8d1213e 100644 --- a/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C +++ b/applications/utilities/surface/surfaceCoarsen/surfaceCoarsen.C @@ -54,7 +54,7 @@ int mapVertex(::List<int>& collapse_map, int a, int mx) return 0; } while (a >= mx) - { + { a = collapse_map[a]; } return a; @@ -122,14 +122,14 @@ int main(int argc, char *argv[]) td.v[1]=f[1]; td.v[2]=f[2]; tri.Add(td); - } + } ::List<int> collapse_map; // to which neighbor each vertex collapses ::List<int> permutation; ::ProgressiveMesh(vert,tri,collapse_map,permutation); - // rearrange the vertex list + // rearrange the vertex list ::List< ::Vector> temp_list; for(int i=0;i<vert.num;i++) { @@ -167,7 +167,7 @@ int main(int argc, char *argv[]) int p2 = mapVertex(collapse_map, tri[i].v[2], render_num); // note: serious optimization opportunity here, - // by sorting the triangles the following "continue" + // by sorting the triangles the following "continue" // could have been made into a "break" statement. if (p0 == p1 || p1 == p2 || p2 == p0) { @@ -205,7 +205,7 @@ int main(int argc, char *argv[]) surf2.write(outFileName); - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/surface/surfaceFind/surfaceFind.C b/applications/utilities/surface/surfaceFind/surfaceFind.C index 13d769fd1a7..b710a52493e 100644 --- a/applications/utilities/surface/surfaceFind/surfaceFind.C +++ b/applications/utilities/surface/surfaceFind/surfaceFind.C @@ -123,7 +123,7 @@ int main(int argc, char *argv[]) << endl; - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C index fb7d4274632..132fca6c342 100644 --- a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C +++ b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C @@ -320,7 +320,7 @@ int main(int argc, char *argv[]) } } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/surface/surfaceOrient/surfaceOrient.C b/applications/utilities/surface/surfaceOrient/surfaceOrient.C index 1b728711cdc..c6fd31c0294 100644 --- a/applications/utilities/surface/surfaceOrient/surfaceOrient.C +++ b/applications/utilities/surface/surfaceOrient/surfaceOrient.C @@ -95,7 +95,7 @@ int main(int argc, char *argv[]) surf.write(outFileName); - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C b/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C index 1ba618ec01e..2ad5af8c571 100644 --- a/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C +++ b/applications/utilities/surface/surfacePointMerge/surfacePointMerge.C @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) cleanSurf.write(outFileName); - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C b/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C index 49efe5293a2..7b94ca60e2b 100644 --- a/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C +++ b/applications/utilities/surface/surfaceRefineRedGreen/surfaceRefineRedGreen.C @@ -79,7 +79,7 @@ int main(int argc, char *argv[]) surf2.write(outFileName); - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/surface/surfaceSmooth/surfaceSmooth.C b/applications/utilities/surface/surfaceSmooth/surfaceSmooth.C index cb843d3a465..55a7231e332 100644 --- a/applications/utilities/surface/surfaceSmooth/surfaceSmooth.C +++ b/applications/utilities/surface/surfaceSmooth/surfaceSmooth.C @@ -111,7 +111,7 @@ int main(int argc, char *argv[]) surf2.write(outFileName); - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C b/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C index 71ab4c8b01d..a597fc5c2c1 100644 --- a/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C +++ b/applications/utilities/surface/surfaceSplitByPatch/surfaceSplitByPatch.C @@ -106,7 +106,7 @@ int main(int argc, char *argv[]) } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C index c14771030f4..09d13cb2a89 100644 --- a/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C +++ b/applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C @@ -973,7 +973,7 @@ int main(int argc, char *argv[]) surf.write(outSurfName); - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/surface/surfaceSubset/surfaceSubset.C b/applications/utilities/surface/surfaceSubset/surfaceSubset.C index 1c1a725cad2..e32677fe771 100644 --- a/applications/utilities/surface/surfaceSubset/surfaceSubset.C +++ b/applications/utilities/surface/surfaceSubset/surfaceSubset.C @@ -117,7 +117,7 @@ int main(int argc, char *argv[]) if (markedPoints.size()) { - Info << "Found " << markedPoints.size() << " marked point(s)." << endl; + Info<< "Found " << markedPoints.size() << " marked point(s)." << endl; // pick up cells sharing the point @@ -155,7 +155,7 @@ int main(int argc, char *argv[]) if (markedEdges.size()) { - Info << "Found " << markedEdges.size() << " marked edge(s)." << endl; + Info<< "Found " << markedEdges.size() << " marked edge(s)." << endl; // pick up cells sharing the edge @@ -194,7 +194,7 @@ int main(int argc, char *argv[]) const point& min = markedZone[0]; const point& max = markedZone[1]; - Info << "Using zone min:" << min << " max:" << max << endl; + Info<< "Using zone min:" << min << " max:" << max << endl; forAll(surf1, faceI) { @@ -295,7 +295,7 @@ int main(int argc, char *argv[]) if (markedFaces.size()) { - Info << "Found " << markedFaces.size() << " marked face(s)." << endl; + Info<< "Found " << markedFaces.size() << " marked face(s)." << endl; // Check and mark faces to pick up forAll (markedFaces, faceI) @@ -373,11 +373,11 @@ int main(int argc, char *argv[]) Info<< "Subset:" << endl; surf2.writeStats(Info); - Info << endl; + Info<< endl; fileName outFileName(args.additionalArgs()[2]); - Info << "Writing surface to " << outFileName << endl; + Info<< "Writing surface to " << outFileName << endl; surf2.write(outFileName); diff --git a/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C b/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C index 87ce69ddf77..f602fa47b01 100644 --- a/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C +++ b/applications/utilities/surface/surfaceToPatch/surfaceToPatch.C @@ -311,7 +311,7 @@ int main(int argc, char *argv[]) runTime++; // Write resulting mesh - Info << "Writing modified mesh to time " << runTime.value() << endl; + Info<< "Writing modified mesh to time " << runTime.value() << endl; mesh.write(); } diff --git a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C index 1b9fcf0d0a3..be4449c6ae4 100644 --- a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C +++ b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C @@ -166,7 +166,7 @@ int main(int argc, char *argv[]) surf2.write(outFileName); - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C b/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C index 18befde0afa..f1cb5ee1b3f 100644 --- a/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C +++ b/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C @@ -60,7 +60,7 @@ int main(int argc, char *argv[]) OFstream thermoFile(FOAMThermodynamicsFileName); thermoFile<< cr.speciesThermo() << endl; - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C index 277a4e787fb..5e4c41dbe9f 100644 --- a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C +++ b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C @@ -116,7 +116,7 @@ int main(int argc, char *argv[]) + 2*pMix[i].volFrac()*thermo(CpData.lookup(pMix[i].name())); } - Info << "Adiabatic flame temperature of mixture " << rMix.name() << " = " + Info<< "Adiabatic flame temperature of mixture " << rMix.name() << " = " << products.TH(reactants.H(T0), 1000.0) << " K" << endl; return 0; diff --git a/bin/templates/source/_TemplateApp.C b/bin/templates/source/_TemplateApp.C index 7ce97539e6a..42f2df0db8e 100644 --- a/bin/templates/source/_TemplateApp.C +++ b/bin/templates/source/_TemplateApp.C @@ -41,8 +41,7 @@ int main(int argc, char *argv[]) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - Info << "End\n" << endl; - + Info<< "\nEnd\n" << endl; return 0; } diff --git a/doc/codingStyleGuide.org b/doc/codingStyleGuide.org index d9c5c3c9c66..6c5f691aa54 100644 --- a/doc/codingStyleGuide.org +++ b/doc/codingStyleGuide.org @@ -12,27 +12,36 @@ + 80 character lines max + The body of control statements (eg, if, else, while, etc). always delineated with brace brackets + + Use spaces for indentation, not tab characters. + + The normal indentation is 4 spaces per logical level. + + Avoid trailing whitespace. + stream output - << is always four characters after the start of the stream, so that the << - symbols align, i.e. - - Info<< - os << + << is always four characters after the start of the stream, + so that the << symbols align, i.e. +#+BEGIN_EXAMPLE + Info<< ... + os << ... +#+END_EXAMPLE so +#+BEGIN_EXAMPLE WarningIn("className::functionName()") << "Warning message" +#+END_EXAMPLE NOT +#+BEGIN_EXAMPLE WarningIn("className::functionName()") << "Warning message" +#+END_EXAMPLE + no unnecessary class section headers, i.e. remove +#+BEGIN_EXAMPLE // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // Check @@ -40,20 +49,25 @@ // Edit // Write +#+END_EXAMPLE if they contain nothing, even if planned for 'future use' + class titles are centred +#+BEGIN_EXAMPLE /*---------------------------------------------------------------------------*\ Class exampleClass Declaration \*---------------------------------------------------------------------------*/ +#+END_EXAMPLE NOT +#+BEGIN_EXAMPLE /*---------------------------------------------------------------------------*\ Class exampleClass Declaration \*---------------------------------------------------------------------------*/ +#+END_EXAMPLE *** .H Files + header file spacing @@ -64,20 +78,25 @@ + destructor If adding a comment to the destructor - use //- and code as a normal function: +#+BEGIN_EXAMPLE //- Destructor ~className(); +#+END_EXAMPLE + inline functions Use inline functions where appropriate in a separate classNameI.H file. - Do not clutter up the header file with function bodies + Avoid cluttering the header file with function bodies. *** .C Files + Do not open/close namespaces in a .C file Fully scope the function name, i.e. +#+BEGIN_EXAMPLE Foam::returnType Foam::className::functionName() +#+END_EXAMPLE NOT +#+BEGIN_EXAMPLE namespace Foam { ... @@ -86,12 +105,14 @@ ... } +#+END_EXAMPLE EXCEPTION When there are multiple levels of namespace, they may be used in the .C file, i.e. +#+BEGIN_EXAMPLE namespace Foam { namespace compressible @@ -104,33 +125,41 @@ } // End namespace RASModels } // End namespace compressible } // End namespace Foam +#+END_EXAMPLE + Use two empty lines between functions *** Coding Practise + passing data as arguments or return - Pass label and scalar as copy, anything bigger by reference + Pass bool, label and scalar as copy, anything larger by reference. + const Use everywhere it is applicable. + variable initialisation using "=" +#+BEGIN_EXAMPLE const className& variableName = otherClass.data(); +#+END_EXAMPLE NOT +#+BEGIN_EXAMPLE const className& variableName(otherClass.data()); +#+END_EXAMPLE + virtual functions If a class is virtual - make all derived classes virtual. *** Conditional Statements +#+BEGIN_EXAMPLE if (condition) { code; } +#+END_EXAMPLE OR +#+BEGIN_EXAMPLE if ( long condition @@ -138,22 +167,28 @@ { code; } +#+END_EXAMPLE NOT (no space between "if" and "(") +#+BEGIN_EXAMPLE if(condition) { code; } +#+END_EXAMPLE *** `for' Loops +#+BEGIN_EXAMPLE for (i = 0; i < maxI; i++) { code; } +#+END_EXAMPLE OR +#+BEGIN_EXAMPLE for ( i = 0; @@ -163,86 +198,111 @@ { code; } +#+END_EXAMPLE NOT (no space between "for" and "(") +#+BEGIN_EXAMPLE for(i = 0; i < maxI; i++) { code; } +#+END_EXAMPLE *** `forAll' loops like for loops, but +#+BEGIN_EXAMPLE forAll( +#+END_EXAMPLE NOT +#+BEGIN_EXAMPLE forAll ( +#+END_EXAMPLE *** Splitting Over Multiple Lines + splitting return type and function name + split initially after the function return type and left align - + do not put "const" onto it's own line - use a split to keep it with the + + do not put "const" onto its own line - use a split to keep it with the function name and arguments. so: +#+BEGIN_EXAMPLE const Foam::longReturnTypeName& Foam::longClassName::longFunctionName const +#+END_EXAMPLE NOT +#+BEGIN_EXAMPLE const Foam::longReturnTypeName& Foam::longClassName::longFunctionName const +#+END_EXAMPLE NOR +#+BEGIN_EXAMPLE const Foam::longReturnTypeName& Foam::longClassName::longFunctionName const +#+END_EXAMPLE NOR +#+BEGIN_EXAMPLE const Foam::longReturnTypeName& Foam::longClassName:: longFunctionName const +#+END_EXAMPLE + if need to split again, split at the function name (leaving behind the - preceding scoping "::"'s), and again, left align, i.e. + preceding scoping "::"s), and again, left align, i.e. +#+BEGIN_EXAMPLE const Foam::longReturnTypeName& Foam::veryveryveryverylongClassName:: veryveryveryverylongFunctionName const +#+END_EXAMPLE + splitting long lines at an "=" Indent after split +#+BEGIN_EXAMPLE variableName = longClassName.longFunctionName(longArgument); +#+END_EXAMPLE OR (where necessary) +#+BEGIN_EXAMPLE variableName = longClassName.longFunctionName ( longArgument1, longArgument2 ); +#+END_EXAMPLE NOT +#+BEGIN_EXAMPLE variableName = longClassName.longFunctionName(longArgument); +#+END_EXAMPLE NOR +#+BEGIN_EXAMPLE variableName = longClassName.longFunctionName ( longArgument1, longArgument2 ); +#+END_EXAMPLE *** Maths and Logic + operator spacing @@ -258,18 +318,34 @@ with the operator on the lower line. Align operator so that first variable, function or bracket on the next line is 4 spaces indented i.e. +#+BEGIN_EXAMPLE variableName = - a*(a + b) + a * (a + b) - exp(c/d) - *(k + t) + * (k + t); +#+END_EXAMPLE + + This is sometime more legible when surrounded by extra parentheses: + +#+BEGIN_EXAMPLE + variableName = + ( + a * (a + b) + - exp(c/d) + * (k + t) + ); +#+END_EXAMPLE + splitting logical tests over several lines - indent operator so that the next variable to test is aligned with the - four space indentation, i.e. + outdent the operator so that the next variable to test is aligned with + the four space indentation, i.e. +#+BEGIN_EXAMPLE if ( a == true && b == c ) +#+END_EXAMPLE + diff --git a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C index 4ed38340530..c06f7c8cef2 100644 --- a/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C +++ b/src/OpenFOAM/db/dictionary/dictionaryEntry/dictionaryEntryIO.C @@ -39,7 +39,7 @@ Foam::dictionaryEntry::dictionaryEntry Istream& is ) : - entry(is), + entry(keyType(is)), dictionary(parentDict, is) { is.fatalCheck diff --git a/src/OpenFOAM/db/dictionary/entry/entry.C b/src/OpenFOAM/db/dictionary/entry/entry.C index a3049a31519..d153bb04e35 100644 --- a/src/OpenFOAM/db/dictionary/entry/entry.C +++ b/src/OpenFOAM/db/dictionary/entry/entry.C @@ -38,7 +38,6 @@ Foam::entry::entry(const keyType& keyword) Foam::entry::entry(const entry& e) : - IDLList<entry>::link(), keyword_(e.keyword_) {} diff --git a/src/OpenFOAM/db/dictionary/entry/entry.H b/src/OpenFOAM/db/dictionary/entry/entry.H index ddaefe74402..8b2ffccf2a6 100644 --- a/src/OpenFOAM/db/dictionary/entry/entry.H +++ b/src/OpenFOAM/db/dictionary/entry/entry.H @@ -77,7 +77,7 @@ class entry // Private Member Functions //- Get the next valid keyword otherwise return false - static bool getKeyword(keyType& keyword, Istream& is); + static bool getKeyword(keyType&, Istream&); public: @@ -85,7 +85,7 @@ public: // Constructors //- Construct from keyword - entry(const keyType& keyword); + entry(const keyType&); //- Construct as copy entry(const entry&); @@ -102,7 +102,7 @@ public: virtual autoPtr<entry> clone() const; //- Construct from Istream and insert into dictionary - static bool New(dictionary& parentDict, Istream& is); + static bool New(dictionary& parentDict, Istream&); //- Construct on freestore from Istream and return static autoPtr<entry> New(Istream& is); diff --git a/src/OpenFOAM/db/scalarRange/scalarRange.C b/src/OpenFOAM/db/scalarRange/scalarRange.C index 393b19bba42..239aa44c410 100644 --- a/src/OpenFOAM/db/scalarRange/scalarRange.C +++ b/src/OpenFOAM/db/scalarRange/scalarRange.C @@ -315,7 +315,7 @@ Foam::Istream& Foam::operator>>(Istream& is, scalarRange& range) Info<< "rejected ill-formed range:"; for (label i=0; i<nTok; ++i) { - Info << " " << toks[i]; + Info<< " " << toks[i]; } Info<< endl; } diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C index 534cb5e1075..2f1945ac8ed 100644 --- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C +++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/CalcPatchToPatchWeights.C @@ -63,7 +63,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const if (debug) { - Info << "projecting points" << endl; + Info<< "projecting points" << endl; } List<objectHit> proj = @@ -139,7 +139,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcPointAddressing() const + projectionDirection[pointI]*ph.distance() - ph.missPoint() ); - + // Calculate the local tolerance scalar minEdgeLength = GREAT; @@ -244,7 +244,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcFaceAddressing() const if (debug) { - Info << "projecting face centres" << endl; + Info<< "projecting face centres" << endl; } const pointField& fromPatchPoints = fromPatch_.points(); @@ -274,7 +274,7 @@ void PatchToPatchInterpolation<FromPatch, ToPatch>::calcFaceAddressing() const ); faceAddressingPtr_ = new labelList(proj.size(), -1); - labelList& faceAddressing = *faceAddressingPtr_; + labelList& faceAddressing = *faceAddressingPtr_; forAll (faceAddressing, faceI) { diff --git a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C index 585c8c2dda4..ad57b17b81c 100644 --- a/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C +++ b/src/OpenFOAM/matrices/scalarMatrices/SVD/SVD.C @@ -368,7 +368,7 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition) { if (S_[i] <= minS) { - //Info << "Removing " << S_[i] << " < " << minS << endl; + //Info<< "Removing " << S_[i] << " < " << minS << endl; S_[i] = 0; nZeros_++; } @@ -390,11 +390,11 @@ Foam::SVD::SVD(const scalarRectangularMatrix& A, const scalar minCondition) if (diff > maxDiff) maxDiff = diff; } } - Info << "Maximum discrepancy between A and svd(A) = " << maxDiff << endl; + Info<< "Maximum discrepancy between A and svd(A) = " << maxDiff << endl; if (maxDiff > 4) { - Info << "singular values " << S_ << endl; + Info<< "singular values " << S_ << endl; } */ } diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C index a111e0435da..07bb357ff34 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C +++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C @@ -598,7 +598,7 @@ bool Foam::polyBoundaryMesh::checkDefinition(const bool report) const } else { - Info << " Boundary definition OK." << endl; + Info<< " Boundary definition OK." << endl; } } diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C index f1cc51cb9ec..1a86588c745 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C +++ b/src/OpenFOAM/meshes/polyMesh/polyMeshFromShapeMesh.C @@ -614,7 +614,7 @@ Foam::polyMesh::polyMesh { if (checkMesh()) { - Info << "Mesh OK" << endl; + Info<< "Mesh OK" << endl; } } } diff --git a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C index b8b133ed011..f1bbabc460e 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C +++ b/src/OpenFOAM/meshes/polyMesh/polyMeshIO.C @@ -89,7 +89,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate() // Topological change if (debug) { - Info << "Topological change" << endl; + Info<< "Topological change" << endl; } clearOut(); @@ -403,7 +403,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate() // Points moved if (debug) { - Info << "Point motion" << endl; + Info<< "Point motion" << endl; } clearGeom(); @@ -430,14 +430,14 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate() // Rotation can cause direction vector to change geometricD_ = Vector<label>::zero; solutionD_ = Vector<label>::zero; - + return polyMesh::POINTS_MOVED; } else { if (debug) { - Info << "No change" << endl; + Info<< "No change" << endl; } return polyMesh::UNCHANGED; diff --git a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C index bf4ce672550..e3e15e8574b 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/faceZone/faceZone.C @@ -156,8 +156,8 @@ void Foam::faceZone::calcCellLayers() const sc[faceI] = neiCellI; } } - //Info << "masterCells: " << mc << endl; - //Info << "slaveCells: " << sc << endl; + //Info<< "masterCells: " << mc << endl; + //Info<< "slaveCells: " << sc << endl; } } diff --git a/src/OpenFOAM/meshes/preservePatchTypes/preservePatchTypes.C b/src/OpenFOAM/meshes/preservePatchTypes/preservePatchTypes.C index 3def2078846..0c73d3e46a8 100644 --- a/src/OpenFOAM/meshes/preservePatchTypes/preservePatchTypes.C +++ b/src/OpenFOAM/meshes/preservePatchTypes/preservePatchTypes.C @@ -74,7 +74,7 @@ void Foam::preservePatchTypes { if (patchDictionary.found(patchNames[patchi])) { - const dictionary& patchDict = + const dictionary& patchDict = patchDictionary.subDict(patchNames[patchi]); patchDict.lookup("type") >> patchTypes[patchi]; @@ -90,14 +90,14 @@ void Foam::preservePatchTypes if (patchDictionary.found(defaultFacesName)) { - const dictionary& patchDict = + const dictionary& patchDict = patchDictionary.subDict(defaultFacesName); patchDict.readIfPresent("geometricType", defaultFacesType); } } - Info << nl << "Default patch type set to " << defaultFacesType << endl; + Info<< nl << "Default patch type set to " << defaultFacesType << endl; } diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C index e90bbd96ece..55e97b36815 100644 --- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C +++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchProjectPoints.C @@ -262,7 +262,7 @@ projectPoints if (debug) { - Info << result[curLocalPointLabel] << nl; + Info<< result[curLocalPointLabel] << nl; } } else @@ -505,7 +505,7 @@ projectFaceCentres if (debug) { - Info << result[curLocalFaceLabel] << nl; + Info<< result[curLocalFaceLabel] << nl; } } else diff --git a/src/conversion/meshReader/meshReaderAux.C b/src/conversion/meshReader/meshReaderAux.C index 856d704857c..9b1c9f2bdfa 100644 --- a/src/conversion/meshReader/meshReaderAux.C +++ b/src/conversion/meshReader/meshReaderAux.C @@ -58,15 +58,15 @@ void Foam::meshReader::warnDuplicates // warn about duplicate names if (duplicates) { - Info << nl << "WARNING: " << context << " with identical names:"; + Info<< nl << "WARNING: " << context << " with identical names:"; forAllConstIter(HashTable<label>, hashed, iter) { if (*iter > 1) { - Info << " " << iter.key(); + Info<< " " << iter.key(); } } - Info << nl << endl; + Info<< nl << endl; } } diff --git a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C b/src/conversion/meshWriter/starcd/STARCDMeshWriter.C index 15d681898ee..0bb4632cce7 100644 --- a/src/conversion/meshWriter/starcd/STARCDMeshWriter.C +++ b/src/conversion/meshWriter/starcd/STARCDMeshWriter.C @@ -554,7 +554,7 @@ bool Foam::meshWriters::STARCD::writeSurface OFstream celFile(baseName + ".cel"); writeHeader(celFile, "CELL"); - Info << "Writing " << celFile.name() << endl; + Info<< "Writing " << celFile.name() << endl; // mesh and patch info const pointField& points = mesh_.points(); @@ -693,7 +693,7 @@ bool Foam::meshWriters::STARCD::writeSurface vrtFile.precision(10); vrtFile.setf(std::ios::showpoint); // force decimal point for Fortran - Info << "Writing " << vrtFile.name() << endl; + Info<< "Writing " << vrtFile.name() << endl; // build sorted table of contents SortableList<label> toc(pointHash.size()); diff --git a/src/dynamicMesh/motionSolver/motionSolver.C b/src/dynamicMesh/motionSolver/motionSolver.C index 5966679feb7..a8c28ea8752 100644 --- a/src/dynamicMesh/motionSolver/motionSolver.C +++ b/src/dynamicMesh/motionSolver/motionSolver.C @@ -78,7 +78,7 @@ Foam::autoPtr<Foam::motionSolver> Foam::motionSolver::New(const polyMesh& mesh) word solverTypeName(msData); - Info << "Selecting motion solver: " << solverTypeName << endl; + Info<< "Selecting motion solver: " << solverTypeName << endl; dlLibraryTable::open ( diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C index c89388e3199..6519c0e86de 100644 --- a/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C +++ b/src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C @@ -174,14 +174,14 @@ bool Foam::polyTopoChanger::changeTopology() const { Info<< "Modifier " << morphI << " named " << topoChanges[morphI].name(); - + if (curTriggerChange) { - Info << " morphing" << endl; + Info<< " morphing" << endl; } else { - Info << " unchanged" << endl; + Info<< " unchanged" << endl; } } @@ -195,7 +195,7 @@ bool Foam::polyTopoChanger::changeTopology() const << topoChanges[morphI].name() << " inactive" << endl; } } - + } return triggerChange; @@ -252,7 +252,7 @@ void Foam::polyTopoChanger::update(const mapPolyMesh& m) // Force the mesh modifiers to auto-write. This allows us to // preserve the current state of modifiers corresponding with - // the mesh. + // the mesh. writeOpt() = IOobject::AUTO_WRITE; instance() = mesh_.time().timeName(); } diff --git a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C index bad4dd118e5..1030fcc374a 100644 --- a/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C +++ b/src/dynamicMesh/slidingInterface/enrichedPatch/enrichedPatchFaces.C @@ -91,7 +91,7 @@ void Foam::enrichedPatch::calcEnrichedFaces { const face oldFace = slavePatch_[faceI]; const face oldLocalFace = slaveLocalFaces[faceI]; -// Info << "old slave face " << faceI << ": " << oldFace << endl; +// Info<< "old slave face " << faceI << ": " << oldFace << endl; const labelList& curEdges = slaveFaceEdges[faceI]; DynamicList<label> newFace(oldFace.size()*enrichedFaceRatio_); @@ -133,7 +133,7 @@ void Foam::enrichedPatch::calcEnrichedFaces const labelList& slavePointsOnEdge = pointsIntoSlaveEdges[curEdges[i]]; -// Info << "slavePointsOnEdge for " << curEdges[i] << ": " << slavePointsOnEdge << endl; +// Info<< "slavePointsOnEdge for " << curEdges[i] << ": " << slavePointsOnEdge << endl; // If there are no points on the edge, skip everything // If there is only one point, no need for sorting if (slavePointsOnEdge.size()) @@ -246,7 +246,7 @@ void Foam::enrichedPatch::calcEnrichedFaces { const face& oldFace = masterPatch_[faceI]; const face& oldLocalFace = masterLocalFaces[faceI]; -// Info << "old master face: " << oldFace << endl; +// Info<< "old master face: " << oldFace << endl; const labelList& curEdges = masterFaceEdges[faceI]; DynamicList<label> newFace(oldFace.size()*enrichedFaceRatio_); diff --git a/src/finiteVolume/cfdTools/general/include/readGravitationalAcceleration.H b/src/finiteVolume/cfdTools/general/include/readGravitationalAcceleration.H index 2389d0bd2b7..1be4dc52f53 100644 --- a/src/finiteVolume/cfdTools/general/include/readGravitationalAcceleration.H +++ b/src/finiteVolume/cfdTools/general/include/readGravitationalAcceleration.H @@ -1,4 +1,4 @@ - Info << "\nReading g" << endl; + Info<< "\nReading g" << endl; uniformDimensionedVectorField g ( IOobject diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.C b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.C index 1d13f0d9151..11e54fc5c15 100644 --- a/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.C +++ b/src/finiteVolume/finiteVolume/snGradSchemes/quadraticFitSnGrad/quadraticFitSnGradData.C @@ -64,7 +64,7 @@ Foam::quadraticFitSnGradData::quadraticFitSnGradData { if (debug) { - Info << "Contructing quadraticFitSnGradData" << endl; + Info<< "Contructing quadraticFitSnGradData" << endl; } // check input diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C index 28f0a8d23ee..95002fd960c 100644 --- a/src/finiteVolume/fvMesh/fvMesh.C +++ b/src/finiteVolume/fvMesh/fvMesh.C @@ -356,7 +356,7 @@ Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate() { if (debug) { - Info << "Boundary and topological update" << endl; + Info<< "Boundary and topological update" << endl; } boundary_.readUpdate(boundaryMesh()); @@ -368,7 +368,7 @@ Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate() { if (debug) { - Info << "Topological update" << endl; + Info<< "Topological update" << endl; } clearOut(); @@ -377,7 +377,7 @@ Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate() { if (debug) { - Info << "Point motion update" << endl; + Info<< "Point motion update" << endl; } clearGeom(); @@ -386,7 +386,7 @@ Foam::polyMesh::readUpdateState Foam::fvMesh::readUpdate() { if (debug) { - Info << "No update" << endl; + Info<< "No update" << endl; } } diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C index dcea0902668..a48355872f4 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/FitData/FitData.C @@ -153,7 +153,7 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit // Reference point point p0 = this->mesh().faceCentres()[facei]; - // Info << "Face " << facei << " at " << p0 << " stencil points at:\n" + // Info<< "Face " << facei << " at " << p0 << " stencil points at:\n" // << C - p0 << endl; // p0 -> p vector in the face-local coordinate system @@ -240,7 +240,7 @@ void Foam::FitData<FitDataType, ExtendedStencil, Polynomial>::calcFit // if (goodFit && iIt > 0) // { - // Info << "FitData<Polynomial>::calcFit" + // Info<< "FitData<Polynomial>::calcFit" // << "(const List<point>& C, const label facei" << nl // << "Can now fit face " << facei << " iteration " << iIt // << " with sum of weights " << sum(coeffsi) << nl diff --git a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C index 50936f456a9..159a363b4a1 100644 --- a/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C +++ b/src/fvMotionSolver/motionDiffusivity/motionDiffusivity/motionDiffusivity.C @@ -54,7 +54,7 @@ Foam::autoPtr<Foam::motionDiffusivity> Foam::motionDiffusivity::New { word diffTypeName(mdData); - Info << "Selecting motion diffusion: " << diffTypeName << endl; + Info<< "Selecting motion diffusion: " << diffTypeName << endl; IstreamConstructorTable::iterator cstrIter = IstreamConstructorTablePtr_->find(diffTypeName); diff --git a/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C b/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C index 78cf9367b08..6d5201111c3 100644 --- a/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C +++ b/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C @@ -163,7 +163,7 @@ Foam::commonRailInjector::commonRailInjector } } - Info << "end constructor. in commonRail" << endl; + Info<< "end constructor. in commonRail" << endl; } diff --git a/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C b/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C index ac5a1c3c3d9..ea7cd833230 100644 --- a/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C +++ b/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C @@ -177,9 +177,9 @@ void Foam::multiHoleInjector::setTangentialVectors() } vector yp = zp^xp; -// Info << "xp = " << xp << endl; -// Info << "yp = " << yp << endl; -// Info << "zp = " << zp << endl; +// Info<< "xp = " << xp << endl; +// Info<< "yp = " << yp << endl; +// Info<< "zp = " << zp << endl; scalar angle = 0.0; scalar u = degToRad(umbrellaAngle_/2.0); diff --git a/src/lagrangian/dieselSpray/parcel/parcel.C b/src/lagrangian/dieselSpray/parcel/parcel.C index dc45f4dec40..d2f2221db9e 100644 --- a/src/lagrangian/dieselSpray/parcel/parcel.C +++ b/src/lagrangian/dieselSpray/parcel/parcel.C @@ -616,7 +616,7 @@ void Foam::parcel::updateParcelProperties { if (n>100) { - Info << "n = " << n << ", T = " << Td << ", pv = " << pAtSurface << endl; + Info<< "n = " << n << ", T = " << Td << ", pv = " << pAtSurface << endl; } } } diff --git a/src/lagrangian/dieselSpray/spray/spray.C b/src/lagrangian/dieselSpray/spray/spray.C index e7725acd2ce..1e556d7a763 100644 --- a/src/lagrangian/dieselSpray/spray/spray.C +++ b/src/lagrangian/dieselSpray/spray/spray.C @@ -331,11 +331,11 @@ Foam::spray::spray } if (liquidToGasIndex_[i] == -1) { - Info << "In composition:" << endl; + Info<< "In composition:" << endl; for (label k=0; k<Ns; k++) { word specieName(composition_.Y()[k].name()); - Info << specieName << endl; + Info<< specieName << endl; } FatalError<< diff --git a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.C b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.C index 7ba41141ba3..83c0e17a7b9 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.C +++ b/src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.C @@ -303,7 +303,7 @@ scalar RutlandFlashBoil::boilingTime if (FgNeg > 0.0) { - Info << "no convergence" << endl; + Info<< "no convergence" << endl; } @@ -333,7 +333,7 @@ scalar RutlandFlashBoil::boilingTime if (k >= Niter - 1) { - Info << " No convergence for G " << endl; + Info<< " No convergence for G " << endl; } } else diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C b/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C index aa56562f009..9d631553e57 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C +++ b/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C @@ -159,7 +159,7 @@ bool reflectParcel::wallTreatment /* if (mag(Ub-v) > SMALL) { - Info << "reflectParcel:: v = " << v + Info<< "reflectParcel:: v = " << v << ", Ub = " << Ub << ", facei = " << facei << ", patchi = " << patchi diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C index acccb66b31d..583f7382bee 100644 --- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C +++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C @@ -40,7 +40,7 @@ void Foam::referredCellList::buildReferredCellList bool pointPointListBuild ) { - Info << nl << "Building list of referred interaction neighbours" << endl; + Info<< nl << "Building list of referred interaction neighbours" << endl; const polyMesh& mesh(il_.mesh()); diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H index 730db2d0a8c..50e82df48ab 100644 --- a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H +++ b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H @@ -39,7 +39,7 @@ PtrList<volScalarField> allSpeciesRhoN forAll (allSpeciesRhoN, rN) { - Info << " Creating number density field for " + Info<< " Creating number density field for " << molecules.potential().idList()[rN] << endl; allSpeciesRhoN.set @@ -94,7 +94,7 @@ PtrList<volScalarField> allSpeciesRhoM forAll (allSpeciesRhoM, rM) { - Info << " Creating mass density field for " + Info<< " Creating mass density field for " << molecules.potential().idList()[rM] << endl; allSpeciesRhoM.set @@ -149,7 +149,7 @@ PtrList<volVectorField> allSpeciesVelocity forAll (allSpeciesVelocity, v) { - Info << " Creating velocity field for " + Info<< " Creating velocity field for " << molecules.potential().idList()[v] << endl; allSpeciesVelocity.set @@ -223,7 +223,7 @@ PtrList<volScalarField> allSpeciesTemperature forAll (allSpeciesTemperature, t) { - Info << " Creating temperature field for " + Info<< " Creating temperature field for " << molecules.potential().idList()[t] << endl; allSpeciesTemperature.set @@ -279,7 +279,7 @@ PtrList<volScalarField> allSpeciesMeanKE forAll (allSpeciesMeanKE, mKE) { - Info << " Creating mean kinetic energy field for " + Info<< " Creating mean kinetic energy field for " << molecules.potential().idList()[mKE] << endl; allSpeciesMeanKE.set diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/createRefUnits.H b/src/lagrangian/molecularDynamics/molecule/mdTools/createRefUnits.H index bbd6c6daf7b..c1e558b2213 100644 --- a/src/lagrangian/molecularDynamics/molecule/mdTools/createRefUnits.H +++ b/src/lagrangian/molecularDynamics/molecule/mdTools/createRefUnits.H @@ -11,7 +11,7 @@ IOobject reducedUnitsDictIOobject if (reducedUnitsDictIOobject.headerOk()) { - Info << nl + Info<< nl << "Reading reference quantities from reducedUnitsDict file." << endl; IOdictionary reducedUnitsDict(reducedUnitsDictIOobject); diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H index fb5118bb5a4..4448b9e1783 100644 --- a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H +++ b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H @@ -176,7 +176,7 @@ if (singleStepNMols) /singleStepNMols << endl; - // Info << singleStepNMols << " " + // Info<< singleStepNMols << " " // << singleStepTotalMomentum/singleStepTotalMass << " " // << singleStepMaxVelocityMag << " " // << singleStepTotalKE/singleStepNMols << " " diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H index 34dd65156a9..e95addc7bd3 100644 --- a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H +++ b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H @@ -53,7 +53,7 @@ if (runTime.outputTime()) { if (accumulatedNMols) { - Info << "calculating averages" << endl; + Info<< "calculating averages" << endl; averageTemperature = ( @@ -77,7 +77,7 @@ if (runTime.outputTime()) meshVolume ); - Info << "----------------------------------------" << nl + Info<< "----------------------------------------" << nl << "Averaged properties" << nl << "Average |velocity| = " << mag(accumulatedTotalLinearMomentum)/accumulatedTotalMass << nl diff --git a/src/lagrangian/molecularDynamics/potential/potential/potential.C b/src/lagrangian/molecularDynamics/potential/potential/potential.C index 5532c2f105c..e3f6b501d1e 100644 --- a/src/lagrangian/molecularDynamics/potential/potential/potential.C +++ b/src/lagrangian/molecularDynamics/potential/potential/potential.C @@ -231,7 +231,7 @@ void Foam::potential::potential::readPotentialDict() if (potentialDict.found("external")) { - Info << nl << "Reading external forces:" << endl; + Info<< nl << "Reading external forces:" << endl; const dictionary& externalDict = potentialDict.subDict("external"); @@ -244,7 +244,7 @@ void Foam::potential::potential::readPotentialDict() } } - Info << nl << tab << "gravity = " << gravity_ << endl; + Info<< nl << tab << "gravity = " << gravity_ << endl; } diff --git a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C index 0d4ec63faa8..e3c2c2f4ecb 100644 --- a/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C +++ b/src/meshTools/polyMeshZipUpCells/polyMeshZipUpCells.C @@ -154,7 +154,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh) singleEdges.setSize(nSingleEdges); # ifdef DEBUG_ZIPUP - Info << "Cell " << cellI << endl; + Info<< "Cell " << cellI << endl; forAll (curFaces, faceI) { @@ -274,7 +274,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh) if (pointUsage[pointI] > 2) { # ifdef DEBUG_CHAIN - Info << "start head blocked" << endl; + Info<< "start head blocked" << endl; # endif blockHead = true; @@ -285,7 +285,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh) if (pointUsage[pointI] > 2) { # ifdef DEBUG_CHAIN - Info << "start tail blocked" << endl; + Info<< "start tail blocked" << endl; # endif blockTail = true; @@ -369,7 +369,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh) if (pointUsage[pointI] > 2) { # ifdef DEBUG_CHAIN - Info << "head blocked" << endl; + Info<< "head blocked" << endl; # endif blockHead = true; @@ -380,7 +380,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh) if (pointUsage[pointI] > 2) { # ifdef DEBUG_CHAIN - Info << "tail blocked" << endl; + Info<< "tail blocked" << endl; # endif blockTail = true; @@ -392,7 +392,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh) if (curEdgeStart == curEdgeEnd) { # ifdef DEBUG_CHAIN - Info << "closed loop" << endl; + Info<< "closed loop" << endl; # endif pointChain.removeHead(); @@ -415,7 +415,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh) } # ifdef DEBUG_CHAIN - Info << "completed patch chain: " << pointChain << endl; + Info<< "completed patch chain: " << pointChain << endl; # endif if (pointChain.size() > 2) @@ -428,7 +428,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh) edgesToInsert.setSize(nEdgesToInsert); # ifdef DEBUG_ZIPUP - Info << "edgesToInsert: " << edgesToInsert << endl; + Info<< "edgesToInsert: " << edgesToInsert << endl; # endif // Insert the edges into a list of faces @@ -588,7 +588,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh) # ifdef DEBUG_ZIPUP if (allPointsPresent) { - Info << "All points present" << endl; + Info<< "All points present" << endl; } # endif @@ -605,7 +605,7 @@ bool Foam::polyMeshZipUpCells(polyMesh& mesh) edgeList newFaceEdges = newFace.edges(); # ifdef DEBUG_ZIPUP - Info << "Not all points present." << endl; + Info<< "Not all points present." << endl; # endif label nNewFacePoints = 0; diff --git a/src/sampling/include/mapPatch.H b/src/sampling/include/mapPatch.H index aabec554a8d..4ed64b1f663 100644 --- a/src/sampling/include/mapPatch.H +++ b/src/sampling/include/mapPatch.H @@ -1,8 +1,8 @@ if(planeMapping && targetPatchNamePresent && cut.cut()) { //Map variables U, phi & k - //Info << typeInfo("isoLESmodel") << endl; - //Info << "SGS model" << sgsModel.type() << endl; + //Info<< typeInfo("isoLESmodel") << endl; + //Info<< "SGS model" << sgsModel.type() << endl; scalarField planek(cutCells.size()); scalarField planeNuTilda(cutCells.size()); @@ -23,21 +23,21 @@ if(sgsModel.type() == "SpalartAllmaras") { - Info << "Mapping NuTilda." << endl; + Info<< "Mapping NuTilda." << endl; sgsModel.nuTilda()().boundaryField()[targetPatchNumber] == interPatch.faceInterpolate(planeNuTilda)(); } else { - Info << "Mapping k." << endl; + Info<< "Mapping k." << endl; sgsModel.k()().boundaryField()[targetPatchNumber] == interPatch.faceInterpolate(planek)(); } - + U.boundaryField()[targetPatchNumber] == interPatch.faceInterpolate(planeU)(); -/* sgsModel.k()().boundaryField()[targetPatchNumber] == +/* sgsModel.k()().boundaryField()[targetPatchNumber] == toPatchInter.pointToFaceInterpolate ( interPatch.pointInterpolate @@ -49,7 +49,7 @@ ) ); - U.boundaryField()[targetPatchNumber] == + U.boundaryField()[targetPatchNumber] == toPatchInter.pointToFaceInterpolate ( interPatch.pointInterpolate @@ -62,7 +62,7 @@ ); */ - + scalar Q = sum ( mesh.Sf().boundaryField()[targetPatchNumber] @@ -74,11 +74,11 @@ mesh.Sf().boundaryField()[targetPatchNumber] & Ubar.value() ); - + U.boundaryField()[targetPatchNumber] == U.boundaryField()[targetPatchNumber] * (Qbar/Q); - - Info << "Mass flux correction factor: " << (Qbar/Q) << endl; + + Info<< "Mass flux correction factor: " << (Qbar/Q) << endl; phi.boundaryField()[targetPatchNumber] == ( diff --git a/src/surfMesh/surfMesh/surfMeshIO.C b/src/surfMesh/surfMesh/surfMeshIO.C index c74b1c693eb..ca2d840d072 100644 --- a/src/surfMesh/surfMesh/surfMeshIO.C +++ b/src/surfMesh/surfMesh/surfMeshIO.C @@ -75,7 +75,7 @@ Foam::surfMesh::readUpdateState Foam::surfMesh::readUpdate() // Topological change if (debug) { - Info << "Topological change" << endl; + Info<< "Topological change" << endl; } clearOut(); @@ -169,7 +169,7 @@ Foam::surfMesh::readUpdateState Foam::surfMesh::readUpdate() // Points moved if (debug) { - Info << "Point motion" << endl; + Info<< "Point motion" << endl; } clearGeom(); @@ -195,7 +195,7 @@ Foam::surfMesh::readUpdateState Foam::surfMesh::readUpdate() { if (debug) { - Info << "No change" << endl; + Info<< "No change" << endl; } } diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C index d57b13866ab..f683d77bcea 100644 --- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C +++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C @@ -307,7 +307,7 @@ void Foam::radiation::fvDOM::calculate() maxResidual = max(maxBandResidual, maxResidual); } - Info << "Radiation solver iter: " << radIter << endl; + Info<< "Radiation solver iter: " << radIter << endl; } while(maxResidual > convergence_ && radIter < maxIter_); diff --git a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C index 3953db92fea..d90a7ad0a43 100644 --- a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C +++ b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C @@ -137,11 +137,11 @@ void Foam::linearValveFvMesh::addZonesAndModifiers() List<cellZone*> cz(0); - Info << "Adding point, face and cell zones" << endl; + Info<< "Adding point, face and cell zones" << endl; addZones(pz, fz, cz); // Add a topology modifier - Info << "Adding topology modifiers" << endl; + Info<< "Adding topology modifiers" << endl; topoChanger_.setSize(1); topoChanger_.set ( @@ -249,11 +249,11 @@ bool Foam::linearValveFvMesh::attached() const if (result) { - Info << "linearValveFvMesh: attached!" << endl; + Info<< "linearValveFvMesh: attached!" << endl; } else { - Info << "linearValveFvMesh: detached!" << endl; + Info<< "linearValveFvMesh: detached!" << endl; } return result; @@ -299,7 +299,7 @@ void Foam::linearValveFvMesh::update() // Detaching the interface if (attached()) { - Info << "Decoupling sliding interfaces" << endl; + Info<< "Decoupling sliding interfaces" << endl; makeSlidersLive(); // Changing topology by hand @@ -311,7 +311,7 @@ void Foam::linearValveFvMesh::update() } else { - Info << "Sliding interfaces decoupled" << endl; + Info<< "Sliding interfaces decoupled" << endl; } // Perform mesh motion @@ -328,7 +328,7 @@ void Foam::linearValveFvMesh::update() { if (topoChangeMap().hasMotionPoints()) { - Info << "Topology change; executing pre-motion" << endl; + Info<< "Topology change; executing pre-motion" << endl; movePoints(topoChangeMap().preMotionPoints()); } } @@ -339,17 +339,17 @@ void Foam::linearValveFvMesh::update() movePoints(msPtr_->curPoints()); // Attach the interface - Info << "Coupling sliding interfaces" << endl; + Info<< "Coupling sliding interfaces" << endl; makeSlidersLive(); resetMorph(); setMorphTimeIndex(3*time().timeIndex() + 2); updateMesh(); - Info << "Moving points post slider attach" << endl; + Info<< "Moving points post slider attach" << endl; msPtr_->updateMesh(); - Info << "Sliding interfaces coupled: " << attached() << endl; + Info<< "Sliding interfaces coupled: " << attached() << endl; } diff --git a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C index 8b5ca8a90d2..46119de9448 100644 --- a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C +++ b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C @@ -164,7 +164,7 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers() ); - Info << "Adding point and face zones" << endl; + Info<< "Adding point and face zones" << endl; addZones(pz, fz, cz); // Add a topology modifier @@ -204,7 +204,7 @@ void Foam::linearValveLayersFvMesh::addZonesAndModifiers() ); - Info << "Adding topology modifiers" << endl; + Info<< "Adding topology modifiers" << endl; addTopologyModifiers(tm); // Write mesh @@ -375,7 +375,7 @@ void Foam::linearValveLayersFvMesh::update() // Detaching the interface if (attached()) { - Info << "Decoupling sliding interfaces" << endl; + Info<< "Decoupling sliding interfaces" << endl; makeSlidersLive(); // Changing topology @@ -385,7 +385,7 @@ void Foam::linearValveLayersFvMesh::update() } else { - Info << "Sliding interfaces decoupled" << endl; + Info<< "Sliding interfaces decoupled" << endl; } // Perform layer action and mesh motion @@ -400,7 +400,7 @@ void Foam::linearValveLayersFvMesh::update() { if (topoChangeMap().hasMotionPoints()) { - Info << "Topology change; executing pre-motion" << endl; + Info<< "Topology change; executing pre-motion" << endl; movePoints(topoChangeMap().preMotionPoints()); } } @@ -409,7 +409,7 @@ void Foam::linearValveLayersFvMesh::update() movePoints(newPoints()); // Attach the interface - Info << "Coupling sliding interfaces" << endl; + Info<< "Coupling sliding interfaces" << endl; makeSlidersLive(); // Changing topology @@ -417,11 +417,11 @@ void Foam::linearValveLayersFvMesh::update() setMorphTimeIndex(3*time().timeIndex() + 2); updateMesh(); - Info << "Moving points post slider attach" << endl; + Info<< "Moving points post slider attach" << endl; // const pointField p = allPoints(); // movePoints(p); - Info << "Sliding interfaces coupled: " << attached() << endl; + Info<< "Sliding interfaces coupled: " << attached() << endl; } diff --git a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C index a080a156a53..33d8cffd8d7 100644 --- a/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C +++ b/src/topoChangerFvMesh/mixerFvMesh/mixerFvMesh.C @@ -156,7 +156,7 @@ void Foam::mixerFvMesh::addZonesAndModifiers() } movingCells.setSize(nMovingCells); - Info << "Number of cells in the moving region: " << nMovingCells << endl; + Info<< "Number of cells in the moving region: " << nMovingCells << endl; cz[0] = new cellZone ( @@ -166,11 +166,11 @@ void Foam::mixerFvMesh::addZonesAndModifiers() cellZones() ); - Info << "Adding point, face and cell zones" << endl; + Info<< "Adding point, face and cell zones" << endl; addZones(pz, fz, cz); // Add a topology modifier - Info << "Adding topology modifiers" << endl; + Info<< "Adding topology modifiers" << endl; topoChanger_.setSize(1); topoChanger_.set ( @@ -361,7 +361,7 @@ bool Foam::mixerFvMesh::update() { if (debug) { - Info << "Mesh topology is changing" << endl; + Info<< "Mesh topology is changing" << endl; } deleteDemandDrivenData(movingPointsMaskPtr_); diff --git a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C index 959c4540a56..5e4a1bbde24 100644 --- a/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C +++ b/src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C @@ -146,7 +146,7 @@ void Foam::movingConeTopoFvMesh::addZonesAndModifiers() flipZone2[nZoneFaces2] = true; } - Info << "face " << faceI << " for zone 2. Flip: " + Info<< "face " << faceI << " for zone 2. Flip: " << flipZone2[nZoneFaces2] << endl; nZoneFaces2++; } @@ -158,8 +158,8 @@ void Foam::movingConeTopoFvMesh::addZonesAndModifiers() zone2.setSize(nZoneFaces2); flipZone2.setSize(nZoneFaces2); - Info << "zone: " << zone1 << endl; - Info << "zone: " << zone2 << endl; + Info<< "zone: " << zone1 << endl; + Info<< "zone: " << zone2 << endl; List<pointZone*> pz(0); List<faceZone*> fz(2); @@ -191,7 +191,7 @@ void Foam::movingConeTopoFvMesh::addZonesAndModifiers() fz.setSize(nFz); - Info << "Adding mesh zones." << endl; + Info<< "Adding mesh zones." << endl; addZones(pz, fz, cz); @@ -236,7 +236,7 @@ void Foam::movingConeTopoFvMesh::addZonesAndModifiers() nMods++; tm.setSize(nMods); - Info << "Adding " << nMods << " mesh modifiers" << endl; + Info<< "Adding " << nMods << " mesh modifiers" << endl; topoChanger_.addTopologyModifiers(tm); write(); @@ -334,11 +334,11 @@ bool Foam::movingConeTopoFvMesh::update() if (topoChangeMap.valid()) { - Info << "Topology change. Calculating motion points" << endl; + Info<< "Topology change. Calculating motion points" << endl; if (topoChangeMap().hasMotionPoints()) { - Info << "Topology change. Has premotion points" << endl; + Info<< "Topology change. Has premotion points" << endl; //Info<< "preMotionPoints:" << topoChangeMap().preMotionPoints() // << endl; @@ -390,7 +390,7 @@ bool Foam::movingConeTopoFvMesh::update() } else { - Info << "Topology change. Already set mesh points" << endl; + Info<< "Topology change. Already set mesh points" << endl; motionMask_ = vertexMarkup @@ -424,7 +424,7 @@ bool Foam::movingConeTopoFvMesh::update() } else { - Info << "No topology change" << endl; + Info<< "No topology change" << endl; // Set the mesh motion newPoints = points() @@ -466,7 +466,7 @@ bool Foam::movingConeTopoFvMesh::update() // The mesh now contains the cells with zero volume - Info << "Executing mesh motion" << endl; + Info<< "Executing mesh motion" << endl; movePoints(newPoints); // The mesh now has got non-zero volume cells diff --git a/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C b/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C index 5c3b671271f..044a9fb6096 100644 --- a/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C +++ b/tutorials/basic/potentialFoam/cylinder/analyticalCylinder/analyticalCylinder.C @@ -26,7 +26,7 @@ Application analyticalCylinder Description - Generates an analytical solution for potential flow around a cylinder. + Generates an analytical solution for potential flow around a cylinder. Can be compared with the solution from the potentialFlow/cylinder example. \*---------------------------------------------------------------------------*/ @@ -47,19 +47,19 @@ int main(int argc, char *argv[]) // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - Info << "\nEvaluating analytical solution" << endl; + Info<< "\nEvaluating analytical solution" << endl; volVectorField centres = UA.mesh().C(); volScalarField magCentres = mag(centres); volScalarField theta = acos((centres & vector(1,0,0))/magCentres); volVectorField cs2theta = - cos(2*theta)*vector(1,0,0) + cos(2*theta)*vector(1,0,0) + sin(2*theta)*vector(0,1,0); UA = uInfX*(dimensionedVector(vector(1,0,0)) - pow((radius/magCentres),2)*cs2theta); - + runTime.write(); Info<< "end" << endl; diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/datToFoam.C b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/datToFoam.C index 09c2a247f31..caa975f3376 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/datToFoam.C +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/datToFoam/datToFoam.C @@ -143,11 +143,11 @@ int main(int argc, char *argv[]) pointsWedge[i+nPointsij] = cmptMultiply(vector(1.0, 1.0, -1.0), pointsWedge[i]); } - Info << "Writing points to: " << nl + Info<< "Writing points to: " << nl << " " << pointsFile << endl; pFile << pointsWedge; - Info << "End" << endl; + Info<< "End" << endl; return 0; } diff --git a/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/createFields.H b/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/createFields.H index 43242a6e377..869a5899ccb 100644 --- a/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/createFields.H +++ b/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/createFields.H @@ -1,4 +1,4 @@ - Info << "Reading field p\n" << endl; + Info<< "Reading field p\n" << endl; volScalarField p ( IOobject @@ -12,7 +12,7 @@ mesh ); - Info << "Reading field U\n" << endl; + Info<< "Reading field U\n" << endl; volVectorField U ( IOobject diff --git a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/createFields.H b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/createFields.H index 3e4e11ae301..a5d68368ea5 100644 --- a/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/createFields.H +++ b/tutorials/incompressible/simpleSRFFoam/simpleSRFFoam/createFields.H @@ -1,4 +1,4 @@ - Info << "Reading field p\n" << endl; + Info<< "Reading field p\n" << endl; volScalarField p ( IOobject diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/gen6DoF.C b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/gen6DoF.C index a90c715389a..e46d0fd053a 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/gen6DoF.C +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/gen6DoF/gen6DoF.C @@ -88,7 +88,7 @@ int main(int argc, char *argv[]) dataFile << timeValues << endl; } - Info << "End\n" << endl; + Info<< "End\n" << endl; return 0; } -- GitLab