From e17ef8cfaaba8fa62407e9f4216dee8aaf16ce09 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 22 May 2009 15:20:30 +0100
Subject: [PATCH] cosmetics
---
src/lagrangian/basic/Particle/Particle.C | 1 -
src/lagrangian/basic/Particle/Particle.H | 19 ++++++-------------
.../Templates/ReactingCloud/ReactingCloud.H | 1 +
.../ReactingMultiphaseCloud.H | 1 +
.../Templates/ThermoCloud/ThermoCloud.H | 1 +
.../basicKinematicCloud/basicKinematicCloud.C | 1 +
.../basicKinematicCloud/basicKinematicCloud.H | 2 +-
.../basicReactingMultiphaseCloud.H | 2 +-
.../basicThermoCloud/basicThermoCloud.H | 1 +
.../KinematicParcel/KinematicParcel.H | 2 +-
.../Templates/ReactingParcel/ReactingParcel.H | 6 +++---
.../Templates/ThermoParcel/ThermoParcel.H | 6 +++---
.../phaseProperties/phaseProperties.H | 4 ++--
.../DispersionModel/DispersionModel.H | 2 +-
.../Kinematic/DragModel/DragModel/DragModel.H | 2 +-
.../FieldActivatedInjection.C | 2 +-
.../FieldActivatedInjection.H | 2 +-
.../StandardWallInteraction.C | 2 --
.../LiquidEvaporation/LiquidEvaporation.H | 2 +-
.../SurfaceReactionModel.H | 2 +-
.../RanzMarshall/RanzMarshall.C | 2 --
21 files changed, 28 insertions(+), 35 deletions(-)
diff --git a/src/lagrangian/basic/Particle/Particle.C b/src/lagrangian/basic/Particle/Particle.C
index 35d281c6a75..a058dcb0b23 100644
--- a/src/lagrangian/basic/Particle/Particle.C
+++ b/src/lagrangian/basic/Particle/Particle.C
@@ -433,7 +433,6 @@ void Foam::Particle<ParticleType>::transformProperties(const vector&)
{}
-
template<class ParticleType>
template<class TrackData>
void Foam::Particle<ParticleType>::hitPatch
diff --git a/src/lagrangian/basic/Particle/Particle.H b/src/lagrangian/basic/Particle/Particle.H
index 371c1700c3f..426e9af9fc3 100644
--- a/src/lagrangian/basic/Particle/Particle.H
+++ b/src/lagrangian/basic/Particle/Particle.H
@@ -98,10 +98,7 @@ public:
// Constructors
- inline trackData
- (
- Cloud<ParticleType>& cloud
- );
+ inline trackData(Cloud<ParticleType>& cloud);
// Member functions
@@ -307,10 +304,10 @@ public:
// parallel transfer
class iNew
{
-
// Private data
- const Cloud<ParticleType>& cloud_;
+ //- Reference to the cloud
+ const Cloud<ParticleType>& cloud_;
public:
@@ -328,9 +325,8 @@ public:
//- Destructor
-
- virtual ~Particle()
- {}
+ virtual ~Particle()
+ {}
// Member Functions
@@ -439,10 +435,7 @@ public:
// I-O
//- Write the fields associated with the owner cloud
- static void writeFields
- (
- const Cloud<ParticleType>& c
- );
+ static void writeFields(const Cloud<ParticleType>& c);
// Ostream Operator
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index 75badafeab9..5bd879f97b9 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -27,6 +27,7 @@ Class
Description
Templated base class for reacting cloud
+
- Adds to thermodynamic cloud
- Variable composition (single phase)
- Phase change
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
index bfd9b4816a9..47ca1de7b48 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
@@ -27,6 +27,7 @@ Class
Description
Templated base class for multiphase reacting cloud
+
- Adds to reacting cloud
- multiphase composition
- devolatilisatsion
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index a5cba35617a..df3321d1a7b 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -27,6 +27,7 @@ Class
Description
Templated base class for thermodynamic cloud
+
- Adds to kinematic cloud
- Heat transfer
diff --git a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.C b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.C
index 4e58cfa767e..15ab7afdfcd 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.C
@@ -64,4 +64,5 @@ void Foam::basicKinematicCloud::writeFields() const
basicKinematicParcel::writeFields(*this);
}
+
// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
index 91a8ae2e5bd..adf90ad6bc9 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
@@ -26,7 +26,7 @@ Class
Foam::basicKinematicCloud
Description
- Cloud class to introduce kinematic parcels
+ Kinematic cloud templated on the kinematic parcel
SourceFiles
basicKinematicCloud.C
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H
index 0a34b333388..540431bfd41 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H
@@ -26,7 +26,7 @@ Class
Foam::basicReactingMultiphaseCloud
Description
- Reacting cloud templated on the reacting multiphase parcel
+ Reacting multiphase cloud templated on the reacting multiphase parcel
SourceFiles
basicReactingMultiphaseCloud.C
diff --git a/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H b/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
index 81507f7098d..82323e1d589 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
@@ -26,6 +26,7 @@ Class
Foam::basicThermoCloud
Description
+ Thermodynamic cloud templated on the thermodynamic parcel
SourceFiles
basicThermoCloud.C
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 951a42c39c7..b51612bb53e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -502,7 +502,7 @@ public:
//- Read
static void readFields(KinematicCloud<ParcelType>& c);
- //- write
+ //- Write
static void writeFields(const KinematicCloud<ParcelType>& c);
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 7c8fb0e7b57..4a9f9b17cb1 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -89,7 +89,7 @@ public:
//- Boiling point [K]
const scalar Tbp_;
- //- Vapourisation temperature [K]
+ //- Vaporisation temperature [K]
const scalar Tvap_;
@@ -109,7 +109,7 @@ public:
//- Return const access to the boiling point
inline scalar Tbp() const;
- //- Return const access to the vapourisation temperature
+ //- Return const access to the vaporisation temperature
inline scalar Tvap() const;
};
@@ -159,7 +159,7 @@ public:
//- Return const access to the constant properties
inline const constantProperties& constProps() const;
- //- Return conat access to the interpolator for continuous
+ //- Return const access to the interpolator for continuous
// phase pressure field
inline const interpolation<scalar>& pInterp() const;
};
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index d8d71d69a74..833577dbbca 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -146,7 +146,7 @@ public:
//- Temperature field interpolator
const interpolation<scalar>& TInterp_;
- //- Scpecific heat capacity field interpolator
+ //- Specific heat capacity field interpolator
const interpolation<scalar>& cpInterp_;
@@ -176,11 +176,11 @@ public:
//- Return const access to the owner cloud
inline const constantProperties& constProps() const;
- //- Return conat access to the interpolator for continuous
+ //- Return const access to the interpolator for continuous
// phase temperature field
inline const interpolation<scalar>& TInterp() const;
- //- Return conat access to the interpolator for continuous
+ //- Return const access to the interpolator for continuous
// phase specific heat capacity field
inline const interpolation<scalar>& cpInterp() const;
};
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
index c87f51b7a05..183fe965989 100644
--- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
@@ -163,10 +163,10 @@ public:
//- Return non-const access to a component mass fraction
scalar& Y(const label cmptI);
- //- Return const acccess to the global ids
+ //- Return const access to the global ids
const labelList& globalIds() const;
- //- Return const acccess to the map to the carrier global ids
+ //- Return const access to the map to the carrier global ids
const labelList& globalCarrierIds() const;
//- Return the global id of a component in the local list by name
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
index 085ff97b8ad..1cf7be00f8d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
@@ -54,7 +54,7 @@ class DispersionModel
//- Cloud dictionary
const dictionary& dict_;
- // Reference to the owner cloud class
+ //- Reference to the owner cloud class
CloudType& owner_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H
index 5623c7f30e4..34220baafeb 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H
@@ -58,7 +58,7 @@ class DragModel
//- The cloud dictionary
const dictionary& dict_;
- // reference to the owner cloud class
+ //- Reference to the owner cloud class
CloudType& owner_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
index fb241b2f450..3110de5c3e3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
@@ -131,7 +131,7 @@ Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection
*sum(pow3(diameters_))
*mathematicalConstant::pi/6.0;
- // Set/cahce the injector cells
+ // Set/cache the injector cells
forAll(positions_, i)
{
this->findCellAtPosition
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
index 194add8ca95..0fec8998159 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
@@ -87,7 +87,7 @@ class FieldActivatedInjection
//- Field of injector (x,y,z) positions
vectorIOField positions_;
- //- Field of cell labels corresoponding to injector positions
+ //- Field of cell labels corresponding to injector positions
labelField injectorCells_;
//- Number of parcels per injector
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/StandardWallInteraction/StandardWallInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/StandardWallInteraction/StandardWallInteraction.C
index 0c09c4be378..ef22613d261 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/StandardWallInteraction/StandardWallInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/StandardWallInteraction/StandardWallInteraction.C
@@ -24,8 +24,6 @@ License
\*---------------------------------------------------------------------------*/
-#include "error.H"
-
#include "StandardWallInteraction.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
index 9c650f1c2ef..6565f6421b4 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
@@ -72,7 +72,7 @@ protected:
//- Sherwood number as a function of Reynolds and Schmidt numbers
scalar Sh(const scalar Re, const scalar Sc) const;
- //- Calculate the carrier phase comonent volume fractions at cellI
+ //- Calculate the carrier phase component volume fractions at cellI
scalarField calcXc(const label cellI) const;
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
index 2deacb3465f..8f1657f47a4 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
@@ -60,7 +60,7 @@ class SurfaceReactionModel
//- The cloud dictionary
const dictionary& dict_;
- // reference to the owner cloud class
+ //- Reference to the owner cloud class
CloudType& owner_;
//- The coefficients dictionary
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.C
index b728282001a..8e9b6e9379e 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.C
@@ -24,8 +24,6 @@ License
\*---------------------------------------------------------------------------*/
-#include "error.H"
-
#include "RanzMarshall.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
--
GitLab