refactoring IWave->ILambda

This commit is contained in:
andy
2009-03-23 09:46:49 +00:00
parent 950be411ce
commit 62379add0d
9 changed files with 23 additions and 23 deletions

View File

@ -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];

View File

@ -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];

View File

@ -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

View File

@ -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);
}

View File

@ -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]);
}
}

View File

@ -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;
};

View File

@ -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];
}

View File

@ -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;
}

View File

@ -175,7 +175,7 @@ public:
virtual tmp<volScalarField> addRadInt
(
const label rayI,
const volScalarField& IWave
const volScalarField& ILambda
) const;
//- Correct absorption coefficients