diff --git a/src/thermophysicalModels/radiation/Make/files b/src/thermophysicalModels/radiation/Make/files index ef657f1c13..54cd1a2872 100644 --- a/src/thermophysicalModels/radiation/Make/files +++ b/src/thermophysicalModels/radiation/Make/files @@ -40,7 +40,7 @@ submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmiss submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C -submodels/absorptionEmissionModel/multiBandSolidAbsorptionEmission/multiBandSolidAbsorptionEmission.C +submodels/absorptionEmissionModel/multiBandAbsorptionEmission/multiBandAbsorptionEmission.C submodels/boundaryRadiationProperties/boundaryRadiationProperties.C submodels/boundaryRadiationProperties/boundaryRadiationPropertiesPatch.C diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C index 4f762f564b..b594a78df6 100644 --- a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C +++ b/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C @@ -218,10 +218,10 @@ updateCoeffs() // Looking for primary heat flux single band Ir += patch().lookupPatchField ( - dom.primaryFluxName_ + "_" + name(lambdaId - 1) + dom.primaryFluxName_ + "_" + name(lambdaId) ); - word qSecName = dom.relfectedFluxName_ + "_" + name(lambdaId - 1); + word qSecName = dom.relfectedFluxName_ + "_" + name(lambdaId); if (this->db().foundObject(qSecName)) { diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C index d5eef9f0be..de580fc81c 100644 --- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C +++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C @@ -188,18 +188,18 @@ void Foam::radiation::fvDOM::initialise() Info<< endl; - this->readIfPresent("useSolarLoad", useSolarLoad_); + coeffs_.readIfPresent("useSolarLoad", useSolarLoad_); if (useSolarLoad_) { - const dictionary& solarDict = this->subDict("solarLoarCoeffs"); + const dictionary& solarDict = this->subDict("solarLoadCoeffs"); solarLoad_.reset(new solarLoad(solarDict, T_)); - if (solarLoad_->nBands() > 1) + if (solarLoad_->nBands() != this->nBands()) { FatalErrorInFunction << "Requested solar radiation with fvDOM. Using " - << "more than one band for the solar load is not allowed" + << "different number of bands for the solar load is not allowed" << abort(FatalError); } diff --git a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C index 8a28b31434..8b825afcac 100644 --- a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C +++ b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C @@ -88,14 +88,23 @@ void Foam::radiation::radiationModel::initialise() { solverFreq_ = max(1, lookupOrDefault