From 4459d245b73e114f0709081d49e9fb8eecc80a5b Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 20 May 2009 17:31:46 +0100 Subject: [PATCH] updates to bring in to line with radiation lib --- .../cloudAbsorptionEmission.C | 6 ++--- .../cloudAbsorptionEmission.H | 6 ++--- .../binaryAbsorptionEmission.C | 24 +++++++++---------- .../binaryAbsorptionEmission.H | 12 +++++----- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C index de19513e4a..fae1d15e6b 100644 --- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C +++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C @@ -72,7 +72,7 @@ Foam::radiation::cloudAbsorptionEmission::~cloudAbsorptionEmission() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // Foam::tmp -Foam::radiation::cloudAbsorptionEmission::aDisp() const +Foam::radiation::cloudAbsorptionEmission::aDisp(const label) const { tmp ta ( @@ -107,7 +107,7 @@ Foam::radiation::cloudAbsorptionEmission::aDisp() const Foam::tmp -Foam::radiation::cloudAbsorptionEmission::eDisp() const +Foam::radiation::cloudAbsorptionEmission::eDisp(const label bandI) const { tmp te ( @@ -132,7 +132,7 @@ Foam::radiation::cloudAbsorptionEmission::eDisp() const Foam::tmp -Foam::radiation::cloudAbsorptionEmission::EDisp() const +Foam::radiation::cloudAbsorptionEmission::EDisp(const label bandI) const { tmp tE ( diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H index 033ed351d5..a737764e88 100644 --- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H +++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H @@ -85,19 +85,19 @@ public: // Absorption coefficient //- Absorption coefficient for dispersed phase - tmp aDisp() const; + virtual tmp aDisp(const label bandI = 0) const; // Emission coefficient //- Emission coefficient for dispersed phase - tmp eDisp() const; + virtual tmp eDisp(const label bandI = 0) const; // Emission contribution //- Return emission contribution for dispersed phase - tmp EDisp() const; + virtual tmp EDisp(const label bandI = 0) const; }; diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C index 15d8c37a31..5cc3ac9b27 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C @@ -75,44 +75,44 @@ Foam::radiation::binaryAbsorptionEmission::~binaryAbsorptionEmission() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // Foam::tmp -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::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::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::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::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::radiation::binaryAbsorptionEmission::EDisp() const +Foam::radiation::binaryAbsorptionEmission::EDisp(const label bandI) const { - return model1_->EDisp() + model2_->EDisp(); + return model1_->EDisp(bandI) + model2_->EDisp(bandI); } diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H index 68ad204b84..d5cec44a8f 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H @@ -92,28 +92,28 @@ public: // Absorption coefficient //- Absorption coefficient for continuous phase - tmp aCont() const; + virtual tmp aCont(const label bandI = 0) const; //- Absorption coefficient for dispersed phase - tmp aDisp() const; + virtual tmp aDisp(const label bandI = 0) const; // Emission coefficient //- Emission coefficient for continuous phase - tmp eCont() const; + virtual tmp eCont(const label bandI = 0) const; //- Emission coefficient for dispersed phase - tmp eDisp() const; + virtual tmp eDisp(const label bandI = 0) const; // Emission contribution //- Emission contribution for continuous phase - tmp ECont() const; + virtual tmp ECont(const label bandI = 0) const; //- Emission contribution for continuous phase - tmp EDisp() const; + virtual tmp EDisp(const label bandI = 0) const; };