From 80ef3117bfb30fd856bdd696870eac5927f02b2c Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Wed, 17 Jun 2009 14:48:14 +0100
Subject: [PATCH] Moving Tref from Cloud to models, to be read from coeffDict

---
 src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C  | 3 ---
 src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H  | 3 ---
 .../LarsenBorgnakkeVariableHardSphere.C                     | 3 ++-
 .../LarsenBorgnakkeVariableHardSphere.H                     | 3 +++
 .../VariableHardSphere/VariableHardSphere.C                 | 5 +++--
 .../VariableHardSphere/VariableHardSphere.H                 | 6 ++++++
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
index 9a07a31d8b..1a89bcacb1 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
@@ -34,9 +34,6 @@ License
 template<class ParcelType>
 Foam::scalar Foam::DsmcCloud<ParcelType>::kb = 1.380650277e-23;
 
-template<class ParcelType>
-Foam::scalar Foam::DsmcCloud<ParcelType>::Tref = 273;
-
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
index 689ff43efe..b6d01428c7 100644
--- a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
@@ -172,9 +172,6 @@ public:
         //- Boltzmann constant
         static scalar kb;
 
-        //- Reference temperature for all models
-        static scalar Tref;
-
 
     // Constructors
 
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
index 65f7e676c3..69af3a855b 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
@@ -97,6 +97,7 @@ Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::LarsenBorgnakkeVariableHardS
 )
 :
     BinaryCollisionModel<CloudType>(dict, cloud, typeName),
+    Tref_(readScalar(this->coeffDict().lookup("Tref"))),
     relaxationCollisionNumber_
     (
         readScalar(this->coeffDict().lookup("relaxationCollisionNumber"))
@@ -156,7 +157,7 @@ Foam::scalar Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::sigmaTcR
     // 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)
+       *pow(2.0*CloudType::kb*Tref_/(mR*cR*cR), omegaPQ - 0.5)
        /exp(Foam::lgamma(2.5 - omegaPQ));
 
     return sigmaTPQ*cR;
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
index 1394f1dc17..0b95c9fb4e 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
@@ -50,6 +50,9 @@ class LarsenBorgnakkeVariableHardSphere
 {
     // Private data
 
+        //- Reference temperature
+        const scalar Tref_;
+
         //- Relaxation collision number
         const scalar relaxationCollisionNumber_;
 
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
index b077963e42..29b389a65a 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
@@ -35,7 +35,8 @@ Foam::VariableHardSphere<CloudType>::VariableHardSphere
     CloudType& cloud
 )
 :
-    BinaryCollisionModel<CloudType>(dict, cloud, typeName)
+    BinaryCollisionModel<CloudType>(dict, cloud, typeName),
+    Tref_(readScalar(this->coeffDict().lookup("Tref")))
 {}
 
 
@@ -90,7 +91,7 @@ Foam::scalar Foam::VariableHardSphere<CloudType>::sigmaTcR
     // 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)
+       *pow(2.0*CloudType::kb*Tref_/(mR*cR*cR), omegaPQ - 0.5)
        /exp(Foam::lgamma(2.5 - omegaPQ));
 
     return sigmaTPQ*cR;
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
index 99036544ad..ee58d08d6a 100644
--- a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
@@ -47,6 +47,12 @@ class VariableHardSphere
 :
     public BinaryCollisionModel<CloudType>
 {
+    // Private data
+
+        //- Reference temperature
+        const scalar Tref_;
+
+
 public:
 
     //- Runtime type information