From f26b8c1cc70eaf3c83c2364cf1a2985096f49048 Mon Sep 17 00:00:00 2001 From: graham Date: Wed, 28 Jul 2010 16:42:53 +0100 Subject: [PATCH] STYLE: 80 char lines. --- .../rhoPorousSimpleFoam/createFields.H | 7 ++-- .../porousSimpleFoam/createFields.H | 7 ++-- .../Optional/ccm26ToFoam/ccm26ToFoam.C | 14 ++++++-- .../mesh/conversion/gmshToFoam/gmshToFoam.C | 5 +-- .../nonuniformTransformCyclicFvPatchField.C | 15 +++++--- .../nonuniformTransformCyclicFvPatchField.H | 5 +-- .../nonuniformTransformCyclicFvPatch.C | 7 +++- .../nonuniformTransformCyclicFvPatch.H | 8 +++-- .../nonuniformTransformCyclicFvsPatchField.C | 15 +++++--- .../nonuniformTransformCyclicFvsPatchField.H | 5 +-- ...nonuniformTransformCyclicPointPatchField.C | 17 +++++++--- .../nonuniformTransformCyclicPolyPatch.C | 14 ++++++-- .../splitMeshRegions/splitMeshRegions.C | 10 ++++-- .../preProcessing/engineSwirl/createFields.H | 7 +++- .../processorCyclicGAMGInterfaceField.H | 7 ++-- .../processorCyclicPointPatch.C | 34 +++++++++++++------ .../explicitSource/explicitSourceIO.C | 5 ++- .../processorCyclicFvPatchField.C | 5 +-- .../processorCyclicFvPatchField.H | 18 +++++++--- .../LarsenBorgnakkeVariableHardSphere.C | 3 +- .../interpolatedSolidThermo.C | 3 +- .../compressible/RAS/LRR/LRR.C | 7 ++-- .../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C | 7 ++-- .../incompressible/RAS/LRR/LRR.C | 7 ++-- 24 files changed, 167 insertions(+), 65 deletions(-) diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H index efad823a91..d7a6b97ac1 100644 --- a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H +++ b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H @@ -76,7 +76,10 @@ const bool pressureImplicitPorosity = ( pZones.size() - && mesh.solutionDict().subDict("SIMPLE").readIfPresent("nUCorrectors", nUCorr) + && mesh.solutionDict().subDict("SIMPLE").readIfPresent + ( + "nUCorrectors", + nUCorr + ) && (nUCorr > 0) ); - diff --git a/applications/solvers/incompressible/porousSimpleFoam/createFields.H b/applications/solvers/incompressible/porousSimpleFoam/createFields.H index 7ce03c1967..d9bd0b5bac 100644 --- a/applications/solvers/incompressible/porousSimpleFoam/createFields.H +++ b/applications/solvers/incompressible/porousSimpleFoam/createFields.H @@ -49,7 +49,10 @@ const bool pressureImplicitPorosity = ( pZones.size() - && mesh.solutionDict().subDict("SIMPLE").readIfPresent("nUCorrectors", nUCorr) + && mesh.solutionDict().subDict("SIMPLE").readIfPresent + ( + "nUCorrectors", + nUCorr + ) && (nUCorr > 0) ); - diff --git a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C index decabfeae0..1866e5e114 100644 --- a/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C +++ b/applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C @@ -347,7 +347,8 @@ void ReadProblem char* name = new char[size + 1]; CCMIOReadOptstr(NULL, boundary, "BoundaryName", &size, name); name[size] = '\0'; - foamPatchNames[foamPatchI] = string::validate(string(name)); + foamPatchNames[foamPatchI] = + string::validate(string(name)); delete [] name; } else if @@ -359,7 +360,8 @@ void ReadProblem char* name = new char[size + 1]; CCMIOReadOptstr(NULL, boundary, "Label", &size, name); name[size] = '\0'; - foamPatchNames[foamPatchI] = string::validate(string(name)); + foamPatchNames[foamPatchI] = + string::validate(string(name)); delete [] name; } else @@ -641,7 +643,13 @@ int main(int argc, char *argv[]) // in NULL (which always means kCCMIONoErr) and then assign the return // value to 'err'.). CCMIOID root; - CCMIOError err = CCMIOOpenFile(NULL, ccmFile.c_str(), kCCMIORead, &root); + CCMIOError err = CCMIOOpenFile + ( + NULL, + ccmFile.c_str(), + kCCMIORead, + &root + ); // We are going to assume that we have a state with a known name. // We could instead use CCMIONextEntity() to walk through all the diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C index fa1fe3b041..c36a41a546 100644 --- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C +++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C @@ -236,7 +236,9 @@ void storeCellInZone // Reads mesh format scalar readMeshFormat(IFstream& inFile) { - Info<< "Starting to read mesh format at line " << inFile.lineNumber() << endl; + Info<< "Starting to read mesh format at line " + << inFile.lineNumber() + << endl; string line; inFile.getLine(line); @@ -1086,4 +1088,3 @@ int main(int argc, char *argv[]) // ************************************************************************* // - diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.C index 3de2331de3..53e32fc9e9 100644 --- a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.C +++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.C @@ -33,7 +33,8 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -nonuniformTransformCyclicFvPatchField::nonuniformTransformCyclicFvPatchField +nonuniformTransformCyclicFvPatchField:: +nonuniformTransformCyclicFvPatchField ( const fvPatch& p, const DimensionedField& iF @@ -44,7 +45,8 @@ nonuniformTransformCyclicFvPatchField::nonuniformTransformCyclicFvPatchFie template -nonuniformTransformCyclicFvPatchField::nonuniformTransformCyclicFvPatchField +nonuniformTransformCyclicFvPatchField:: +nonuniformTransformCyclicFvPatchField ( const nonuniformTransformCyclicFvPatchField& ptf, const fvPatch& p, @@ -57,7 +59,8 @@ nonuniformTransformCyclicFvPatchField::nonuniformTransformCyclicFvPatchFie template -nonuniformTransformCyclicFvPatchField::nonuniformTransformCyclicFvPatchField +nonuniformTransformCyclicFvPatchField:: +nonuniformTransformCyclicFvPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -69,7 +72,8 @@ nonuniformTransformCyclicFvPatchField::nonuniformTransformCyclicFvPatchFie template -nonuniformTransformCyclicFvPatchField::nonuniformTransformCyclicFvPatchField +nonuniformTransformCyclicFvPatchField:: +nonuniformTransformCyclicFvPatchField ( const nonuniformTransformCyclicFvPatchField& ptf ) @@ -79,7 +83,8 @@ nonuniformTransformCyclicFvPatchField::nonuniformTransformCyclicFvPatchFie template -nonuniformTransformCyclicFvPatchField::nonuniformTransformCyclicFvPatchField +nonuniformTransformCyclicFvPatchField:: +nonuniformTransformCyclicFvPatchField ( const nonuniformTransformCyclicFvPatchField& ptf, const DimensionedField& iF diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.H b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.H index e609935b09..71dc50096b 100644 --- a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.H +++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatchField.H @@ -44,7 +44,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class nonuniformTransformCyclicFvPatch Declaration + Class nonuniformTransformCyclicFvPatch Declaration \*---------------------------------------------------------------------------*/ template @@ -77,7 +77,8 @@ public: const dictionary& ); - //- Construct by mapping given nonuniformTransformCyclicFvPatchField onto a new patch + //- Construct by mapping given + // nonuniformTransformCyclicFvPatchField onto a new patch nonuniformTransformCyclicFvPatchField ( const nonuniformTransformCyclicFvPatchField&, diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.C index d8f83fd610..b641981dfd 100644 --- a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.C +++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.C @@ -34,7 +34,12 @@ namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // defineTypeNameAndDebug(nonuniformTransformCyclicFvPatch, 0); -addToRunTimeSelectionTable(fvPatch, nonuniformTransformCyclicFvPatch, polyPatch); +addToRunTimeSelectionTable +( + fvPatch, + nonuniformTransformCyclicFvPatch, + polyPatch +); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.H b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.H index 52cf154f11..feb43fa416 100644 --- a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.H +++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvPatch.H @@ -44,7 +44,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class nonuniformTransformCyclicFvPatch Declaration + Class nonuniformTransformCyclicFvPatch Declaration \*---------------------------------------------------------------------------*/ class nonuniformTransformCyclicFvPatch @@ -61,7 +61,11 @@ public: // Constructors //- Construct from polyPatch - nonuniformTransformCyclicFvPatch(const polyPatch& patch, const fvBoundaryMesh& bm) + nonuniformTransformCyclicFvPatch + ( + const polyPatch& patch, + const fvBoundaryMesh& bm + ) : cyclicFvPatch(patch, bm) {} diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.C index c5feba62a7..12bb361ac8 100644 --- a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.C +++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.C @@ -33,7 +33,8 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -nonuniformTransformCyclicFvsPatchField::nonuniformTransformCyclicFvsPatchField +nonuniformTransformCyclicFvsPatchField:: +nonuniformTransformCyclicFvsPatchField ( const fvPatch& p, const DimensionedField& iF @@ -44,7 +45,8 @@ nonuniformTransformCyclicFvsPatchField::nonuniformTransformCyclicFvsPatchF template -nonuniformTransformCyclicFvsPatchField::nonuniformTransformCyclicFvsPatchField +nonuniformTransformCyclicFvsPatchField:: +nonuniformTransformCyclicFvsPatchField ( const nonuniformTransformCyclicFvsPatchField& ptf, const fvPatch& p, @@ -57,7 +59,8 @@ nonuniformTransformCyclicFvsPatchField::nonuniformTransformCyclicFvsPatchF template -nonuniformTransformCyclicFvsPatchField::nonuniformTransformCyclicFvsPatchField +nonuniformTransformCyclicFvsPatchField:: +nonuniformTransformCyclicFvsPatchField ( const fvPatch& p, const DimensionedField& iF, @@ -69,7 +72,8 @@ nonuniformTransformCyclicFvsPatchField::nonuniformTransformCyclicFvsPatchF template -nonuniformTransformCyclicFvsPatchField::nonuniformTransformCyclicFvsPatchField +nonuniformTransformCyclicFvsPatchField:: +nonuniformTransformCyclicFvsPatchField ( const nonuniformTransformCyclicFvsPatchField& ptf ) @@ -79,7 +83,8 @@ nonuniformTransformCyclicFvsPatchField::nonuniformTransformCyclicFvsPatchF template -nonuniformTransformCyclicFvsPatchField::nonuniformTransformCyclicFvsPatchField +nonuniformTransformCyclicFvsPatchField:: +nonuniformTransformCyclicFvsPatchField ( const nonuniformTransformCyclicFvsPatchField& ptf, const DimensionedField& iF diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H index 30ee254b09..bb78c7cc03 100644 --- a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H +++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/fvsPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicFvsPatchField.H @@ -44,7 +44,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class nonuniformTransformCyclicFvsPatch Declaration + Class nonuniformTransformCyclicFvsPatch Declaration \*---------------------------------------------------------------------------*/ template @@ -76,7 +76,8 @@ public: const dictionary& ); - //- Construct by mapping given nonuniformTransformCyclicFvsPatchField onto a new patch + //- Construct by mapping given + // nonuniformTransformCyclicFvsPatchField onto a new patch nonuniformTransformCyclicFvsPatchField ( const nonuniformTransformCyclicFvsPatchField&, diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C index 088fffdd5c..129b9822cf 100644 --- a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C +++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C @@ -35,7 +35,8 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -nonuniformTransformCyclicPointPatchField::nonuniformTransformCyclicPointPatchField +nonuniformTransformCyclicPointPatchField:: +nonuniformTransformCyclicPointPatchField ( const pointPatch& p, const DimensionedField& iF @@ -46,7 +47,8 @@ nonuniformTransformCyclicPointPatchField::nonuniformTransformCyclicPointPa template -nonuniformTransformCyclicPointPatchField::nonuniformTransformCyclicPointPatchField +nonuniformTransformCyclicPointPatchField:: +nonuniformTransformCyclicPointPatchField ( const pointPatch& p, const DimensionedField& iF, @@ -58,7 +60,8 @@ nonuniformTransformCyclicPointPatchField::nonuniformTransformCyclicPointPa template -nonuniformTransformCyclicPointPatchField::nonuniformTransformCyclicPointPatchField +nonuniformTransformCyclicPointPatchField:: +nonuniformTransformCyclicPointPatchField ( const nonuniformTransformCyclicPointPatchField& ptf, const pointPatch& p, @@ -71,7 +74,8 @@ nonuniformTransformCyclicPointPatchField::nonuniformTransformCyclicPointPa template -nonuniformTransformCyclicPointPatchField::nonuniformTransformCyclicPointPatchField +nonuniformTransformCyclicPointPatchField:: +nonuniformTransformCyclicPointPatchField ( const nonuniformTransformCyclicPointPatchField& ptf, const DimensionedField& iF @@ -84,7 +88,10 @@ nonuniformTransformCyclicPointPatchField::nonuniformTransformCyclicPointPa // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void nonuniformTransformCyclicPointPatchField::evaluate(const Pstream::commsTypes) +void nonuniformTransformCyclicPointPatchField::evaluate +( + const Pstream::commsTypes +) { const vectorField& nHat = this->patch().pointNormals(); diff --git a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.C b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.C index 80255faa93..ba8895a14f 100644 --- a/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.C +++ b/applications/utilities/mesh/generation/extrudeToRegionMesh/nonuniformTransformCyclic/polyPatches/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPolyPatch.C @@ -32,8 +32,18 @@ namespace Foam { defineTypeNameAndDebug(nonuniformTransformCyclicPolyPatch, 0); - addToRunTimeSelectionTable(polyPatch, nonuniformTransformCyclicPolyPatch, word); - addToRunTimeSelectionTable(polyPatch, nonuniformTransformCyclicPolyPatch, dictionary); + addToRunTimeSelectionTable + ( + polyPatch, + nonuniformTransformCyclicPolyPatch, + word + ); + addToRunTimeSelectionTable + ( + polyPatch, + nonuniformTransformCyclicPolyPatch, + dictionary + ); } diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C index 7e3cd14588..66a1f0357a 100644 --- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C +++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C @@ -1245,15 +1245,19 @@ label findCorrespondingRegion // { // forAll(cellRegion, cellI) // { -// if (cellRegion[cellI] == regionI && existingZoneID[cellI] != zoneI) +// if +// ( +// cellRegion[cellI] == regionI +// && existingZoneID[cellI] != zoneI +// ) // { // // cellI in regionI but not in zoneI // regionI = -1; // break; // } // } -// // If one in error, all should be in error. Note that branch gets taken -// // on all procs. +// // If one in error, all should be in error. Note that branch +// // gets taken on all procs. // reduce(regionI, minOp