zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/dm4/OpenFOAM/repositories/OpenFOAM-dev

Browse Source
This commit is contained in:
mattijs
2014-03-17 11:51:20 +00:00
parent c07abf233b fffb861342
commit c9629406e9
2 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/thermophysicalModels/basic/psiThermo/psiThermos.C
View File

@ -29,6 +29,7 @@ License
#include "specie.H"
#include "perfectGas.H"
#include "PengRobinsonGas.H"
#include "rhoConst.H"
#include "hConstThermo.H"
#include "eConstThermo.H"
#include "janafThermo.H"
@ -53,6 +54,18 @@ namespace Foam
/* * * * * * * * * * * * * * * * * Enthalpy-based * * * * * * * * * * * * * */
makeThermo
(
psiThermo,
hePsiThermo,
pureMixture,
constTransport,
sensibleEnthalpy,
hConstThermo,
rhoConst,
specie
);
makeThermo
(
psiThermo,

27
src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -25,6 +25,13 @@ License
#include "basicMultiComponentMixture.H"
// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
namespace Foam
{
defineTypeNameAndDebug(basicMultiComponentMixture, 0);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::basicMultiComponentMixture::basicMultiComponentMixture
@ -39,6 +46,12 @@ Foam::basicMultiComponentMixture::basicMultiComponentMixture
{
forAll(species_, i)
{
if (debug)
{
Info<< "basicMultiComponentMixture: looking for " << species_[i]
<< endl;
}
IOobject header
(
species_[i],
@ -50,6 +63,12 @@ Foam::basicMultiComponentMixture::basicMultiComponentMixture
// check if field exists and can be read
if (header.headerOk())
{
if (debug)
{
Info<< "basicMultiComponentMixture: reading " << species_[i]
<< endl;
}
Y_.set
(
i,
@ -69,6 +88,12 @@ Foam::basicMultiComponentMixture::basicMultiComponentMixture
}
else
{
if (debug)
{
Info<< "basicMultiComponentMixture: specie " << species_[i]
<< " not found - looking for Ydefault" << endl;
}
volScalarField Ydefault
(
IOobject