cosmetics

2025-11-28 03:28:01 +00:00 · 2009-10-26 18:54:34 +00:00
parent cbe5974c26
commit 7e34048c59
16 changed files with 42 additions and 54 deletions
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
@ -143,6 +143,7 @@ void Foam::basicThermo::eBoundaryCorrection(volScalarField& e)
    }
 }

+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

 Foam::basicThermo::basicThermo(const fvMesh& mesh)
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.H
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.H
@ -44,7 +44,7 @@ namespace Foam
 {

 /*---------------------------------------------------------------------------*\
-                Class fixedEnthalpyFvPatchScalarField Declaration
+              Class fixedEnthalpyFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/

 class fixedEnthalpyFvPatchScalarField
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.H
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.H
@ -44,7 +44,7 @@ namespace Foam
 {

 /*---------------------------------------------------------------------------*\
-                Class fixedInternalEnergyFvPatchScalarField Declaration
+           Class fixedInternalEnergyFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/

 class fixedInternalEnergyFvPatchScalarField
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.H
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.H
@ -44,7 +44,7 @@ namespace Foam
 {

 /*---------------------------------------------------------------------------*\
-               Class gradientEnthalpyFvPatchScalarField Declaration
+             Class gradientEnthalpyFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/

 class gradientEnthalpyFvPatchScalarField
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.C
@ -37,7 +37,8 @@ namespace Foam

 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //

-gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField
+gradientInternalEnergyFvPatchScalarField::
+gradientInternalEnergyFvPatchScalarField
 (
    const fvPatch& p,
    const DimensionedField<scalar, volMesh>& iF
@ -47,7 +48,8 @@ gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarFie
 {}


-gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField
+gradientInternalEnergyFvPatchScalarField::
+gradientInternalEnergyFvPatchScalarField
 (
    const gradientInternalEnergyFvPatchScalarField& ptf,
    const fvPatch& p,
@ -59,7 +61,8 @@ gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarFie
 {}


-gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField
+gradientInternalEnergyFvPatchScalarField::
+gradientInternalEnergyFvPatchScalarField
 (
    const fvPatch& p,
    const DimensionedField<scalar, volMesh>& iF,
@ -70,7 +73,8 @@ gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarFie
 {}


-gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField
+gradientInternalEnergyFvPatchScalarField::
+gradientInternalEnergyFvPatchScalarField
 (
    const gradientInternalEnergyFvPatchScalarField& tppsf
 )
@ -79,7 +83,8 @@ gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarFie
 {}


-gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField
+gradientInternalEnergyFvPatchScalarField::
+gradientInternalEnergyFvPatchScalarField
 (
    const gradientInternalEnergyFvPatchScalarField& tppsf,
    const DimensionedField<scalar, volMesh>& iF
@ -102,10 +107,10 @@ void gradientInternalEnergyFvPatchScalarField::updateCoeffs()
    (
        "thermophysicalProperties"
    );
-    
+
    const label patchi = patch().index();

-    fvPatchScalarField& Tw = 
+    fvPatchScalarField& Tw =
        const_cast<fvPatchScalarField&>(thermo.T().boundaryField()[patchi]);

    Tw.evaluate();
@ -123,7 +128,11 @@ void gradientInternalEnergyFvPatchScalarField::updateCoeffs()

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

-makePatchTypeField(fvPatchScalarField, gradientInternalEnergyFvPatchScalarField);
+makePatchTypeField
+(
+    fvPatchScalarField,
+    gradientInternalEnergyFvPatchScalarField
+);

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.H
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.H
@ -44,7 +44,7 @@ namespace Foam
 {

 /*---------------------------------------------------------------------------*\
-               Class gradientInternalEnergyFvPatchScalarField Declaration
+          Class gradientInternalEnergyFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/

 class gradientInternalEnergyFvPatchScalarField
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.C
@ -106,7 +106,7 @@ void mixedInternalEnergyFvPatchScalarField::updateCoeffs()
    (
        "thermophysicalProperties"
    );
-    
+
    const label patchi = patch().index();

    mixedFvPatchScalarField& Tw = refCast<mixedFvPatchScalarField>
@ -118,7 +118,8 @@ void mixedInternalEnergyFvPatchScalarField::updateCoeffs()

    valueFraction() = Tw.valueFraction();
    refValue() = thermo.e(Tw.refValue(), patchi);
-    refGrad() = thermo.Cv(Tw, patchi)*Tw.refGrad()
+    refGrad() =
+        thermo.Cv(Tw, patchi)*Tw.refGrad()
      + patch().deltaCoeffs()*
        (
            thermo.e(Tw, patchi)
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.H
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.H
@ -44,7 +44,7 @@ namespace Foam
 {

 /*---------------------------------------------------------------------------*\
-               Class mixedInternalEnergyFvPatchScalarField Declaration
+            Class mixedInternalEnergyFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/

 class mixedInternalEnergyFvPatchScalarField
--- a/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.H
+++ b/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.H
@ -44,7 +44,7 @@ namespace Foam
 {

 /*---------------------------------------------------------------------------*\
-                           Class pureMixture Declaration
+                         Class pureMixture Declaration
 \*---------------------------------------------------------------------------*/

 template<class ThermoType>
@ -76,9 +76,8 @@ public:
        pureMixture(const dictionary&, const fvMesh&);


-    // Destructor
-
-        ~pureMixture();
+    //- Destructor
+    virtual ~pureMixture();


    // Member functions
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.H
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.H
@ -168,7 +168,7 @@ public:


        // Chemistry model functions (overriding abstract functions in
-        // chemistryModel.H)
+        // basicChemistryModel.H)

            //- Return const access to the chemical source terms
            inline tmp<volScalarField> RR(const label i) const;
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C
@ -116,8 +116,7 @@ Foam::scalar Foam::EulerImplicit<CompType, ThermoType>::solve
            RR[si][lRef] -= sr*pf*corr;
            RR[si][rRef] += sr*pr*corr;
        }
