diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H index efad823a91243bbe1d3583fa1fee3a3b22553081..d7a6b97ac12dafc817bce8ff76a03968b9f8dcd5 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 7ce03c196722beb5a4c3f4fee850d2680aec5d93..d9bd0b5bac4dbd55b40e0165273963b010bb31e5 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 decabfeae0107b3508b8aca691bd2b7e059d6a46..1866e5e1146d99d12f714b4f2f13d2c69c2be303 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<word>(string(name)); + foamPatchNames[foamPatchI] = + string::validate<word>(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<word>(string(name)); + foamPatchNames[foamPatchI] = + string::validate<word>(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 fa1fe3b04104d6126c2b00371da620114b5f0b59..c36a41a5467cd03254d558bdb38728c72b9af8e7 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 3de2331de3627c7131253ef720375c09c6ca98e8..53e32fc9e96812ab5ff57774a426a1f49964f9c7 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<class Type> -nonuniformTransformCyclicFvPatchField<Type>::nonuniformTransformCyclicFvPatchField +nonuniformTransformCyclicFvPatchField<Type>:: +nonuniformTransformCyclicFvPatchField ( const fvPatch& p, const DimensionedField<Type, volMesh>& iF @@ -44,7 +45,8 @@ nonuniformTransformCyclicFvPatchField<Type>::nonuniformTransformCyclicFvPatchFie template<class Type> -nonuniformTransformCyclicFvPatchField<Type>::nonuniformTransformCyclicFvPatchField +nonuniformTransformCyclicFvPatchField<Type>:: +nonuniformTransformCyclicFvPatchField ( const nonuniformTransformCyclicFvPatchField<Type>& ptf, const fvPatch& p, @@ -57,7 +59,8 @@ nonuniformTransformCyclicFvPatchField<Type>::nonuniformTransformCyclicFvPatchFie template<class Type> -nonuniformTransformCyclicFvPatchField<Type>::nonuniformTransformCyclicFvPatchField +nonuniformTransformCyclicFvPatchField<Type>:: +nonuniformTransformCyclicFvPatchField ( const fvPatch& p, const DimensionedField<Type, volMesh>& iF, @@ -69,7 +72,8 @@ nonuniformTransformCyclicFvPatchField<Type>::nonuniformTransformCyclicFvPatchFie template<class Type> -nonuniformTransformCyclicFvPatchField<Type>::nonuniformTransformCyclicFvPatchField +nonuniformTransformCyclicFvPatchField<Type>:: +nonuniformTransformCyclicFvPatchField ( const nonuniformTransformCyclicFvPatchField<Type>& ptf ) @@ -79,7 +83,8 @@ nonuniformTransformCyclicFvPatchField<Type>::nonuniformTransformCyclicFvPatchFie template<class Type> -nonuniformTransformCyclicFvPatchField<Type>::nonuniformTransformCyclicFvPatchField +nonuniformTransformCyclicFvPatchField<Type>:: +nonuniformTransformCyclicFvPatchField ( const nonuniformTransformCyclicFvPatchField<Type>& ptf, const DimensionedField<Type, volMesh>& 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 e609935b0921cb9022cbd9199b442d5bbcb4d386..71dc50096b9ec75b13d2c3922f5e7e375be2df59 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<class Type> @@ -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<Type>&, 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 d8f83fd610eb065f966b03f1cfe252e2d52064d8..b641981dfdcf14e67df3dc22bdc0ad638fd89642 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 52cf154f115b20c37ef5b128cf9f5ede9b3455da..feb43fa416443c3568030e83c549baeb3fe655fa 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 c5feba62a7aec2b50f92b953f8964e69beff2621..12bb361ac849cfa2f9d53e8f188aa899e1f525fd 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<class Type> -nonuniformTransformCyclicFvsPatchField<Type>::nonuniformTransformCyclicFvsPatchField +nonuniformTransformCyclicFvsPatchField<Type>:: +nonuniformTransformCyclicFvsPatchField ( const fvPatch& p, const DimensionedField<Type, surfaceMesh>& iF @@ -44,7 +45,8 @@ nonuniformTransformCyclicFvsPatchField<Type>::nonuniformTransformCyclicFvsPatchF template<class Type> -nonuniformTransformCyclicFvsPatchField<Type>::nonuniformTransformCyclicFvsPatchField +nonuniformTransformCyclicFvsPatchField<Type>:: +nonuniformTransformCyclicFvsPatchField ( const nonuniformTransformCyclicFvsPatchField<Type>& ptf, const fvPatch& p, @@ -57,7 +59,8 @@ nonuniformTransformCyclicFvsPatchField<Type>::nonuniformTransformCyclicFvsPatchF template<class Type> -nonuniformTransformCyclicFvsPatchField<Type>::nonuniformTransformCyclicFvsPatchField +nonuniformTransformCyclicFvsPatchField<Type>:: +nonuniformTransformCyclicFvsPatchField ( const fvPatch& p, const DimensionedField<Type, surfaceMesh>& iF, @@ -69,7 +72,8 @@ nonuniformTransformCyclicFvsPatchField<Type>::nonuniformTransformCyclicFvsPatchF template<class Type> -nonuniformTransformCyclicFvsPatchField<Type>::nonuniformTransformCyclicFvsPatchField +nonuniformTransformCyclicFvsPatchField<Type>:: +nonuniformTransformCyclicFvsPatchField ( const nonuniformTransformCyclicFvsPatchField<Type>& ptf ) @@ -79,7 +83,8 @@ nonuniformTransformCyclicFvsPatchField<Type>::nonuniformTransformCyclicFvsPatchF template<class Type> -nonuniformTransformCyclicFvsPatchField<Type>::nonuniformTransformCyclicFvsPatchField +nonuniformTransformCyclicFvsPatchField<Type>:: +nonuniformTransformCyclicFvsPatchField ( const nonuniformTransformCyclicFvsPatchField<Type>& ptf, const DimensionedField<Type, surfaceMesh>& 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 30ee254b09135d2be4ace16ce66f286d9a31a1c1..bb78c7cc0326399e68db71b9bbb05136b166af8c 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<class Type> @@ -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<Type>&, 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 088fffdd5c0365ff192a06643af33327d85409ef..129b9822cf2c13305609274d27f7a634aa90a9a6 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<class Type> -nonuniformTransformCyclicPointPatchField<Type>::nonuniformTransformCyclicPointPatchField +nonuniformTransformCyclicPointPatchField<Type>:: +nonuniformTransformCyclicPointPatchField ( const pointPatch& p, const DimensionedField<Type, pointMesh>& iF @@ -46,7 +47,8 @@ nonuniformTransformCyclicPointPatchField<Type>::nonuniformTransformCyclicPointPa template<class Type> -nonuniformTransformCyclicPointPatchField<Type>::nonuniformTransformCyclicPointPatchField +nonuniformTransformCyclicPointPatchField<Type>:: +nonuniformTransformCyclicPointPatchField ( const pointPatch& p, const DimensionedField<Type, pointMesh>& iF, @@ -58,7 +60,8 @@ nonuniformTransformCyclicPointPatchField<Type>::nonuniformTransformCyclicPointPa template<class Type> -nonuniformTransformCyclicPointPatchField<Type>::nonuniformTransformCyclicPointPatchField +nonuniformTransformCyclicPointPatchField<Type>:: +nonuniformTransformCyclicPointPatchField ( const nonuniformTransformCyclicPointPatchField<Type>& ptf, const pointPatch& p, @@ -71,7 +74,8 @@ nonuniformTransformCyclicPointPatchField<Type>::nonuniformTransformCyclicPointPa template<class Type> -nonuniformTransformCyclicPointPatchField<Type>::nonuniformTransformCyclicPointPatchField +nonuniformTransformCyclicPointPatchField<Type>:: +nonuniformTransformCyclicPointPatchField ( const nonuniformTransformCyclicPointPatchField<Type>& ptf, const DimensionedField<Type, pointMesh>& iF @@ -84,7 +88,10 @@ nonuniformTransformCyclicPointPatchField<Type>::nonuniformTransformCyclicPointPa // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template<class Type> -void nonuniformTransformCyclicPointPatchField<Type>::evaluate(const Pstream::commsTypes) +void nonuniformTransformCyclicPointPatchField<Type>::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 80255faa9374f8730887f6600798d6caa433bf58..ba8895a14fe9a4aa8d57f48f22f47d93353656a7 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 7e3cd14588a8e2502bb868bf31ac46922be410e6..66a1f0357aeef2678480c0aab8e8dc4bc8c63fc6 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<label>()); // } // diff --git a/applications/utilities/preProcessing/engineSwirl/createFields.H b/applications/utilities/preProcessing/engineSwirl/createFields.H index 11975d3717f15819ae506f9866f1bdf7e77b2405..a77933c8f78a660bdbe94bf0606865a21f2f5d3c 100644 --- a/applications/utilities/preProcessing/engineSwirl/createFields.H +++ b/applications/utilities/preProcessing/engineSwirl/createFields.H @@ -59,7 +59,12 @@ volVectorField U vector zT = swirlAxis; vector yT = vector(0, zT.z(), -zT.y()); -vector xT = vector(zT.y()*zT.y() + zT.z()*zT.z(), -zT.x()*zT.y(), -zT.x()*zT.z()); +vector xT = vector +( + zT.y()*zT.y() + zT.z()*zT.z(), + -zT.x()*zT.y(), + -zT.x()*zT.z() +); // if swirl is around (1, 0, 0) we have to find another transformation if (mag(yT) < SMALL) diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H index 9c3360fc7f6683e92dabfe4f0c0f4196b1fe0e77..3a69de08d382df6fde7b1262d1664dcf7bf3a71e 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaceFields/processorCyclicGAMGInterfaceField/processorCyclicGAMGInterfaceField.H @@ -43,7 +43,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class processorCyclicGAMGInterfaceField Declaration + Class processorCyclicGAMGInterfaceField Declaration \*---------------------------------------------------------------------------*/ class processorCyclicGAMGInterfaceField @@ -65,7 +65,10 @@ class processorCyclicGAMGInterfaceField // Private Member Functions //- Disallow default bitwise copy construct - processorCyclicGAMGInterfaceField(const processorCyclicGAMGInterfaceField&); + processorCyclicGAMGInterfaceField + ( + const processorCyclicGAMGInterfaceField& + ); //- Disallow default bitwise assignment void operator=(const processorCyclicGAMGInterfaceField&); diff --git a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.C b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.C index a5fcf1721a7aa404471e7baedd27046cc71db77a..f16ce4085e7758d58f2886f39c1ce704a9d512b1 100644 --- a/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.C +++ b/src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processorCyclic/processorCyclicPointPatch.C @@ -54,8 +54,9 @@ addToRunTimeSelectionTable //void Foam::processorCyclicPointPatch::initGeometry(PstreamBuffers& pBufs) //{ // // Algorithm: -// // Depending on whether the patch is a master or a slave, get the primitive -// // patch points and filter away the points from the global patch. +// // Depending on whether the patch is a master or a slave, get the +// // primitive patch points and filter away the points from the +// // global patch. // // if (isMaster()) // { @@ -152,7 +153,8 @@ addToRunTimeSelectionTable //{ // if (debug) // { -// Info<< "processorCyclicPointPatch::initPatchPatchPoints(PstreamBuffers&) : " +// Info<< "processorCyclicPointPatch::" +// << "initPatchPatchPoints(PstreamBuffers&) : " // << "constructing patch-patch points" // << endl; // } @@ -204,8 +206,8 @@ addToRunTimeSelectionTable // // if (iter != patchPointSet.end()) // { -// // If it is shared initialise the patchPatchPoints for this -// // patch +// // If it is shared initialise the patchPatchPoints for +// // this patch // if (!patchPatchPoints[patchi].size()) // { // patchPatchPoints[patchi].setSize(ppmp.size()); @@ -244,7 +246,10 @@ addToRunTimeSelectionTable //} // // -//void Foam::processorCyclicPointPatch::calcPatchPatchPoints(PstreamBuffers& pBufs) +//void Foam::processorCyclicPointPatch::calcPatchPatchPoints +//( +// PstreamBuffers& pBufs +//) //{ // // Get the patchPatchPoints from the neighbouring processor // UIPstream fromNeighbProc(neighbProcNo(), pBufs); @@ -264,7 +269,10 @@ addToRunTimeSelectionTable // // separate. // if (nbrNPoints != ppmp.size()) // { -// WarningIn("processorCyclicPointPatch::calcPatchPatchPoints(PstreamBuffers&)") +// WarningIn +// ( +// "processorCyclicPointPatch::calcPatchPatchPoints(PstreamBuffers&)" +// ) // << "Processor patch " << name() // << " has " << ppmp.size() << " points; coupled patch has " // << nbrNPoints << " points." << endl @@ -280,9 +288,11 @@ addToRunTimeSelectionTable // forAll(patchPatchPoints, patchi) // { // const labelList& patchPoints = patchPatchPoints[patchi]; -// const List<vector>& patchPointNormals = patchPatchPointNormals[patchi]; +// const List<vector>& patchPointNormals = +// patchPatchPointNormals[patchi]; // -// // If there are potentially shared points for the patch being considered +// // If there are potentially shared points for the patch being +// // considered // if (patchPoints.size()) // { // // Get the current meshPoints list for the patch @@ -351,7 +361,11 @@ addToRunTimeSelectionTable //} -//void processorCyclicPointPatch::initMovePoints(PstreamBuffers&, const pointField&) +//void processorCyclicPointPatch::initMovePoints +//( +// PstreamBuffers&, +// const pointField& +//) //{} // // diff --git a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceIO.C b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceIO.C index ab5524a7ded27ae5ce1bf63eec61d8be67127ffc..04eeaba93ef5e9671672d303a072dd760ea6e350 100644 --- a/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceIO.C +++ b/src/finiteVolume/cfdTools/general/fieldSources/basicSource/explicitSource/explicitSourceIO.C @@ -56,7 +56,10 @@ bool Foam::explicitSource::read(const dictionary& dict) if (basicSource::read(dict)) { const dictionary& sourceDict = dict.subDict(name()); - const dictionary& subDictCoeffs = sourceDict.subDict(typeName + "Coeffs"); + const dictionary& subDictCoeffs = sourceDict.subDict + ( + typeName + "Coeffs" + ); setFieldData(subDictCoeffs.subDict("fieldData")); return true; } diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C index 29af5002efd57f458173f850dd5e39cbfe1fcd3e..22394cc17f67c69b1f5a6727dcd2b4b33a51aa69 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C @@ -179,9 +179,10 @@ processorCyclicFvPatchField<Type>::~processorCyclicFvPatchField() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // //template<class Type> -//tmp<Field<Type> > processorCyclicFvPatchField<Type>::patchNeighbourField() const +//tmp<Field<Type> > +//processorCyclicFvPatchField<Type>::patchNeighbourField() const //{ -// return *this; +// return *this; //} // // diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H index cc18c87005ccd04f28173a96ea3655e77af986f8..6c7a6325727f49ab2510ca5cdb749d0bd2d999a4 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.H @@ -46,7 +46,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class processorCyclicFvPatch Declaration + Class processorCyclicFvPatch Declaration \*---------------------------------------------------------------------------*/ template<class Type> @@ -63,8 +63,12 @@ class processorCyclicFvPatchField // Private Member Functions -// //- Get other patchfield -// const coupledFvPatchField<Type>& patchField(const label patchID) const; + // //- Get other patchfield + // const coupledFvPatchField<Type>& patchField + // ( + // const label patchID + // ) const; + public: //- Runtime type information @@ -261,7 +265,10 @@ public: // const label start // ) const // { -// notImplemented("processorCyclicFvPatchField::initEvaluate(..)"); +// notImplemented +// ( +// "processorCyclicFvPatchField::initEvaluate(..)" +// ); // } // // //- Evaluate the patch field. @@ -292,7 +299,8 @@ public: // { // notImplemented // ( -// "processorCyclicFvPatchField::initInterfaceMatrixUpdate(..)" +// "processorCyclicFvPatchField::" +// "initInterfaceMatrixUpdate(..)" // ); // } // diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C index e5112d5c66c824e08ddb0521a1d27a385db6f3a7..85f0eb12ec7021ace0603d4102068067720a44b7 100644 --- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C +++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C @@ -92,7 +92,8 @@ Foam::scalar Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::energyRatio // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template <class CloudType> -Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::LarsenBorgnakkeVariableHardSphere +Foam::LarsenBorgnakkeVariableHardSphere<CloudType>:: +LarsenBorgnakkeVariableHardSphere ( const dictionary& dict, CloudType& cloud diff --git a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.C b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.C index c82f431a65fd178d195352e624b864673f0ec936..ca298f33732e7476098a675d6abe3affd1034b17 100644 --- a/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.C +++ b/src/thermophysicalModels/basicSolidThermo/interpolatedSolidThermo/interpolatedSolidThermo.C @@ -258,7 +258,8 @@ Foam::tmp<Foam::volScalarField> Foam::interpolatedSolidThermo::Hf() const } -Foam::tmp<Foam::volScalarField> Foam::interpolatedSolidThermo::emissivity() const +Foam::tmp<Foam::volScalarField> +Foam::interpolatedSolidThermo::emissivity() const { tmp<volScalarField> temissivity ( diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.C b/src/turbulenceModels/compressible/RAS/LRR/LRR.C index 1fdeeebeb4a134a99a1ce13f2d6bc94c7a0d579f..b90b1f5f146af990cb9e9e24f2d2bee0ac9cdb8e 100644 --- a/src/turbulenceModels/compressible/RAS/LRR/LRR.C +++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.C @@ -379,8 +379,11 @@ void LRR::correct() forAll(curPatch, facei) { label faceCelli = curPatch.faceCells()[facei]; - P[faceCelli] - *= min(G[faceCelli]/(0.5*mag(tr(P[faceCelli])) + SMALL), 100.0); + P[faceCelli] *= min + ( + G[faceCelli]/(0.5*mag(tr(P[faceCelli])) + SMALL), + 100.0 + ); } } } diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C index 3e35614ff2f4a52c3174c77d3bb780291715fb2a..130c7a6dcbfc4586c68f6f6985435eb3421d5fc7 100644 --- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C +++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C @@ -417,8 +417,11 @@ void LaunderGibsonRSTM::correct() forAll(curPatch, facei) { label faceCelli = curPatch.faceCells()[facei]; - P[faceCelli] *= - min(G[faceCelli]/(0.5*mag(tr(P[faceCelli])) + SMALL), 100.0); + P[faceCelli] *= min + ( + G[faceCelli]/(0.5*mag(tr(P[faceCelli])) + SMALL), + 100.0 + ); } } } diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C index 586032b0ed8574e07f02769cd523f3a8da7456ff..3950df0e8cd6ee156720aa6c3d932b3accb534ad 100644 --- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C +++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C @@ -340,8 +340,11 @@ void LRR::correct() forAll(curPatch, facei) { label faceCelli = curPatch.faceCells()[facei]; - P[faceCelli] - *= min(G[faceCelli]/(0.5*mag(tr(P[faceCelli])) + SMALL), 1.0); + P[faceCelli] *= min + ( + G[faceCelli]/(0.5*mag(tr(P[faceCelli])) + SMALL), + 1.0 + ); } } }