From 9ece58af9d0a303c44d2345d3981a6870ddf5fa3 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Thu, 13 Apr 2017 13:57:33 +0100 Subject: [PATCH] radiationModel: Added "he" argument to the "Sh" function for consistency with the other energy sources. --- applications/solvers/combustion/fireFoam/YEEqn.H | 2 +- .../solvers/heatTransfer/buoyantPimpleFoam/EEqn.H | 2 +- .../solvers/heatTransfer/buoyantSimpleFoam/EEqn.H | 2 +- .../chtMultiRegionSimpleFoam/fluid/EEqn.H | 2 +- .../heatTransfer/chtMultiRegionFoam/fluid/EEqn.H | 2 +- applications/solvers/heatTransfer/thermoFoam/EEqn.H | 2 +- .../solvers/lagrangian/coalChemistryFoam/EEqn.H | 2 +- .../solvers/lagrangian/reactingParcelFilmFoam/EEqn.H | 2 +- .../solvers/lagrangian/reactingParcelFoam/EEqn.H | 4 ++-- .../reactingParcelFoam/simpleReactingParcelFoam/EEqn.H | 2 +- .../radiationModels/radiationModel/radiationModel.C | 8 ++++---- .../radiationModels/radiationModel/radiationModel.H | 10 +++++++--- 12 files changed, 22 insertions(+), 18 deletions(-) diff --git a/applications/solvers/combustion/fireFoam/YEEqn.H b/applications/solvers/combustion/fireFoam/YEEqn.H index f72d574d9..de70ace85 100644 --- a/applications/solvers/combustion/fireFoam/YEEqn.H +++ b/applications/solvers/combustion/fireFoam/YEEqn.H @@ -67,7 +67,7 @@ tmp> mvConvection - fvm::laplacian(turbulence->alphaEff(), he) == Qdot - + radiation->Sh(thermo) + + radiation->Sh(thermo, he) + parcels.Sh(he) + surfaceFilm.Sh() + fvOptions(rho, he) diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H index ddd21254a..f0a7e3ad3 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H @@ -18,7 +18,7 @@ - fvm::laplacian(turbulence->alphaEff(), he) == rho*(U&g) - + radiation->Sh(thermo) + + radiation->Sh(thermo, he) + fvOptions(rho, he) ); diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H index b9782d3f7..e932d2fde 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H @@ -12,7 +12,7 @@ - fvm::laplacian(turbulence->alphaEff(), he) == rho*(U&g) - + radiation->Sh(thermo) + + radiation->Sh(thermo, he) + fvOptions(rho, he) ); diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/EEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/EEqn.H index b61847886..daf3af8f2 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/EEqn.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/EEqn.H @@ -12,7 +12,7 @@ - fvm::laplacian(turb.alphaEff(), he) == rho*(U&g) - + rad.Sh(thermo) + + rad.Sh(thermo, he) + fvOptions(rho, he) ); diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H index eafea3fd4..d8f4516f5 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H @@ -18,7 +18,7 @@ - fvm::laplacian(turb.alphaEff(), he) == rho*(U&g) - + rad.Sh(thermo) + + rad.Sh(thermo, he) + fvOptions(rho, he) ); diff --git a/applications/solvers/heatTransfer/thermoFoam/EEqn.H b/applications/solvers/heatTransfer/thermoFoam/EEqn.H index 51232bf0b..98a248ac3 100644 --- a/applications/solvers/heatTransfer/thermoFoam/EEqn.H +++ b/applications/solvers/heatTransfer/thermoFoam/EEqn.H @@ -17,7 +17,7 @@ ) - fvm::laplacian(alphaEff, he) == - radiation->Sh(thermo) + radiation->Sh(thermo, he) + fvOptions(rho, he) ); diff --git a/applications/solvers/lagrangian/coalChemistryFoam/EEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/EEqn.H index 1a1f014da..6f1ad9041 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/EEqn.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/EEqn.H @@ -21,7 +21,7 @@ + Qdot + coalParcels.Sh(he) + limestoneParcels.Sh(he) - + radiation->Sh(thermo) + + radiation->Sh(thermo, he) + fvOptions(rho, he) ); diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/EEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/EEqn.H index 325009f06..4d112da03 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/EEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/EEqn.H @@ -20,7 +20,7 @@ rho*(U&g) + parcels.Sh(he) + surfaceFilm.Sh() - + radiation->Sh(thermo) + + radiation->Sh(thermo, he) + Qdot + fvOptions(rho, he) ); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/EEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/EEqn.H index 2ba1ef693..42185b8af 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/EEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/EEqn.H @@ -19,7 +19,7 @@ == rho*(U&g) + parcels.Sh(he) - + radiation->Sh(thermo) + + radiation->Sh(thermo, he) + Qdot + fvOptions(rho, he) ); @@ -35,6 +35,6 @@ thermo.correct(); radiation->correct(); - Info<< "T gas min/max = " << min(T).value() << ", " + Info<< "T gas min/max " << min(T).value() << ", " << max(T).value() << endl; } diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/EEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/EEqn.H index 9bc125442..c8baf6bea 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/EEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/EEqn.H @@ -13,7 +13,7 @@ == rho*(U&g) + parcels.Sh(he) - + radiation->Sh(thermo) + + radiation->Sh(thermo, he) + Qdot + fvOptions(rho, he) ); diff --git a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C index 22312d5da..368326d46 100644 --- a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C +++ b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,7 +28,7 @@ License #include "scatterModel.H" #include "sootModel.H" #include "fvmSup.H" -#include "fluidThermo.H" +#include "basicThermo.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -228,10 +228,10 @@ void Foam::radiation::radiationModel::correct() Foam::tmp Foam::radiation::radiationModel::Sh ( - fluidThermo& thermo + const basicThermo& thermo, + const volScalarField& he ) const { - volScalarField& he = thermo.he(); const volScalarField Cpv(thermo.Cpv()); const volScalarField T3(pow3(T_)); diff --git a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H index 7b46c3873..557684982 100644 --- a/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H +++ b/src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -54,7 +54,7 @@ SourceFiles namespace Foam { -class fluidThermo; +class basicThermo; class fvMesh; namespace radiation @@ -224,7 +224,11 @@ public: virtual tmp Ru() const = 0; //- Energy source term - virtual tmp Sh(fluidThermo& thermo) const; + virtual tmp Sh + ( + const basicThermo& thermo, + const volScalarField& he + ) const; //- Temperature source term virtual tmp ST