-
-    } // end for(label i...
+    }


    for (label i=0; i<nSpecie; i++)
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.C
@ -111,8 +111,7 @@ Foam::scalar Foam::sequential<CompType, ThermoType>::solve
            c[si] += dt*sr*omeg;
            c[si] = max(0.0, c[si]);
        }
-
-    } // end for (label i...
+    }

    return cTauChem_/tChemInv;
 }
--- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H
+++ b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H
@ -116,19 +116,13 @@ public:
    // Constructors

        //- Construct from dictionary
-        liquidMixture
-        (
-            const dictionary&
-        );
+        liquidMixture(const dictionary&);


    // Selectors

        //- Select construct from dictionary
-        static autoPtr<liquidMixture> New
-        (
-            const dictionary&
-        );
+        static autoPtr<liquidMixture> New(const dictionary&);


    // Member Functions
--- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C
+++ b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C
@ -25,9 +25,7 @@ License
 \*---------------------------------------------------------------------------*/

 #include "liquidMixture.H"
-#include "IOstreams.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+//#include "IOstreams.H"

 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 /*
--- a/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.H
+++ b/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.H
@ -64,19 +64,13 @@ public:
    // Constructors

        //- Construct from dictionary
-        solidMixture
-        (
-            const dictionary&
-        );
+        solidMixture(const dictionary&);


    // Selectors

        //- Select construct from dictionary
-        static autoPtr<solidMixture> New
-        (
-            const dictionary&
-        );
+        static autoPtr<solidMixture> New(const dictionary&);


    // Member Functions
@ -101,17 +95,11 @@ public:

        //- Calculate the mixture density [kg/m^3] as a function of
        //  volume fractions
-        scalar rho
-        (
-            const scalarField& X
-        ) const;
+        scalar rho(const scalarField& X) const;

        //- Calculate the mixture heat capacity [J/(kg K)] as a function
        //  of mass fractions
-        scalar cp
-        (
-            const scalarField& Y
-        ) const;
+        scalar cp(const scalarField& Y) const;
 };


--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
@ -55,9 +55,9 @@ Foam::thermalPorousZone::thermalPorousZone
            (
                "thermalPorousZone::thermalPorousZone"
                "("
-                "const word& name, "
-                "const fvMesh& mesh, "
-                "const dictionary& dict"
+                    "const word& name, "
+                    "const fvMesh& mesh, "
+                    "const dictionary& dict"
                ")",
                *dictPtr
            )   << "thermalModel " << thermalModel << " is not supported" << nl