From 5848b0afd5c931a3e85d673638bae6dab29ce62d Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Fri, 8 Jun 2018 16:55:27 -0700
Subject: [PATCH] BUG: Fixing ray dAve and omega for 1D and 2D cases

---
 .../radiativeIntensityRay.C                     | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
index 813ce53c47f..c27dde027f8 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -137,6 +137,17 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay
 
     if (mesh_.nSolutionD() == 2)
     {
+        // Omega for 2D
+        omega_ = deltaPhi;
+
+        // dAve for 2D
+        dAve_ = vector
+        (
+            2*sinPhi*Foam::sin(0.5*deltaPhi),
+            2*cosPhi*Foam::sin(0.5*deltaPhi),
+            0
+        );
+
         vector meshDir(Zero);
         if (dom_.meshOrientation() != vector::zero)
         {
@@ -158,6 +169,7 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay
 
         dAve_ = coordRot & dAve_;
         d_ = coordRot & d_;
+
     }
     else if (mesh_.nSolutionD() == 1)
     {
@@ -180,6 +192,9 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay
 
         dAve_ = (dAve_ & normal)*meshDir;
         d_ = (d_ & normal)*meshDir;
+
+        // Omega normalization for 1D
+        omega_ /= 2;
     }
 
     autoPtr<volScalarField> IDefaultPtr;
-- 
GitLab