From 5e76511069dd218eb1693064cef7bf4ab6297159 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Thu, 12 Mar 2009 18:28:39 +0000
Subject: [PATCH] minor formatting changes
---
.../IntegrationScheme/Analytical/Analytical.H | 10 ++--------
.../intermediate/IntegrationScheme/Euler/Euler.H | 10 ++--------
.../IntegrationScheme/IntegrationScheme.H | 10 +++-------
.../derived/basicReactingCloud/basicReactingCloud.H | 1 +
.../phaseProperties/phaseProperties/phaseProperties.C | 2 +-
.../phaseProperties/phaseProperties/phaseProperties.H | 2 +-
.../StochasticDispersionRAS/StochasticDispersionRAS.C | 3 ++-
.../Kinematic/DragModel/DragModel/DragModel.C | 7 ++++---
.../Kinematic/WallInteractionModel/Rebound/Rebound.C | 1 -
.../WallInteractionModel/WallInteractionModel.C | 3 ++-
.../CompositionModel/CompositionModel.C | 3 ++-
.../PhaseChangeModel/PhaseChangeModel.C | 6 ++++--
.../HeatTransferModel/HeatTransferModel.C | 3 ++-
.../cloudAbsorptionEmission/cloudAbsorptionEmission.H | 10 ++--------
.../radiation/scatter/cloudScatter/cloudScatter.H | 10 ++--------
15 files changed, 30 insertions(+), 51 deletions(-)
diff --git a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
index 51c4aa5614c..aefef71c0bd 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
@@ -49,7 +49,6 @@ class Analytical
:
public IntegrationScheme<Type>
{
-
public:
//- Runtime type information
@@ -59,16 +58,11 @@ public:
// Constructors
//- Construct from components
- Analytical
- (
- const word& phiName,
- const dictionary& dict
- );
+ Analytical(const word& phiName, const dictionary& dict);
//- Destructor
-
- virtual ~Analytical();
+ virtual ~Analytical();
// Member Functions
diff --git a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
index 1062351c4c0..279a80d8a79 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
@@ -49,7 +49,6 @@ class Euler
:
public IntegrationScheme<Type>
{
-
public:
//- Runtime type information
@@ -59,16 +58,11 @@ public:
// Constructors
//- Construct from components
- Euler
- (
- const word& phiName,
- const dictionary& dict
- );
+ Euler(const word& phiName, const dictionary& dict);
//- Destructor
-
- virtual ~Euler();
+ virtual ~Euler();
// Member Functions
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
index 1ecc8c59341..78b1dec715c 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
@@ -110,6 +110,7 @@ public:
private:
+
// Private data
//- Name of the Integration variable
@@ -152,11 +153,7 @@ public:
// Constructors
//- Construct from components
- IntegrationScheme
- (
- const word& phiName,
- const dictionary& dict
- );
+ IntegrationScheme(const word& phiName, const dictionary& dict);
// Selectors
@@ -170,8 +167,7 @@ public:
//- Destructor
-
- virtual ~IntegrationScheme();
+ virtual ~IntegrationScheme();
// Member Functions
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H
index eb9d86e5069..42f36fddcbc 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H
@@ -26,6 +26,7 @@ Class
Foam::basicReactingCloud
Description
+ Reacting cloud templated on the reacting parcel
SourceFiles
basicReactingCloud.C
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
index 9df83bbbaf4..df2b1d9f6de 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -131,7 +131,7 @@ void Foam::phaseProperties::checkTotalMassFraction() const
}
-Foam::word Foam::phaseProperties::phaseToStateLabel(phaseType pt)
+Foam::word Foam::phaseProperties::phaseToStateLabel(phaseType pt) const
{
word state = "(unknown)";
switch (pt)
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
index 2998a9831a5..139d2acc196 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
@@ -101,7 +101,7 @@ private:
void checkTotalMassFraction() const;
//- Set the state label
- word phaseToStateLabel(phaseType pt);
+ word phaseToStateLabel(phaseType pt) const;
public:
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
index 6887244a98a..f9a51f050eb 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
@@ -95,7 +95,8 @@ Foam::vector Foam::StochasticDispersionRAS<CloudType>::update
dir /= mag(dir) + SMALL;
// Numerical Recipes... Ch. 7. Random Numbers...
- scalar x1, x2;
+ scalar x1 = 0.0;
+ scalar x2 = 0.0;
scalar rsq = 10.0;
while ((rsq > 1.0) || (rsq == 0.0))
{
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
index 7494f397e69..273e93b0e17 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
@@ -34,7 +34,8 @@ Foam::DragModel<CloudType>::DragModel
const dictionary& dict,
CloudType& owner
)
-: dict_(dict),
+:
+ dict_(dict),
owner_(owner)
{}
@@ -76,9 +77,9 @@ Foam::scalar Foam::DragModel<CloudType>::Cu
const scalar Re = rhoc*magUr*d/(mu + SMALL);
- const scalar cd = Cd(Re);
+ const scalar Cd = this->Cd(Re);
- return 3.0*cd*rhoc*magUr/(4.0*d*rhop);
+ return 3.0*Cd*rhoc*magUr/(4.0*d*rhop);
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/Rebound/Rebound.C b/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/Rebound/Rebound.C
index 7210f71e8af..a437c67edbd 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/Rebound/Rebound.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/Rebound/Rebound.C
@@ -76,7 +76,6 @@ void Foam::Rebound<CloudType>::correct
}
U -= Ut;
-
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/WallInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
index a99831988fd..5ee04a0a1cd 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
@@ -35,7 +35,8 @@ Foam::WallInteractionModel<CloudType>::WallInteractionModel
CloudType& owner,
const word& type
)
-: dict_(dict),
+:
+ dict_(dict),
owner_(owner),
coeffDict_(dict.subDict(type + "Coeffs"))
{}
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
index 5408ad656e8..36fd93c4510 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
@@ -35,7 +35,8 @@ Foam::CompositionModel<CloudType>::CompositionModel
CloudType& owner,
const word& type
)
-: dict_(dict),
+:
+ dict_(dict),
owner_(owner),
coeffDict_(dict.subDict(type + "Coeffs")),
carrierThermo_(owner.carrierThermo()),
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
index 724da1e762f..b9fbdb20114 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
@@ -33,7 +33,8 @@ Foam::PhaseChangeModel<CloudType>::PhaseChangeModel
(
CloudType& owner
)
-: dict_(dictionary::null),
+:
+ dict_(dictionary::null),
owner_(owner),
coeffDict_(dictionary::null)
{}
@@ -46,7 +47,8 @@ Foam::PhaseChangeModel<CloudType>::PhaseChangeModel
CloudType& owner,
const word& type
)
-: dict_(dict),
+:
+ dict_(dict),
owner_(owner),
coeffDict_(dict.subDict(type + "Coeffs"))
{}
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
index f294d382a71..93a621d0980 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
@@ -44,7 +44,8 @@ Foam::HeatTransferModel<CloudType>::HeatTransferModel
CloudType& owner,
const word& type
)
-: dict_(dict),
+:
+ dict_(dict),
owner_(owner),
coeffDict_(dict.subDict(type + "Coeffs"))
{}
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
index eeb8ce7cb23..033ed351d5d 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
@@ -53,7 +53,6 @@ class cloudAbsorptionEmission
:
public absorptionEmissionModel
{
-
// Private data
//- Coefficients dictionary
@@ -72,16 +71,11 @@ public:
// Constructors
//- Construct from components
- cloudAbsorptionEmission
- (
- const dictionary& dict,
- const fvMesh& mesh
- );
+ cloudAbsorptionEmission(const dictionary& dict, const fvMesh& mesh);
// Destructor
-
- ~cloudAbsorptionEmission();
+ virtual ~cloudAbsorptionEmission();
// Member Operators
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H
index 288edd83911..2d36e281f47 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H
@@ -46,16 +46,13 @@ namespace radiation
{
/*---------------------------------------------------------------------------*\
- Class cloudScatter Declaration
+ Class cloudScatter Declaration
\*---------------------------------------------------------------------------*/
class cloudScatter
:
public scatterModel
{
-
-private:
-
// Private data
//- Absorption model dictionary
@@ -82,14 +79,11 @@ public:
// Destructor
-
- ~cloudScatter();
+ virtual ~cloudScatter();
// Member Operators
- // Edit
-
// Access
//- Return scatter coefficient
--
GitLab