diff --git a/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C b/applications/utilities/preProcessing/dsmcInitialise/dsmcInitialise.C
index 113aba617faf4266bab3cf54ee676f4e135e23bf..34727c0bfffdb011c9f0f86a1e6c89b0e07a5b03 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 63603ff302f3ee754c21de33d060ffc64946c97f..1d071afa5bbe0609f7c34be33f3ea985bc87e56d 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 CloudType>
class WallInteractionModel;
/*---------------------------------------------------------------------------*\
- Class DsmcCloud Declaration
+ Class DsmcCloud Declaration
\*---------------------------------------------------------------------------*/
template<class ParcelType>
@@ -69,9 +69,6 @@ class DsmcCloud
public Cloud<ParcelType>,
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<word> 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<DsmcCloud<ParcelType> >&
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 94727407f4b346f2d578e500f4f7afb029908ee3..df49f8e148bc2dfaa47924eff697821b59dbb8cf 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 18c30adc57bbf0fcc49bd1b658298e3e1c67238f..7e0ee0cf8423e438428d191a7c1eab6db3c1b443 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<dsmcParcel>
{
-
// 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 5ea8d57624c1c7dfbcc7bcab116f734d0f7c542a..91f17669dd5cc2071cd05f863b2d7a99947f23fa 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<ParcelType>
{
-
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<ParcelType>::trackData
{
-
// Private data
//- Reference to the cloud containing this particle
DsmcCloud<ParcelType>& cloud_;
- public:
+
+ public:
// Constructors
- //- Construct from components
- inline trackData
+ //- Construct from components
+ inline trackData
(
DsmcCloud<ParcelType>& 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<Type>::typeName(#Type); \
+ const Foam::word DsmcParcel<Type>::typeName(#Type); \
template<> \
- int DsmcParcel<Type>::debug \
+ int DsmcParcel<Type>::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 09638ea8bec8a6190f9a03d8f4c55489013bdff6..684af80b6a6b760b8cce3dcf14b52855ffa07100 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 5ae8ace6797ed66ff61ecc3be6ef4da5b84f3d43..cc279b51b70a5f25c1b831cee679393dd28ece58 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 CloudType>
class BinaryCollisionModel
{
-
// Private data
//- The cloud dictionary
@@ -97,17 +96,15 @@ public:
// Destructor
+ virtual ~BinaryCollisionModel();
- virtual ~BinaryCollisionModel();
-
-
- // Selector
- static autoPtr<BinaryCollisionModel<CloudType> > New
- (
- const dictionary& dict,
- CloudType& owner
- );
+ //- Selector
+ static autoPtr<BinaryCollisionModel<CloudType> > 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 3d5ef7a5d36aadcb5965d10bbfaf69fbba0e6213..8878164cdbf1425fcf9838a369ca9b855fcb60d4 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<CloudType>::New
CloudType& owner
)
{
- word BinaryCollisionModelType
- (
- dict.lookup("BinaryCollisionModel")
- );
+ word BinaryCollisionModelType(dict.lookup("BinaryCollisionModel"));
Info<< "Selecting BinaryCollisionModel "
<< BinaryCollisionModelType
@@ -58,7 +55,7 @@ Foam::BinaryCollisionModel<CloudType>::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 58cabefccbcfe1e71b564a37db772ab27cdf7e55..433ecd24cf06a1daac4b3fa47c408afda5697cdb 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<CloudType>::sigmaTcR
{
const CloudType& cloud(this->owner());
- 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 dPQ =
+ 0.5
+ *(
+ cloud.constProps(typeIdP).d()
+ + cloud.constProps(typeIdQ).d()
+ );
+
+ 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<CloudType>::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<CloudType>::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 00b7ec9527ee18ed683a7c455c1ce98966a0ea45..22550288b4e95be7c8dee39058d012f38a24be2b 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<CloudType>
{
-
- // 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 ab6939b0457723644e2bcb11010114c7e5573d41..ba53abcc8618ecb6fc0a07aafa942cc4dd3be4f1 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<CloudType>::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 16862b8fbc8f94e6a8eff624394fee8c38aea488..78ee59e1bfc5a922d87ab8d21dd8d440bd1aa9f1 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<CloudType>
{
-
// 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 c2da6d06308792f8ddb69dd3d81acf917636a296..60625ecba05db27014049b8f8b59cfb048061aa5 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<CloudType>
{
-
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 ee1fd8a169e08e7c932aeaf0beaf55d53659b838..85652f2379327af4db6aa9c9a6e8e3bcff873dfc 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<CloudType>::New
CloudType& owner
)
{
- word WallInteractionModelType
- (
- dict.lookup("WallInteractionModel")
- );
+ word WallInteractionModelType(dict.lookup("WallInteractionModel"));
Info<< "Selecting WallInteractionModel " << WallInteractionModelType
<< endl;
@@ -57,7 +54,7 @@ Foam::WallInteractionModel<CloudType>::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 e209b4e57afaff5aeb68142bbc9f6d706633f1ab..b378c913765905cb55c28cae66bb2ea758ae4d1d 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 CloudType>
class WallInteractionModel
{
-
// Private data
//- The cloud dictionary
@@ -98,17 +96,15 @@ public:
// Destructor
-
- virtual ~WallInteractionModel();
+ virtual ~WallInteractionModel();
- // Selector
-
- static autoPtr<WallInteractionModel<CloudType> > New
- (
- const dictionary& dict,
- CloudType& owner
- );
+ //- Selector
+ static autoPtr<WallInteractionModel<CloudType> > New
+ (
+ const dictionary& dict,
+ CloudType& owner
+ );
// Access