From adcebb9e1fed5b606b71a92efbd1c32c09b49edf Mon Sep 17 00:00:00 2001
From: sergio <s.ferraris@opencfd.co.uk>
Date: Fri, 14 Jan 2011 18:07:51 +0000
Subject: [PATCH] BUG: Numeration of rayIDs for multi region cases

---
 .../radiation/radiationModel/fvDOM/fvDOM/fvDOM.C         | 9 ++++++---
 .../fvDOM/radiativeIntensityRay/radiativeIntensityRay.C  | 8 ++------
 .../fvDOM/radiativeIntensityRay/radiativeIntensityRay.H  | 3 ++-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
index dca6315cb7..3ef7c1b0e8 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
@@ -157,7 +157,8 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T)
                         deltaTheta,
                         nLambda_,
                         absorptionEmission_,
-                        blackBody_
+                        blackBody_,
+                        i
                     )
                 );
                 i++;
@@ -190,7 +191,8 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T)
                         deltaTheta,
                         nLambda_,
                         absorptionEmission_,
-                        blackBody_
+                        blackBody_,
+                        i
                     )
                 );
                 i++;
@@ -220,7 +222,8 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T)
                         deltaTheta,
                         nLambda_,
                         absorptionEmission_,
-                        blackBody_
+                        blackBody_,
+                        i
                     )
                 );
                 i++;
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
index 89b8e5725c..bc9f0e85d9 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
@@ -30,9 +30,6 @@ License
 
 using namespace Foam::constant;
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-Foam::label Foam::radiation::radiativeIntensityRay::rayId(0);
 
 const Foam::word
 Foam::radiation::radiativeIntensityRay::intensityPrefix("ILambda");
@@ -50,7 +47,8 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay
     const scalar deltaTheta,
     const label nLambda,
     const absorptionEmissionModel& absorptionEmission,
-    const blackBodyEmission& blackBody
+    const blackBodyEmission& blackBody,
+    const label rayId
 )
 :
     dom_(dom),
@@ -167,7 +165,6 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay
             );
         }
     }
-    rayId++;
 }
 
 
@@ -182,7 +179,6 @@ Foam::radiation::radiativeIntensityRay::~radiativeIntensityRay()
 Foam::scalar Foam::radiation::radiativeIntensityRay::correct()
 {
     // reset boundary heat flux to zero
-    //Qr_ = dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0);
     Qr_.boundaryField() = 0.0;
 
     scalar maxResidual = -GREAT;
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H
index a795052305..4c1d3bf31d 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H
@@ -130,7 +130,8 @@ public:
             const scalar deltaTheta,
             const label lambda,
             const absorptionEmissionModel& absEmmModel_,
-            const blackBodyEmission& blackBody
+            const blackBodyEmission& blackBody,
+            const label rayId
         );