From e10c3a86baa62572546baad01589855866c2678e Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 2 Mar 2009 13:18:45 +0000 Subject: [PATCH] minor formatting/coding changes --- .../dsmcInitialise/dsmcInitialise.C | 2 +- .../clouds/Templates/DsmcCloud/DsmcCloud.H | 19 ++++---- .../baseClasses/DsmcBaseCloud/DsmcBaseCloud.H | 13 ++---- .../dsmc/clouds/derived/dsmcCloud/dsmcCloud.H | 6 +-- .../parcels/Templates/DsmcParcel/DsmcParcel.H | 29 ++++++------ .../parcels/derived/dsmcParcel/dsmcParcel.H | 3 +- .../BinaryCollisionModel.H | 17 +++---- .../NewBinaryCollisionModel.C | 7 +-- .../VariableHardSphere/VariableHardSphere.C | 45 +++++++++++-------- .../VariableHardSphere/VariableHardSphere.H | 8 +--- .../MaxwellianThermal/MaxwellianThermal.C | 11 +++-- .../MaxwellianThermal/MaxwellianThermal.H | 4 +- .../SpecularReflection/SpecularReflection.H | 4 +- .../NewWallInteractionModel.C | 7 +-- .../WallInteractionModel.H | 18 +++----- 15 files changed, 87 insertions(+), 106 deletions(-) diff --git a/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C b/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C index 113aba617f..34727c0bff 100644 --- a/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C +++ b/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C @@ -73,7 +73,7 @@ int main(int argc, char *argv[]) if (!mesh.write()) { FatalErrorIn(args.executable()) - << "Failed writing moleculeCloud." + << "Failed writing moleculeCloud." << nl << exit(FatalError); } diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H index 0cbd4aecba..c0d0e6ca32 100644 --- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H +++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H @@ -60,7 +60,7 @@ template class WallInteractionModel; /*---------------------------------------------------------------------------*\ - Class DsmcCloud Declaration + Class DsmcCloud Declaration \*---------------------------------------------------------------------------*/ template @@ -69,9 +69,6 @@ class DsmcCloud public Cloud, public DsmcBaseCloud { - -private: - // Private data //- Cloud type - used to set the name of the parcel properties @@ -84,10 +81,10 @@ private: //- Dictionary of particle properties IOdictionary particleProperties_; - //- A list of unique instances of molecule types in the simulation. The - // position of an entry in the list maps to the label identifying the - // typeId, i.e. where typeIdList_ = (N2 O2 CO2) - // N2 has typeId label = 0, O2 = 1, CO2 = 2. + //- A list of unique instances of molecule types in the simulation. + // The position of an entry in the list maps to the label identifying + // the typeId, i.e. where typeIdList_ = (N2 O2 CO2) + // N2 has typeId label = 0, O2 = 1, CO2 = 2. List typeIdList_; //- Number of real atoms/molecules represented by a parcel @@ -171,6 +168,7 @@ public: const IOdictionary& dsmcInitialiseDict ); + //- Destructor virtual ~DsmcCloud(); @@ -220,7 +218,8 @@ public: //- Return refernce to the random object inline Random& rndGen(); - // Kinetic theory helper functions + + // Kinetic theory helper functions //- Generate a random velocity sampled from the Maxwellian speed // distribution @@ -256,6 +255,7 @@ public: //- Clear the Cloud inline void clear(); + // Sub-models //- Return reference to binary elastic collision model @@ -274,6 +274,7 @@ public: inline WallInteractionModel >& wallInteraction(); + // Check //- Total mass injected diff --git a/src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.H b/src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.H index 94727407f4..df49f8e148 100644 --- a/src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.H +++ b/src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.H @@ -29,6 +29,7 @@ Description Virtual abstract base class for templated DsmcCloud SourceFiles + DsmcBaseCloud.C \*---------------------------------------------------------------------------*/ @@ -48,7 +49,6 @@ namespace Foam class DsmcBaseCloud { - // Private Member Functions //- Disallow default bitwise copy construct @@ -68,15 +68,8 @@ public: //- Null constructor DsmcBaseCloud(); - - // Destructors - - virtual ~DsmcBaseCloud(); - - - // Member Functions - - // Access + //- Destructor + virtual ~DsmcBaseCloud(); }; diff --git a/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H b/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H index 18c30adc57..7e0ee0cf84 100644 --- a/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H +++ b/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H @@ -45,14 +45,13 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class dsmcCloud Declaration + Class dsmcCloud Declaration \*---------------------------------------------------------------------------*/ class dsmcCloud : public DsmcCloud { - // Private member functions //- Disallow default bitwise copy construct @@ -86,8 +85,7 @@ public: ); //- Destructor - - ~dsmcCloud(); + ~dsmcCloud(); // Member functions diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H index 5ea8d57624..91f17669dd 100644 --- a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H +++ b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H @@ -72,13 +72,11 @@ class DsmcParcel : public Particle { - public: //- Class to hold DSMC particle constant properties class constantProperties { - // Private data //- Particle mass [kg] (constant) @@ -93,14 +91,18 @@ public: //- Viscosity index scalar omega_; + public: - //- Null constructor, allows List of constantProperties to be created - //- before the contents is initialised - inline constantProperties(); + // Constrcutors + + //- Null constructor, allows List of constantProperties to be + // created before the contents is initialised + inline constantProperties(); + + //- Constructor from dictionary + inline constantProperties(const dictionary& dict); - //- Constructor from dictionary - inline constantProperties(const dictionary& dict); // Member functions @@ -127,18 +129,18 @@ public: : public Particle::trackData { - // Private data //- Reference to the cloud containing this particle DsmcCloud& cloud_; - public: + + public: // Constructors - //- Construct from components - inline trackData + //- Construct from components + inline trackData ( DsmcCloud& cloud ); @@ -163,6 +165,7 @@ protected: //- Parcel type id label typeId_; + public: //- Runtime type information @@ -312,9 +315,9 @@ public: #define defineParcelTypeNameAndDebug(Type, DebugSwitch) \ template<> \ - const Foam::word DsmcParcel::typeName(#Type); \ + const Foam::word DsmcParcel::typeName(#Type); \ template<> \ - int DsmcParcel::debug \ + int DsmcParcel::debug \ ( \ Foam::debug::debugSwitch(#Type, DebugSwitch) \ ); diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.H b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.H index 09638ea8be..684af80b6a 100644 --- a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.H +++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.H @@ -86,8 +86,7 @@ public: //- Destructor - - virtual ~dsmcParcel(); + virtual ~dsmcParcel(); }; diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H index 5ae8ace679..cc279b51b7 100644 --- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H +++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H @@ -53,7 +53,6 @@ namespace Foam template class BinaryCollisionModel { - // Private data //- The cloud dictionary @@ -97,17 +96,15 @@ public: // Destructor - - virtual ~BinaryCollisionModel(); + virtual ~BinaryCollisionModel(); - // Selector - - static autoPtr > New - ( - const dictionary& dict, - CloudType& owner - ); + //- Selector + static autoPtr > New + ( + const dictionary& dict, + CloudType& owner + ); // Access diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C index 3d5ef7a5d3..8878164cdb 100644 --- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C +++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C @@ -36,10 +36,7 @@ Foam::BinaryCollisionModel::New CloudType& owner ) { - word BinaryCollisionModelType - ( - dict.lookup("BinaryCollisionModel") - ); + word BinaryCollisionModelType(dict.lookup("BinaryCollisionModel")); Info<< "Selecting BinaryCollisionModel " << BinaryCollisionModelType @@ -58,7 +55,7 @@ Foam::BinaryCollisionModel::New << "Unknown BinaryCollisionModelType type " << BinaryCollisionModelType << ", constructor not in hash table" << nl << nl - << " Valid BinaryCollisionModel types are :" << nl + << " Valid BinaryCollisionModel types are:" << nl << dictionaryConstructorTablePtr_->toc() << exit(FatalError); } diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C index 58cabefccb..433ecd24cf 100644 --- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C +++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C @@ -60,15 +60,19 @@ Foam::scalar Foam::VariableHardSphere::sigmaTcR { const CloudType& cloud(this->owner()); - scalar dPQ = 0.5* - ( - cloud.constProps(typeIdP).d() + cloud.constProps(typeIdQ).d() - ); + scalar dPQ = + 0.5 + *( + cloud.constProps(typeIdP).d() + + cloud.constProps(typeIdQ).d() + ); - scalar omegaPQ = 0.5* - ( - cloud.constProps(typeIdP).omega() + cloud.constProps(typeIdQ).omega() - ); + scalar omegaPQ = + 0.5 + *( + cloud.constProps(typeIdP).omega() + + cloud.constProps(typeIdQ).omega() + ); scalar cR = mag(UP - UQ); @@ -76,12 +80,13 @@ Foam::scalar Foam::VariableHardSphere::sigmaTcR scalar mQ = cloud.constProps(typeIdQ).mass(); - scalar mR = mP*mQ/(mP+ mQ); + scalar mR = mP*mQ/(mP + mQ); - // calculating cross section = pi * dPQ^2, where dPQ is from Bird, eq. 4.79 - scalar sigmaTPQ = mathematicalConstant::pi*dPQ*dPQ - *pow(2.0*CloudType::kb*CloudType::Tref/(mR*cR*cR),omegaPQ - 0.5) - /exp(Foam::lgamma(2.5 - omegaPQ)); + // calculating cross section = pi*dPQ^2, where dPQ is from Bird, eq. 4.79 + scalar sigmaTPQ = + mathematicalConstant::pi*dPQ*dPQ + *pow(2.0*CloudType::kb*CloudType::Tref/(mR*cR*cR), omegaPQ - 0.5) + /exp(Foam::lgamma(2.5 - omegaPQ)); return sigmaTPQ*cR; } @@ -114,12 +119,14 @@ void Foam::VariableHardSphere::collide scalar phi = 2.0*mathematicalConstant::pi*rndGen.scalar01(); - vector postCollisionRelU = cR*vector - ( - cosTheta, - sinTheta*cos(phi), - sinTheta*sin(phi) - ); + vector postCollisionRelU = + cR + *vector + ( + cosTheta, + sinTheta*cos(phi), + sinTheta*sin(phi) + ); UP = Ucm + postCollisionRelU*mQ/(mP + mQ); diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H index 00b7ec9527..22550288b4 100644 --- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H +++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H @@ -47,11 +47,6 @@ class VariableHardSphere : public BinaryCollisionModel { - - // Private data - - // const scalar something_; - public: //- Runtime type information @@ -69,8 +64,7 @@ public: // Destructor - - ~VariableHardSphere(); + virtual ~VariableHardSphere(); // Member Functions diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C index ab6939b045..ba53abcc86 100644 --- a/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C +++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C @@ -24,8 +24,6 @@ License \*---------------------------------------------------------------------------*/ -#include "error.H" - #include "MaxwellianThermal.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -108,8 +106,13 @@ void Foam::MaxwellianThermal::correct scalar C = sqrt(CloudType::kb*T_/mass); - U = C*(rndGen.GaussNormal()*tw1 + rndGen.GaussNormal()*tw2 - - sqrt(-2.0*log(max(1 - rndGen.scalar01(),VSMALL)))*nw); + U = + C + *( + rndGen.GaussNormal()*tw1 + + rndGen.GaussNormal()*tw2 + - sqrt(-2.0*log(max(1 - rndGen.scalar01(),VSMALL)))*nw + ); } diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H index 16862b8fbc..78ee59e1bf 100644 --- a/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H +++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H @@ -49,7 +49,6 @@ class MaxwellianThermal : public WallInteractionModel { - // Private data //- Temperature @@ -73,8 +72,7 @@ public: // Destructor - - ~MaxwellianThermal(); + virtual ~MaxwellianThermal(); // Member Functions diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H index c2da6d0630..60625ecba0 100644 --- a/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H +++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H @@ -48,7 +48,6 @@ class SpecularReflection : public WallInteractionModel { - public: //- Runtime type information @@ -66,8 +65,7 @@ public: // Destructor - - ~SpecularReflection(); + virtual ~SpecularReflection(); // Member Functions diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C index ee1fd8a169..85652f2379 100644 --- a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C +++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C @@ -36,10 +36,7 @@ Foam::WallInteractionModel::New CloudType& owner ) { - word WallInteractionModelType - ( - dict.lookup("WallInteractionModel") - ); + word WallInteractionModelType(dict.lookup("WallInteractionModel")); Info<< "Selecting WallInteractionModel " << WallInteractionModelType << endl; @@ -57,7 +54,7 @@ Foam::WallInteractionModel::New << "Unknown WallInteractionModelType type " << WallInteractionModelType << ", constructor not in hash table" << nl << nl - << " Valid WallInteractionModel types are :" << nl + << " Valid WallInteractionModel types are:" << nl << dictionaryConstructorTablePtr_->toc() << exit(FatalError); } diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H index e209b4e57a..b378c91376 100644 --- a/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H +++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H @@ -25,7 +25,6 @@ License Class Foam::WallInteractionModel - Description Templated wall interaction model class @@ -54,7 +53,6 @@ namespace Foam template class WallInteractionModel { - // Private data //- The cloud dictionary @@ -98,17 +96,15 @@ public: // Destructor - - virtual ~WallInteractionModel(); + virtual ~WallInteractionModel(); - // Selector - - static autoPtr > New - ( - const dictionary& dict, - CloudType& owner - ); + //- Selector + static autoPtr > New + ( + const dictionary& dict, + CloudType& owner + ); // Access