From 9e1c122effd62ec6f9b20fc8f6e621edefa59b1b Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 5 Oct 2009 21:30:50 +0100
Subject: [PATCH] fvDOM updates

---
 .../radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C  |  2 +-
 .../radiation/radiationModel/fvDOM/fvDOM/fvDOM.C              | 11 ++++-------
 .../fvDOM/radiativeIntensityRay/radiativeIntensityRay.C       | 11 ++---------
 .../greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C   |  7 ++++---
 4 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C
index eeec89ce..041d0f7b 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C
@@ -99,7 +99,7 @@ void Foam::radiation::absorptionCoeffs::initialise(const dictionary& dict)
 {
     dict.lookup("Tcommon") >> Tcommon_;
     dict.lookup("Tlow") >> Tlow_;
-    dict.lookup("Tlow") >> Thigh_;
+    dict.lookup("Thigh") >> Thigh_;
     dict.lookup("invTemp") >> invTemp_;
 
     dict.lookup("loTcoeffs") >> lowACoeffs_;
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
index bfcf1309..e4c149bd 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C
@@ -26,10 +26,7 @@ License
 
 #include "fvDOM.H"
 #include "addToRunTimeSelectionTable.H"
-#include "fvm.H"
 
-#include "absorptionEmissionModel.H"
-#include "scatterModel.H"
 #include "mathematicalConstants.H"
 #include "radiationConstants.H"
 
@@ -64,7 +61,7 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T)
             mesh_.time().timeName(),
             mesh_,
             IOobject::NO_READ,
-            IOobject::NO_WRITE
+            IOobject::AUTO_WRITE
         ),
         mesh_,
         dimensionedScalar("G", dimMass/pow3(dimTime), 0.0)
@@ -168,7 +165,7 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T)
     {
         if (mesh_.nSolutionD() == 2)    //2D (X & Y)
         {
-            scalar thetai = mathematicalConstant::pi/2.0;
+            scalar thetai = mathematicalConstant::piByTwo;
             scalar deltaTheta = mathematicalConstant::pi;
             nRay_ = 4*nPhi_;
             IRay_.setSize(nRay_);
@@ -198,7 +195,7 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T)
         }
         else    //1D (X)
         {
-            scalar thetai = mathematicalConstant::pi/2.0;
+            scalar thetai = mathematicalConstant::piByTwo;
             scalar deltaTheta = mathematicalConstant::pi;
             nRay_ = 2;
             IRay_.setSize(nRay_);
@@ -346,7 +343,7 @@ Foam::radiation::fvDOM::Ru() const
     const DimensionedField<scalar, volMesh> a =
         a_.dimensionedInternalField(); //absorptionEmission_->aCont()()
 
-    return  a*G - 4.0*E;
+    return  a*G - E;
 }
 
 
diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
index ff22c633..79029be3 100644
--- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
+++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C
@@ -28,13 +28,6 @@ License
 #include "fvm.H"
 #include "fvDOM.H"
 
-#include "absorptionEmissionModel.H"
-#include "scatterModel.H"
-#include "mathematicalConstants.H"
-#include "radiationConstants.H"
-#include "radiationModel.H"
-#include "Vector2D.H"
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 Foam::label Foam::radiation::radiativeIntensityRay::rayId(0);
@@ -203,9 +196,9 @@ Foam::scalar Foam::radiation::radiativeIntensityRay::correct()
             fvm::div(Ji, ILambda_[lambdaI], "div(Ji,Ii_h)")
           + fvm::Sp(k*omega_, ILambda_[lambdaI])
          ==
-            1.0/Foam::mathematicalConstant::pi
+            1.0/Foam::mathematicalConstant::pi*omega_
            *(
-                k*omega_*blackBody_.bLambda(lambdaI)
+                k*blackBody_.bLambda(lambdaI)
               + absorptionEmission_.ECont(lambdaI)
             )
         );
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
index cdb57c0f..6204188f 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
@@ -259,10 +259,11 @@ Foam::radiation::greyMeanAbsorptionEmission::ECont(const label bandI) const
         )
     );
 
-    if (mesh_.foundObject<volScalarField>("hrr"))
+    if (mesh_.foundObject<volScalarField>("dQ"))
     {
-        const volScalarField& hrr = mesh_.lookupObject<volScalarField>("hrr");
-        E().internalField() = EhrrCoeff_*hrr.internalField();
+        const volScalarField& dQ =
+            mesh_.lookupObject<volScalarField>("dQ");
+        E().internalField() = EhrrCoeff_*dQ;
     }
 
     return E;
-- 
2.11.4.GIT