Commit 9fdba24b authored by mattijs's avatar mattijs
Browse files

Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-2.0/

parents 3a5f546a a044048c
......@@ -121,32 +121,6 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T)
mesh_,
dimensionedScalar("a", dimless/dimLength, 0.0)
),
e_
(
IOobject
(
"e",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensionedScalar("a", dimless/dimLength, 0.0)
),
E_
(
IOobject
(
"E",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensionedScalar("E", dimMass/dimLength/pow3(dimTime), 0.0)
),
nTheta_(readLabel(coeffs_.lookup("nTheta"))),
nPhi_(readLabel(coeffs_.lookup("nPhi"))),
nRay_(0),
......
......@@ -92,12 +92,6 @@ class fvDOM
//- Total absorption coefficient [1/m]
volScalarField a_;
//- Total emission coefficient [1/m]
volScalarField e_;
//- Emission contribution [Kg/m/s^3]
volScalarField E_;
//- Number of solid angles in theta
label nTheta_;
......
......@@ -27,6 +27,7 @@ License
#include "addToRunTimeSelectionTable.H"
#include "unitConversion.H"
#include "zeroGradientFvPatchFields.H"
#include "basicMultiComponentMixture.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
......@@ -59,17 +60,24 @@ Foam::radiation::greyMeanAbsorptionEmission::greyMeanAbsorptionEmission
speciesNames_(0),
specieIndex_(0),
lookUpTablePtr_(),
thermo_
(
mesh,
const_cast<basicThermo&>
(
mesh.lookupObject<basicThermo>("thermophysicalProperties")
)
),
thermo_(mesh.lookupObject<basicThermo>("thermophysicalProperties")),
EhrrCoeff_(readScalar(coeffsDict_.lookup("EhrrCoeff"))),
Yj_(nSpecies_)
{
if (!isA<basicMultiComponentMixture>(thermo_))
{
FatalErrorIn
(
"radiation::greyMeanAbsorptionEmission::greyMeanAbsorptionEmission"
"("
"const dictionary&, "
"const fvMesh&"
")"
) << "Model requires a multi-component thermo package"
<< abort(FatalError);
}
label nFunc = 0;
const dictionary& functionDicts = dict.subDict(typeName + "Coeffs");
......@@ -195,10 +203,12 @@ Foam::radiation::greyMeanAbsorptionEmission::~greyMeanAbsorptionEmission()
Foam::tmp<Foam::volScalarField>
Foam::radiation::greyMeanAbsorptionEmission::aCont(const label bandI) const
{
const volScalarField& T = thermo_.thermo().T();
const volScalarField& p = thermo_.thermo().p();
const basicMultiComponentMixture& mixture =
dynamic_cast<const basicMultiComponentMixture&>(thermo_);
const volScalarField& T = thermo_.T();
const volScalarField& p = thermo_.p();
const basicMultiComponentMixture& mixture = thermo_.carrier();
tmp<volScalarField> ta
(
......@@ -206,7 +216,7 @@ Foam::radiation::greyMeanAbsorptionEmission::aCont(const label bandI) const
(
IOobject
(
"a",
"aCont" + name(bandI),
mesh().time().timeName(),
mesh(),
IOobject::NO_READ,
......@@ -280,7 +290,7 @@ Foam::radiation::greyMeanAbsorptionEmission::eCont(const label bandI) const
(
IOobject
(
"e",
"eCont" + name(bandI),
mesh().time().timeName(),
mesh(),
IOobject::NO_READ,
......@@ -304,7 +314,7 @@ Foam::radiation::greyMeanAbsorptionEmission::ECont(const label bandI) const
(
IOobject
(
"E",
"ECont" + name(bandI),
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
......
......@@ -89,8 +89,7 @@ SourceFiles
#include "absorptionEmissionModel.H"
#include "HashTable.H"
#include "absorptionCoeffs.H"
#include "SLGThermo.H"
//#include "basicThermo.H"
#include "basicThermo.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......@@ -135,7 +134,7 @@ private:
mutable autoPtr<interpolationLookUpTable<scalar> > lookUpTablePtr_;
//- SLG thermo package
SLGThermo thermo_;
const basicThermo& thermo_;
//- Emission constant coefficient
const scalar EhrrCoeff_;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment