At the specie level: hs = sensible enthalpy ha = absolute (what was total) enthalpy es = sensibly internal energy ea = absolute (what was total) internal energy At top-level Rename total enthalpy h -> ha Rename sensible enthalpy hs -> h Combined h, hs, e and es thermo packages into a single structure. Thermo packages now provide "he" function which may return either enthalpy or internal energy, sensible or absolute according to the run-time selected form alphaEff now returns the effective diffusivity for the particular energy which the thermodynamics package is selected to solve for.
67 lines
2.3 KiB
C
67 lines
2.3 KiB
C
/*---------------------------------------------------------------------------*\
|
|
========= |
|
|
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
|
|
\\ / O peration |
|
|
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
|
|
\\/ M anipulation |
|
|
-------------------------------------------------------------------------------
|
|
License
|
|
This file is part of OpenFOAM.
|
|
|
|
OpenFOAM is free software: you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
\*---------------------------------------------------------------------------*/
|
|
|
|
#include "XiGModel.H"
|
|
|
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
|
|
|
Foam::autoPtr<Foam::XiGModel> Foam::XiGModel::New
|
|
(
|
|
const dictionary& propDict,
|
|
const psiuReactionThermo& thermo,
|
|
const compressible::RASModel& turbulence,
|
|
const volScalarField& Su
|
|
)
|
|
{
|
|
const word modelType(propDict.lookup("XiGModel"));
|
|
|
|
Info<< "Selecting flame-wrinkling model " << modelType << endl;
|
|
|
|
dictionaryConstructorTable::iterator cstrIter =
|
|
dictionaryConstructorTablePtr_->find(modelType);
|
|
|
|
if (cstrIter == dictionaryConstructorTablePtr_->end())
|
|
{
|
|
FatalErrorIn
|
|
(
|
|
"XiGModel::New"
|
|
"("
|
|
" const psiuReactionThermo& thermo,"
|
|
" const compressible::RASModel& turbulence,"
|
|
" const volScalarField& Su"
|
|
")"
|
|
) << "Unknown XiGModel type "
|
|
<< modelType << nl << nl
|
|
<< "Valid XiGModels are : " << endl
|
|
<< dictionaryConstructorTablePtr_->sortedToc()
|
|
<< exit(FatalError);
|
|
}
|
|
|
|
return autoPtr<XiGModel>(cstrIter()(propDict, thermo, turbulence, Su));
|
|
}
|
|
|
|
|
|
// ************************************************************************* //
|