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

Avoid registration of variables which may generate name conflicts

Browse Source
This commit is contained in:
Henry
2015-02-12 13:24:51 +00:00
parent 7a25d8978c
commit bdc16a24b6
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -120,7 +120,8 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::Gulders::Su0pTphi
p.time().timeName(), p.time().timeName(),
p.db(), p.db(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
p.mesh(), p.mesh(),
dimensionedScalar("Su0", dimVelocity, 0.0) dimensionedScalar("Su0", dimVelocity, 0.0)
@ -170,7 +171,8 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::Gulders::Su0pTphi
p.time().timeName(), p.time().timeName(),
p.db(), p.db(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
p.mesh(), p.mesh(),
dimensionedScalar("Su0", dimVelocity, 0.0) dimensionedScalar("Su0", dimVelocity, 0.0)

8
src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -120,7 +120,8 @@ Foam::laminarFlameSpeedModels::GuldersEGR::Su0pTphi
p.time().timeName(), p.time().timeName(),
p.db(), p.db(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
p.mesh(), p.mesh(),
dimensionedScalar("Su0", dimVelocity, 0.0) dimensionedScalar("Su0", dimVelocity, 0.0)
@ -172,7 +173,8 @@ Foam::laminarFlameSpeedModels::GuldersEGR::Su0pTphi
p.time().timeName(), p.time().timeName(),
p.db(), p.db(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
p.mesh(), p.mesh(),
dimensionedScalar("Su0", dimVelocity, 0.0) dimensionedScalar("Su0", dimVelocity, 0.0)

14
src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -218,8 +218,8 @@ inline Foam::scalar Foam::laminarFlameSpeedModels::RaviPetersen::THatPowB
{ {
return pow return pow
( (
Tu/TRef_, Tu/TRef_,
polynomial(beta_[EqRIndex][pIndex],EqR) polynomial(beta_[EqRIndex][pIndex],EqR)
); );
} }
@ -238,7 +238,7 @@ Foam::laminarFlameSpeedModels::RaviPetersen::correlationInRange
polynomial(alpha_[EqRIndex][pIndex],EqR) polynomial(alpha_[EqRIndex][pIndex],EqR)
*THatPowB(EqRIndex, pIndex, EqR, Tu); *THatPowB(EqRIndex, pIndex, EqR, Tu);
} }
inline Foam::scalar inline Foam::scalar
Foam::laminarFlameSpeedModels::RaviPetersen::correlationOutOfRange Foam::laminarFlameSpeedModels::RaviPetersen::correlationOutOfRange
@ -313,7 +313,8 @@ Foam::laminarFlameSpeedModels::RaviPetersen::operator()() const
p.time().timeName(), p.time().timeName(),
p.db(), p.db(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
p.mesh(), p.mesh(),
dimensionedScalar("EqR", dimless, 0.0) dimensionedScalar("EqR", dimless, 0.0)
@ -344,7 +345,8 @@ Foam::laminarFlameSpeedModels::RaviPetersen::operator()() const
p.time().timeName(), p.time().timeName(),
p.db(), p.db(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
p.mesh(), p.mesh(),
dimensionedScalar("Su0", dimVelocity, 0.0) dimensionedScalar("Su0", dimVelocity, 0.0)

5
src/thermophysicalModels/laminarFlameSpeed/constant/constant.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -79,7 +79,8 @@ Foam::laminarFlameSpeedModels::constant::operator()() const
psiuReactionThermo_.T().time().timeName(), psiuReactionThermo_.T().time().timeName(),
psiuReactionThermo_.T().db(), psiuReactionThermo_.T().db(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
psiuReactionThermo_.T().mesh(), psiuReactionThermo_.T().mesh(),
Su_ Su_