updates to bring in to line with radiation lib

This commit is contained in:
andy
2009-05-20 17:31:46 +01:00
parent 69e2eefdb0
commit 4459d245b7
4 changed files with 24 additions and 24 deletions

View File

@ -72,7 +72,7 @@ Foam::radiation::cloudAbsorptionEmission::~cloudAbsorptionEmission()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::tmp<Foam::volScalarField> Foam::tmp<Foam::volScalarField>
Foam::radiation::cloudAbsorptionEmission::aDisp() const Foam::radiation::cloudAbsorptionEmission::aDisp(const label) const
{ {
tmp<volScalarField> ta tmp<volScalarField> ta
( (
@ -107,7 +107,7 @@ Foam::radiation::cloudAbsorptionEmission::aDisp() const
Foam::tmp<Foam::volScalarField> Foam::tmp<Foam::volScalarField>
Foam::radiation::cloudAbsorptionEmission::eDisp() const Foam::radiation::cloudAbsorptionEmission::eDisp(const label bandI) const
{ {
tmp<volScalarField> te tmp<volScalarField> te
( (
@ -132,7 +132,7 @@ Foam::radiation::cloudAbsorptionEmission::eDisp() const
Foam::tmp<Foam::volScalarField> Foam::tmp<Foam::volScalarField>
Foam::radiation::cloudAbsorptionEmission::EDisp() const Foam::radiation::cloudAbsorptionEmission::EDisp(const label bandI) const
{ {
tmp<volScalarField> tE tmp<volScalarField> tE
( (

View File

@ -85,19 +85,19 @@ public:
// Absorption coefficient // Absorption coefficient
//- Absorption coefficient for dispersed phase //- Absorption coefficient for dispersed phase
tmp<volScalarField> aDisp() const; virtual tmp<volScalarField> aDisp(const label bandI = 0) const;
// Emission coefficient // Emission coefficient
//- Emission coefficient for dispersed phase //- Emission coefficient for dispersed phase
tmp<volScalarField> eDisp() const; virtual tmp<volScalarField> eDisp(const label bandI = 0) const;
// Emission contribution // Emission contribution
//- Return emission contribution for dispersed phase //- Return emission contribution for dispersed phase
tmp<volScalarField> EDisp() const; virtual tmp<volScalarField> EDisp(const label bandI = 0) const;
}; };

View File

@ -75,44 +75,44 @@ Foam::radiation::binaryAbsorptionEmission::~binaryAbsorptionEmission()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::tmp<Foam::volScalarField> Foam::tmp<Foam::volScalarField>
Foam::radiation::binaryAbsorptionEmission::aCont() const Foam::radiation::binaryAbsorptionEmission::aCont(const label bandI) const
{ {
return model1_->aCont() + model2_->aCont(); return model1_->aCont(bandI) + model2_->aCont(bandI);
} }
Foam::tmp<Foam::volScalarField> Foam::tmp<Foam::volScalarField>
Foam::radiation::binaryAbsorptionEmission::aDisp() const Foam::radiation::binaryAbsorptionEmission::aDisp(const label bandI) const
{ {
return model1_->aDisp() + model2_->aDisp(); return model1_->aDisp(bandI) + model2_->aDisp(bandI);
} }
Foam::tmp<Foam::volScalarField> Foam::tmp<Foam::volScalarField>
Foam::radiation::binaryAbsorptionEmission::eCont() const Foam::radiation::binaryAbsorptionEmission::eCont(const label bandI) const
{ {
return model1_->eCont() + model2_->eCont(); return model1_->eCont(bandI) + model2_->eCont(bandI);
} }
Foam::tmp<Foam::volScalarField> Foam::tmp<Foam::volScalarField>
Foam::radiation::binaryAbsorptionEmission::eDisp() const Foam::radiation::binaryAbsorptionEmission::eDisp(const label bandI) const
{ {
return model1_->eDisp() + model2_->eDisp(); return model1_->eDisp(bandI) + model2_->eDisp(bandI);
} }
Foam::tmp<Foam::volScalarField> Foam::tmp<Foam::volScalarField>
Foam::radiation::binaryAbsorptionEmission::ECont() const Foam::radiation::binaryAbsorptionEmission::ECont(const label bandI) const
{ {
return model1_->ECont() + model2_->ECont(); return model1_->ECont(bandI) + model2_->ECont(bandI);
} }
Foam::tmp<Foam::volScalarField> Foam::tmp<Foam::volScalarField>
Foam::radiation::binaryAbsorptionEmission::EDisp() const Foam::radiation::binaryAbsorptionEmission::EDisp(const label bandI) const
{ {
return model1_->EDisp() + model2_->EDisp(); return model1_->EDisp(bandI) + model2_->EDisp(bandI);
} }

View File

@ -92,28 +92,28 @@ public:
// Absorption coefficient // Absorption coefficient
//- Absorption coefficient for continuous phase //- Absorption coefficient for continuous phase
tmp<volScalarField> aCont() const; virtual tmp<volScalarField> aCont(const label bandI = 0) const;
//- Absorption coefficient for dispersed phase //- Absorption coefficient for dispersed phase
tmp<volScalarField> aDisp() const; virtual tmp<volScalarField> aDisp(const label bandI = 0) const;
// Emission coefficient // Emission coefficient
//- Emission coefficient for continuous phase //- Emission coefficient for continuous phase
tmp<volScalarField> eCont() const; virtual tmp<volScalarField> eCont(const label bandI = 0) const;
//- Emission coefficient for dispersed phase //- Emission coefficient for dispersed phase
tmp<volScalarField> eDisp() const; virtual tmp<volScalarField> eDisp(const label bandI = 0) const;
// Emission contribution // Emission contribution
//- Emission contribution for continuous phase //- Emission contribution for continuous phase
tmp<volScalarField> ECont() const; virtual tmp<volScalarField> ECont(const label bandI = 0) const;
//- Emission contribution for continuous phase //- Emission contribution for continuous phase
tmp<volScalarField> EDisp() const; virtual tmp<volScalarField> EDisp(const label bandI = 0) const;
}; };