zhyang-dev/OpenFOAM-5.x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radiationModel: Added "he" argument to the "Sh" function

Browse Source 
for consistency with the other energy sources.
This commit is contained in:
Henry Weller
2017-04-13 13:57:33 +01:00
parent e3c67dc111
commit 9ece58af9d
12 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/combustion/fireFoam/YEEqn.H
View File

@ -67,7 +67,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
- fvm::laplacian(turbulence->alphaEff(), he)
==
Qdot
+ radiation->Sh(thermo)
+ radiation->Sh(thermo, he)
+ parcels.Sh(he)
+ surfaceFilm.Sh()
+ fvOptions(rho, he)

2
applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H
View File

@ -18,7 +18,7 @@
- fvm::laplacian(turbulence->alphaEff(), he)
==
rho*(U&g)
+ radiation->Sh(thermo)
+ radiation->Sh(thermo, he)
+ fvOptions(rho, he)
);

2
applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H
View File

@ -12,7 +12,7 @@
- fvm::laplacian(turbulence->alphaEff(), he)
==
rho*(U&g)
+ radiation->Sh(thermo)
+ radiation->Sh(thermo, he)
+ fvOptions(rho, he)
);

2
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/EEqn.H
View File

@ -12,7 +12,7 @@
- fvm::laplacian(turb.alphaEff(), he)
==
rho*(U&g)
+ rad.Sh(thermo)
+ rad.Sh(thermo, he)
+ fvOptions(rho, he)
);

2
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H
View File

@ -18,7 +18,7 @@
- fvm::laplacian(turb.alphaEff(), he)
==
rho*(U&g)
+ rad.Sh(thermo)
+ rad.Sh(thermo, he)
+ fvOptions(rho, he)
);

2
applications/solvers/heatTransfer/thermoFoam/EEqn.H
View File

@ -17,7 +17,7 @@
)
- fvm::laplacian(alphaEff, he)
==
radiation->Sh(thermo)
radiation->Sh(thermo, he)
+ fvOptions(rho, he)
);

2
applications/solvers/lagrangian/coalChemistryFoam/EEqn.H
View File

@ -21,7 +21,7 @@
+ Qdot
+ coalParcels.Sh(he)
+ limestoneParcels.Sh(he)
+ radiation->Sh(thermo)
+ radiation->Sh(thermo, he)
+ fvOptions(rho, he)
);

2
applications/solvers/lagrangian/reactingParcelFilmFoam/EEqn.H
View File

@ -20,7 +20,7 @@
rho*(U&g)
+ parcels.Sh(he)
+ surfaceFilm.Sh()
+ radiation->Sh(thermo)
+ radiation->Sh(thermo, he)
+ Qdot
+ fvOptions(rho, he)
);

4
applications/solvers/lagrangian/reactingParcelFoam/EEqn.H
View File

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

2
applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/EEqn.H
View File

@ -13,7 +13,7 @@
==
rho*(U&g)
+ parcels.Sh(he)
+ radiation->Sh(thermo)
+ radiation->Sh(thermo, he)
+ Qdot
+ fvOptions(rho, he)
);

8
src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.C
View File

@ -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::fvScalarMatrix> 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_));

10
src/thermophysicalModels/radiation/radiationModels/radiationModel/radiationModel.H
View File

@ -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<volScalarField::Internal> Ru() const = 0;
//- Energy source term
virtual tmp<fvScalarMatrix> Sh(fluidThermo& thermo) const;
virtual tmp<fvScalarMatrix> Sh
(
const basicThermo& thermo,
const volScalarField& he
) const;
//- Temperature source term
virtual tmp<fvScalarMatrix> ST