diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C index 7d4e3f748ba93f1e5a3c7783006767b6b4bf5f9b..f65e59da613dd50fe161e8a0d0efa3921b687272 100644 --- a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C +++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C @@ -196,7 +196,7 @@ updateCoeffs() for (label lambdaI=0; lambdaI < dom.nLambda(); lambdaI++) { const volScalarField& radiationField = - dom.IRayWave(rayI, lambdaI); + dom.IRayLambda(rayI, lambdaI); if ( &(radiationField.internalField()) @@ -240,7 +240,7 @@ updateCoeffs() const vector& d = dom.IRay(rayI).d(); const scalarField& Iface = - dom.IRay(rayI).IWave + dom.IRay(rayI).ILambda ( wavelengthId_ ).boundaryField()[patchI]; diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C index 7937da15352120c4ca08e8f4f89265492903db04..b76da62624fdedb52bad547b6a01fc1728549a0e 100644 --- a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C +++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C @@ -191,7 +191,7 @@ updateCoeffs() for (label lambdaI=0; lambdaI < dom.nLambda(); lambdaI++) { const volScalarField& radiationField = - dom.IRayWave(rayI, lambdaI); + dom.IRayLambda(rayI, lambdaI); if ( &(radiationField.internalField()) @@ -236,7 +236,7 @@ updateCoeffs() const vector& d = dom.IRay(rayI).d(); const scalarField& Iface = - dom.IRay(rayI).IWave + dom.IRay(rayI).ILambda ( wavelengthId_ ).boundaryField()[patchI]; diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.H b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.H index b6139fb4d88787630fc71a0b45a42d23c96c657b..79899701778b5418ad96b7bbecae829859340f92 100644 --- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.H +++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.H @@ -181,7 +181,7 @@ public: inline const radiativeIntensityRay& IRay(const label rayI) const; //- Ray intensity for rayI and lambda bandwidth - inline const volScalarField& IRayWave + inline const volScalarField& IRayLambda ( const label rayI, const label lambdaI diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOMI.H b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOMI.H index 74e0b2bf345a29f4299e2b1d0137b0f0d51d31a5..982b0f673b5101cb36248485d9ca6e3d6ccb4e3d 100644 --- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOMI.H +++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOMI.H @@ -32,13 +32,13 @@ Foam::radiation::fvDOM::IRay(const label rayI) const inline const Foam::volScalarField& -Foam::radiation::fvDOM::IRayWave +Foam::radiation::fvDOM::IRayLambda ( const label rayI, const label lambdaI ) const { - return IRay_[rayI].IWave(lambdaI); + return IRay_[rayI].ILambda(lambdaI); } diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C index 6ffcf66697859a951729bbfb8975bc17814dfb90..6d387ce4e74ef05c013025d6f6a34041e4dfce29 100644 --- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C +++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C @@ -91,7 +91,7 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay phi_(phi), omega_(0.0), nLambda_(nLambda), - IWave_(nLambda) + ILambda_(nLambda) { scalar sinTheta = Foam::sin(theta); scalar cosTheta = Foam::cos(theta); @@ -113,7 +113,7 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay 0.5*deltaPhi*Foam::sin(2.0*theta)*Foam::sin(deltaTheta) ); - forAll(IWave_, i) + forAll(ILambda_, i) { IOobject IHeader ( @@ -127,7 +127,7 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay // check if field exists and can be read if (IHeader.headerOk()) { - IWave_.set + ILambda_.set ( i, new volScalarField(IHeader, mesh_) @@ -148,7 +148,7 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay mesh_ ); - IWave_.set + ILambda_.set ( i, new volScalarField(IHeader, IDefault) @@ -174,7 +174,7 @@ Foam::scalar Foam::radiation::radiativeIntensityRay::correct() scalar maxResidual = -GREAT; - forAll(IWave_, lambdaI) + forAll(ILambda_, lambdaI) { const volScalarField& k = dom_.aj(lambdaI); @@ -182,8 +182,8 @@ Foam::scalar Foam::radiation::radiativeIntensityRay::correct() fvScalarMatrix IiEq ( - fvm::div(Ji, IWave_[lambdaI], " div(Ji,Ii_h)") - + fvm::Sp(k*omega_, IWave_[lambdaI]) + fvm::div(Ji, ILambda_[lambdaI], " div(Ji,Ii_h)") + + fvm::Sp(k*omega_, ILambda_[lambdaI]) == 1.0/Foam::mathematicalConstant::pi *( @@ -212,9 +212,9 @@ void Foam::radiation::radiativeIntensityRay::addIntensity() { I_ = dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0); - forAll(IWave_, lambdaI) + forAll(ILambda_, lambdaI) { - I_ += absorptionEmission_.addRadInt(lambdaI, IWave_[lambdaI]); + I_ += absorptionEmission_.addRadInt(lambdaI, ILambda_[lambdaI]); } } diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H index 62a08ec13b2d4fd6066905c894fe9ed23a0b1264..0f26639064addb935697a51a9ac0bf92ba600730 100644 --- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H +++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H @@ -94,7 +94,7 @@ class radiativeIntensityRay label nLambda_; //- List of pointers to radiative intensity fields for given wavelengths - PtrList<volScalarField> IWave_; + PtrList<volScalarField> ILambda_; // Private member functions @@ -185,7 +185,7 @@ public: inline scalar omega() const; //- Return the radiative intensity for a given wavelength - inline const volScalarField& IWave(const label lambdaI) const; + inline const volScalarField& ILambda(const label lambdaI) const; }; diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H index 782b1fc422ef7a1f573dd4f5d57ee0ebceeea3aa..0efd423a6dc08efb6a113900e5ac8c6f43b44874 100644 --- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H +++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H @@ -78,12 +78,12 @@ inline Foam::scalar Foam::radiation::radiativeIntensityRay::omega() const } -inline const Foam::volScalarField& Foam::radiation::radiativeIntensityRay::IWave +inline const Foam::volScalarField& Foam::radiation::radiativeIntensityRay::ILambda ( const label lambdaI ) const { - return IWave_[lambdaI]; + return ILambda_[lambdaI]; } diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C index e787a2a8500ff3cc71fe8085149b7e0656bfcf21..06f3c7d7a6e5e81233f8dc980736b0131d0e12ba 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C @@ -240,10 +240,10 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::absorptionEmissionModel::addRadInt ( const label rayI, - const volScalarField& IWave + const volScalarField& ILambda ) const { - return IWave; + return ILambda; } diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H index 5b0c3dbbd7ebfb055001bd8f75335b591d6e63c3..e1ecde2a9309c3aa7419d4cf7a13c48d19bc0a06 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H @@ -175,7 +175,7 @@ public: virtual tmp<volScalarField> addRadInt ( const label rayI, - const volScalarField& IWave + const volScalarField& ILambda ) const; //- Correct absorption coefficients