diff --git a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C index 28644026a4c6f219db81e7d81ada8c3ba066963a..f2bcf8a4f2649179bb1e143ffcf103b56207ed56 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 563b46727fe2de82f56de3176e2dc6a3b01085fd..602bd3e9e9d3c7f0f06a3c365595bd00951f12f6 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::volScalarField> -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 dc6c37776e9089c9d8a5127341d2a50233b18eee..902ebc180b26f2ebaad9398865b34a05d1fbc349 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<volScalarField> 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 230fb0330709a8309e518d62b2ac54d9cf99cb5d..a1bf1cc01c1f0253613f992d80b85f938fcf9e8c 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::volScalarField> -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 1fe02beb4d29a0536ca44550f2a198904cc28a62..629fa1736c915abbda98733037c431efa763003a 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<volScalarField> addIntensity - ( - const label i, - const volScalarField& ILambda - ) const; - + //- Correct rays void correct ( volScalarField& a_,