diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.C b/src/thermophysicalModels/basic/basicThermo/basicThermo.C index 4a1e7f19f9..3de20158ad 100644 --- 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) diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.H b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.H index 654b5c1af6..725ca85df2 100644 --- 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 diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.H b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.H index f2ba6cfe56..c3cde14594 100644 --- 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 diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.H b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.H index 7b40f74e4b..697baf7696 100644 --- 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 diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.C index ffcb2fbeff..a8822eb38a 100644 --- 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& 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& 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& iF @@ -102,10 +107,10 @@ void gradientInternalEnergyFvPatchScalarField::updateCoeffs() ( "thermophysicalProperties" ); - + const label patchi = patch().index(); - fvPatchScalarField& Tw = + fvPatchScalarField& Tw = const_cast(thermo.T().boundaryField()[patchi]); Tw.evaluate(); @@ -123,7 +128,11 @@ void gradientInternalEnergyFvPatchScalarField::updateCoeffs() // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -makePatchTypeField(fvPatchScalarField, gradientInternalEnergyFvPatchScalarField); +makePatchTypeField +( + fvPatchScalarField, + gradientInternalEnergyFvPatchScalarField +); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.H b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.H index 2862f5d40d..901b212e12 100644 --- 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 diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.C index e084cc0301..1fea21e4c1 100644 --- 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 @@ -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) diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.H b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.H index 38566fc5d2..b456ebb1d3 100644 --- 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 diff --git a/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.H b/src/thermophysicalModels/basic/mixtures/pureMixture/pureMixture.H index 43240e4c9b..601b86eff9 100644 --- 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 @@ -76,9 +76,8 @@ public: pureMixture(const dictionary&, const fvMesh&); - // Destructor - - ~pureMixture(); + //- Destructor + virtual ~pureMixture(); // Member functions diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.H b/src/thermophysicalModels/chemistryModel/chemistryModel/ODEChemistryModel/ODEChemistryModel.H index ac8c10e086..08f30d0637 100644 --- 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 RR(const label i) const; diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C index 95cfc76388..bdc16c1895 100644 --- a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C +++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C @@ -116,8 +116,7 @@ Foam::scalar Foam::EulerImplicit::solve RR[si][lRef] -= sr*pf*corr; RR[si][rRef] += sr*pr*corr; } - - } // end for(label i... + } for (label i=0; i::solve c[si] += dt*sr*omeg; c[si] = max(0.0, c[si]); } - - } // end for (label i... + } return cTauChem_/tChemInv; } diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H index 43ea408349..4cd9b983cd 100644 --- 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 New - ( - const dictionary& - ); + static autoPtr New(const dictionary&); // Member Functions diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C index 9677a4bfc7..dfac21d6d2 100644 --- 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 * * * * * * * * * * * * // /* diff --git a/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.H b/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.H index 4524857911..24e96ee027 100644 --- 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 New - ( - const dictionary& - ); + static autoPtr 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; }; diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C index e9083bc13b..b4c76b78e9 100644 --- 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