STYLE: minor code formatting

applications/solvers/stressAnalysis/solidDisplacementFoam/readMechanicalProperties.H

@@ -161,7 +161,7 @@
             )
         );
     }
-    else if(nuType == "field")
+    else if (nuType == "field")
     {
         nuIO.readOpt() = IOobject::MUST_READ;
         nuPtr.reset

applications/solvers/stressAnalysis/solidDisplacementFoam/readThermalProperties.H

@@ -81,7 +81,7 @@ if (thermalStress)
         );
 
     }
-    else if(CType == "field")
+    else if (CType == "field")
     {
         CIO.readOpt() = IOobject::MUST_READ;
 
@@ -228,5 +228,4 @@ if (thermalStress)
 
     threeKalpha = threeK*alpha;
     DT = k/C;
-
 }

src/combustionModels/FSD/FSD.C

@@ -272,7 +272,7 @@ void FSD<CombThermoType, ThermoType>::calculateSourceNorm()
 
     forAll(ft_, cellI)
     {
-        if(ft_[cellI] < ftStoich)
+        if (ft_[cellI] < ftStoich)
         {
             pc[cellI] = ft_[cellI]*(YprodTotal/ftStoich);
         }

src/fieldSources/basicSource/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C

@@ -68,17 +68,11 @@ void Foam::interRegionHeatTransferModel::check()
         }
     }
 
-    if(!secSourceFound)
+    if (!secSourceFound)
     {
         FatalErrorIn
         (
-            "constantHeatTransfer::interRegionHeatTransferModel"
+            "constantHeatTransfer::interRegionHeatTransferModel::check()"
-            "("
-            "   const word& name,"
-            "   const word& modelType,"
-            "   const dictionary& dict,"
-            "   const fvMesh& mesh"
-            ")"
         )   << "Secondary source name not found" << secondarySourceName_
             << " in region " << secondaryMesh.name()
             << nl
@@ -125,9 +119,12 @@ Foam::interRegionHeatTransferModel::interRegionHeatTransferModel
 }
 
 
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
 Foam::interRegionHeatTransferModel::~interRegionHeatTransferModel()
 {}
 
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 
@@ -222,7 +219,7 @@ void Foam::interRegionHeatTransferModel::addSup
                     << endl;
             }
         }
-        else if(h.dimensions() == dimTemperature)
+        else if (h.dimensions() == dimTemperature)
         {
             eEqn += htc_*Tmapped - fvm::Sp(htc_, h);
 
@@ -269,4 +266,6 @@ bool Foam::interRegionHeatTransferModel::read(const dictionary& dict)
         return false;
     }
 }
+
+
 // ************************************************************************* //

src/lagrangian/dsmc/submodels/BinaryCollisionModel/NoBinaryCollision/NoBinaryCollision.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,15 +68,13 @@ Foam::scalar Foam::NoBinaryCollision<CloudType>::sigmaTcR
     (
         "Foam::scalar Foam::NoBinaryCollision<CloudType>::sigmaTcR"
         "("
-            "label typeIdP,"
+            "const typename CloudType::parcelType&, "
-            "label typeIdQ,"
+            "const typename CloudType::parcelType"
-            "const vector& UP,"
-            "const vector& UQ"
         ") const"
     )
         << "sigmaTcR called on NoBinaryCollision model, this should "
         << "not happen, this is not an actual model." << nl
-        << "Enclose calls to sigmaTcR within a if(binaryCollision().active()) "
+        << "Enclose calls to sigmaTcR within a if (binaryCollision().active()) "
         << " check."
         << abort(FatalError);
 

src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C

@@ -404,7 +404,7 @@ void Foam::SprayParcel<ParcelType>::solveTABEq
     // oscillation frequency (squared)
     scalar omega2 = TABComega*sigma/(rho*r3) - rtd*rtd;
 
