From 283f1c2981ac3f1f34b4e7919303ff0a66f77256 Mon Sep 17 00:00:00 2001 From: sergio Date: Thu, 20 Mar 2014 15:32:31 +0000 Subject: [PATCH] BUG: Correct addIntensity function for radiativeIntensityRay for grey and wide band absorption model --- .../radiativeIntensityRay/radiativeIntensityRay.C | 4 ++-- .../absorptionEmissionModel.C | 13 +------------ .../absorptionEmissionModel.H | 9 +-------- .../wideBandAbsorptionEmission.C | 12 +----------- .../wideBandAbsorptionEmission.H | 11 ++--------- 5 files changed, 7 insertions(+), 42 deletions(-) diff --git a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C index 28644026..f2bcf8a4 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C +++ b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -270,7 +270,7 @@ void Foam::radiation::radiativeIntensityRay::addIntensity() forAll(ILambda_, lambdaI) { - I_ += absorptionEmission_.addIntensity(lambdaI, ILambda_[lambdaI]); + I_ += ILambda_[lambdaI]; } } diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C index 563b4672..602bd3e9 100644 --- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C +++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -235,17 +235,6 @@ bool Foam::radiation::absorptionEmissionModel::isGrey() const } -Foam::tmp -Foam::radiation::absorptionEmissionModel::addIntensity -( - const label rayI, - const volScalarField& ILambda -) const -{ - return ILambda; -} - - void Foam::radiation::absorptionEmissionModel::correct ( volScalarField& a, diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H index dc6c3777..902ebc18 100644 --- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H +++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -170,13 +170,6 @@ public: //- Flag for whether the absorption/emission is for a grey gas virtual bool isGrey() const; - //- Add radiative intensity for ray i - virtual tmp addIntensity - ( - const label rayI, - const volScalarField& ILambda - ) const; - //- Correct absorption coefficients virtual void correct ( diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C index 230fb033..a1bf1cc0 100644 --- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C +++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -293,16 +293,6 @@ Foam::radiation::wideBandAbsorptionEmission::ECont(const label bandI) const return E; } -Foam::tmp -Foam::radiation::wideBandAbsorptionEmission::addIntensity -( - const label i, - const volScalarField& ILambda -) const -{ - return ILambda*(iBands_[i][1] - iBands_[i][0])/totalWaveLength_; -} - void Foam::radiation::wideBandAbsorptionEmission::correct ( diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H index 1fe02beb..629fa173 100644 --- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H +++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -227,14 +227,7 @@ public: return iBands_[i]; } - //- Add contribution of ILambda to the total radiative intensity in - // direction i - tmp addIntensity - ( - const label i, - const volScalarField& ILambda - ) const; - + //- Correct rays void correct ( volScalarField& a_,