From eea46a67315acd85c4e6873b60404545313bb3b8 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 14 Dec 2011 11:20:10 +0000
Subject: [PATCH] ENH: Refactored spray break-up model - removed rndGen from
 calc function args

---
 .../spray/parcels/Templates/SprayParcel/SprayParcel.C  |  3 +--
 .../submodels/BreakupModel/BreakupModel/BreakupModel.C | 10 ++++------
 .../submodels/BreakupModel/BreakupModel/BreakupModel.H |  5 ++---
 .../spray/submodels/BreakupModel/ETAB/ETAB.C           |  5 ++---
 .../spray/submodels/BreakupModel/ETAB/ETAB.H           |  5 ++---
 .../spray/submodels/BreakupModel/NoBreakup/NoBreakup.C |  5 ++---
 .../spray/submodels/BreakupModel/NoBreakup/NoBreakup.H |  5 ++---
 .../submodels/BreakupModel/PilchErdman/PilchErdman.C   |  5 ++---
 .../submodels/BreakupModel/PilchErdman/PilchErdman.H   |  5 ++---
 .../submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.C |  5 ++---
 .../submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.H |  5 ++---
 .../spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C |  5 ++---
 .../spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.H |  5 ++---
 src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C  |  7 ++++---
 src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.H  |  5 ++---
 src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C  |  7 ++++---
 src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.H  |  5 ++---
 17 files changed, 39 insertions(+), 53 deletions(-)

diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C
index c90aa89c6a..8f987cb2f9 100644
--- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C
+++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.C
@@ -275,8 +275,7 @@ void Foam::SprayParcel<ParcelType>::calcBreakup
             Urmag,
             tMom,
             dChild,
-            massChild,
-            td.cloud().rndGen()
+            massChild
         )
     )
     {
diff --git a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.C b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.C
index 2c0c17f811..a46179fd86 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.C
@@ -121,9 +121,8 @@ bool Foam::BreakupModel<CloudType>::update
     const scalar Urmag,
     const scalar tMom,
     scalar& dChild,
-    scalar& massChild,
-    cachedRandom& rndGen
-) const
+    scalar& massChild
+)
 {
     notImplemented
     (
@@ -149,9 +148,8 @@ bool Foam::BreakupModel<CloudType>::update
             "const scalar, "
             "const scalar, "
             "scalar&, "
-            "scalar&, "
-            "cachedRandom&"
-        ") const;"
+            "scalar&"
+        ");"
     );
 
     return false;
diff --git a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H
index 51905371da..e0672ca938 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/BreakupModel/BreakupModel.H
@@ -184,9 +184,8 @@ public:
             const scalar Urmag,
             const scalar tMom,
             scalar& dChild,
-            scalar& massChild,
-            cachedRandom& rndGen
-        ) const;
+            scalar& massChild
+        );
 };
 
 
diff --git a/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C b/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C
index 66bbbde584..fb48040831 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C
@@ -113,9 +113,8 @@ bool Foam::ETAB<CloudType>::update
     const scalar Urmag,
     const scalar tMom,
     scalar& dChild,
-    scalar& massChild,
-    cachedRandom& rndGen
-) const
+    scalar& massChild
+)
 {
     scalar r  = 0.5*d;
     scalar r2 = r*r;
diff --git a/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.H b/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.H
index 4118f2cf96..86d27e934d 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.H
@@ -135,9 +135,8 @@ public:
             const scalar Urmag,
             const scalar tMom,
             scalar& dChild,
-            scalar& massChild,
-            cachedRandom& rndGen
-        ) const;
+            scalar& massChild
+        );
 };
 
 
diff --git a/src/lagrangian/spray/submodels/BreakupModel/NoBreakup/NoBreakup.C b/src/lagrangian/spray/submodels/BreakupModel/NoBreakup/NoBreakup.C
index 1b27dd125a..cbe837eafd 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/NoBreakup/NoBreakup.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/NoBreakup/NoBreakup.C
@@ -85,9 +85,8 @@ bool Foam::NoBreakup<CloudType>::update
     const scalar Urmag,
     const scalar tMom,
     scalar& dChild,
-    scalar& massChild,
-    cachedRandom& rndGen
-) const
+    scalar& massChild
+)
 {
     // Do nothing
     return false;
diff --git a/src/lagrangian/spray/submodels/BreakupModel/NoBreakup/NoBreakup.H b/src/lagrangian/spray/submodels/BreakupModel/NoBreakup/NoBreakup.H
index 406f1af0f1..b27792c54c 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/NoBreakup/NoBreakup.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/NoBreakup/NoBreakup.H
@@ -103,9 +103,8 @@ public:
             const scalar Urmag,
             const scalar tMom,
             scalar& dChild,
-            scalar& massChild,
-            cachedRandom& rndGen
-        ) const;
+            scalar& massChild
+        );
 };
 
 
diff --git a/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.C b/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.C
index 402d619531..2f0337d006 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.C
@@ -87,9 +87,8 @@ bool Foam::PilchErdman<CloudType>::update
     const scalar Urmag,
     const scalar tMom,
     scalar& dChild,
-    scalar& massChild,
-    cachedRandom& rndGen
-) const
+    scalar& massChild
+)
 {
     scalar semiMass = nParticle*pow3(d);
     scalar We = 0.5*rhoc*sqr(Urmag)*d/sigma;
diff --git a/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.H b/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.H
index a7e4d3f80f..830c1feeb5 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.H
@@ -116,9 +116,8 @@ public:
             const scalar Urmag,
             const scalar tMom,
             scalar& dChild,
-            scalar& massChild,
-            cachedRandom& rndGen
-        ) const;
+            scalar& massChild
+        );
 };
 
 
diff --git a/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.C b/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.C
index 7c9256fa54..25a123fc69 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.C
@@ -93,9 +93,8 @@ bool Foam::ReitzDiwakar<CloudType>::update
     const scalar Urmag,
     const scalar tMom,
     scalar& dChild,
-    scalar& massChild,
-    cachedRandom& rndGen
-) const
+    scalar& massChild
+)
 {
     scalar d1 = d;
     scalar nuc = muc/rhoc;
diff --git a/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.H b/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.H
index 6644e34d84..84e9dac4a2 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.H
@@ -128,9 +128,8 @@ public:
             const scalar Urmag,
             const scalar tMom,
             scalar& dChild,
-            scalar& massChild,
-            cachedRandom& rndGen
-        ) const;
+            scalar& massChild
+        );
 };
 
 
diff --git a/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C b/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C
index 8214c2865f..d58678c4bd 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C
@@ -99,9 +99,8 @@ bool Foam::ReitzKHRT<CloudType>::update
     const scalar Urmag,
     const scalar tMom,
     scalar& dChild,
-    scalar& massChild,
-    cachedRandom& rndGen
-) const
+    scalar& massChild
+)
 {
     bool addParcel = false;
 
diff --git a/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.H b/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.H
index aa6e7a2f95..d14d92b81e 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.H
@@ -115,9 +115,8 @@ public:
             const scalar Urmag,
             const scalar tMom,
             scalar& dChild,
-            scalar& massChild,
-            cachedRandom& rndGen
-        ) const;
+            scalar& massChild
+        );
 };
 
 
diff --git a/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C b/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C
index 4d6f2d36a7..fc34d0c224 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C
@@ -135,10 +135,11 @@ bool Foam::SHF<CloudType>::update
     const scalar Urmag,
     const scalar tMom,
     scalar& dChild,
-    scalar& massChild,
-    cachedRandom& rndGen
-) const
+    scalar& massChild
+)
 {
+    cachedRandom& rndGen = this->owner().rndGen();
+
     bool addChild = false;
 
     scalar d03 = pow3(d);
diff --git a/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.H b/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.H
index 2bd0a7486d..2708488e0b 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.H
@@ -157,9 +157,8 @@ public:
             const scalar Urmag,
             const scalar tMom,
             scalar& dChild,
-            scalar& massChild,
-            cachedRandom& rndGen
-        ) const;
+            scalar& massChild
+        );
 };
 
 
diff --git a/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C b/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C
index fefce9dbe6..8838a73ea0 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C
@@ -123,10 +123,11 @@ bool Foam::TAB<CloudType>::update
     const scalar Urmag,
     const scalar tMom,
     scalar& dChild,
-    scalar& massChild,
-    cachedRandom& rndGen
-) const
+    scalar& massChild
+)
 {
+    cachedRandom& rndGen = this->owner().rndGen();
+
     scalar r = 0.5*d;
     scalar r2 = r*r;
     scalar r3 = r*r2;
diff --git a/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.H b/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.H
index 84af77f998..e5c9234666 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.H
+++ b/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.H
@@ -143,9 +143,8 @@ public:
             const scalar Urmag,
             const scalar tMom,
             scalar& dChild,
-            scalar& massChild,
-            cachedRandom& rndGen
-    ) const;
+            scalar& massChild
+    );
 };