-    if(omega2 > 0)
+    if (omega2 > 0)
     {
         scalar omega = sqrt(omega2);
         scalar rhoc = this->rhoc();

src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISASMDCalcMethod1.H

@@ -4,7 +4,7 @@
     scalar minValue = min(d, dD/10.0);
     scalar maxValue = dD;
 
-    if(maxValue - minValue < SMALL)
+    if (maxValue - minValue < SMALL)
     {
         minValue = d/10.0;
     }

src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -176,11 +176,11 @@ bool Foam::SHF<CloudType>::update
 
     if (weGas > weConst_)
     {
-        if(weGas < weCrit1_)
+        if (weGas < weCrit1_)
         {
             tCharSecond = c1_*pow((weGas - weConst_), cExp1_);
         }
-        else if(weGas >= weCrit1_ && weGas <= weCrit2_)
+        else if (weGas >= weCrit1_ && weGas <= weCrit2_)
         {
             tCharSecond = c2_*pow((weGas - weConst_), cExp2_);
         }

src/parallel/reconstruct/reconstruct/reconstructLagrangianFields.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -163,7 +163,7 @@ void Foam::reconstructLagrangianFields
 
     IOobjectList fields = objects.lookupClass(fieldClassName);
 
-    if(fields.size())
+    if (fields.size())
     {
         Info<< "    Reconstructing lagrangian "
             << fieldClassName << "s\n" << endl;

src/postProcessing/functionObjects/forces/pointPatchFields/derived/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -129,8 +129,7 @@ void Foam::sixDoFRigidBodyMotion::applyConstraints(scalar deltaT)
         {
             FatalErrorIn
             (
-                "Foam::sixDoFRigidBodyMotion::applyConstraints"
+                "Foam::sixDoFRigidBodyMotion::applyConstraints(scalar)"
-                "(scalar deltaT)"
             )
                 << nl << "Maximum number of sixDoFRigidBodyMotion constraint "
                 << "iterations ("
@@ -391,8 +390,8 @@ void Foam::sixDoFRigidBodyMotion::updatePosition
             (
                 "void Foam::sixDoFRigidBodyMotion::updatePosition"
                 "("
-                    "scalar deltaT, "
+                    "scalar, "
-                    "scalar deltaT0"
+                    "scalar"
                 ")"
             )
                 << "Limited acceleration " << a()
@@ -449,9 +448,9 @@ void Foam::sixDoFRigidBodyMotion::updateForce
             (
                 "void Foam::sixDoFRigidBodyMotion::updateForce"
                 "("
-                    "const vector& fGlobal, "
+                    "const vector&, "
-                    "const vector& tauGlobal, "
+                    "const vector&, "
-                    "scalar deltaT"
+                    "scalar"
                 ")"
             )
                 << "Limited acceleration " << a()
@@ -463,7 +462,7 @@ void Foam::sixDoFRigidBodyMotion::updateForce
 
         pi() += 0.5*(1 - cDamp_)*deltaT*tau();
 
-        if(report_)
+        if (report_)
         {
             status();
         }

src/thermophysicalModels/basic/heThermo/heThermo.C

@@ -55,7 +55,7 @@ Foam::wordList Foam::heThermo<BasicThermo, MixtureType>::heBoundaryTypes()
         {
             hbt[patchi] = gradientEnergyFvPatchScalarField::typeName;
         }
-        else if(isA<mixedFvPatchScalarField>(tbf[patchi]))
+        else if (isA<mixedFvPatchScalarField>(tbf[patchi]))
         {
             hbt[patchi] = mixedEnergyFvPatchScalarField::typeName;
         }

src/thermophysicalModels/radiationModels/derivedFvPatchFields/radiationCoupledBase/radiationCoupledBase.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,7 +102,7 @@ Foam::radiationCoupledBase::radiationCoupledBase
 
         case LOOKUP:
         {
-            if(!dict.found("emissivity"))
+            if (!dict.found("emissivity"))
             {
                 FatalIOErrorIn
                 (

src/thermophysicalModels/solid/reaction/Reactions/solidReaction/solidReaction.C

@@ -161,7 +161,7 @@ void Foam::solidReaction::setLRhs(Istream& is)
             {
                 if (t == token::ADD)
                 {
-                    if(isGas)
+                    if (isGas)
                     {
                         grhs_ = dlsrhs.shrink();
                         dlsrhs.clear();
@@ -177,7 +177,7 @@ void Foam::solidReaction::setLRhs(Istream& is)
                 }
                 else if (t == token::ASSIGN)
                 {
-                    if(isGas)
+                    if (isGas)
                     {
                         Info << "Pyrolysis Gases should appear on lhs of the"
                                 "reaction" << endl;
@@ -188,7 +188,7 @@ void Foam::solidReaction::setLRhs(Istream& is)
                         dlsrhs.clear();
                     }
                 }
-                else if(isGas)
+                else if (isGas)
                 {
                     grhs_ = dlsrhs.shrink();
                     is.putBack(t);
@@ -201,7 +201,7 @@ void Foam::solidReaction::setLRhs(Istream& is)
                     return;
                 }
             }
-            else if(isGas)
+            else if (isGas)
             {
                 grhs_ = dlsrhs.shrink();
                 is.putBack(t);