From bdc16a24b6186f12a7e0678b74c79b97589fc52f Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 12 Feb 2015 13:24:51 +0000
Subject: [PATCH] Avoid registration of variables which may generate name
conflicts
---
.../laminarFlameSpeed/Gulders/Gulders.C | 8 +++++---
.../laminarFlameSpeed/GuldersEGR/GuldersEGR.C | 8 +++++---
.../laminarFlameSpeed/RaviPetersen/RaviPetersen.C | 14 ++++++++------
.../laminarFlameSpeed/constant/constant.C | 5 +++--
4 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C b/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C
index 051d1b2f1f8..a1563921c2b 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -120,7 +120,8 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::Gulders::Su0pTphi
p.time().timeName(),
p.db(),
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
p.mesh(),
dimensionedScalar("Su0", dimVelocity, 0.0)
@@ -170,7 +171,8 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::Gulders::Su0pTphi
p.time().timeName(),
p.db(),
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
p.mesh(),
dimensionedScalar("Su0", dimVelocity, 0.0)
diff --git a/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C b/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C
index b3dfcb6aa10..173e3d88415 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -120,7 +120,8 @@ Foam::laminarFlameSpeedModels::GuldersEGR::Su0pTphi
p.time().timeName(),
p.db(),
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
p.mesh(),
dimensionedScalar("Su0", dimVelocity, 0.0)
@@ -172,7 +173,8 @@ Foam::laminarFlameSpeedModels::GuldersEGR::Su0pTphi
p.time().timeName(),
p.db(),
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
p.mesh(),
dimensionedScalar("Su0", dimVelocity, 0.0)
diff --git a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C
index 320b779539e..cb0ffc16a74 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -218,8 +218,8 @@ inline Foam::scalar Foam::laminarFlameSpeedModels::RaviPetersen::THatPowB
{
return pow
(
- Tu/TRef_,
- polynomial(beta_[EqRIndex][pIndex],EqR)
+ Tu/TRef_,
+ polynomial(beta_[EqRIndex][pIndex],EqR)
);
}
@@ -238,7 +238,7 @@ Foam::laminarFlameSpeedModels::RaviPetersen::correlationInRange
polynomial(alpha_[EqRIndex][pIndex],EqR)
*THatPowB(EqRIndex, pIndex, EqR, Tu);
}
-
+
inline Foam::scalar
Foam::laminarFlameSpeedModels::RaviPetersen::correlationOutOfRange
@@ -313,7 +313,8 @@ Foam::laminarFlameSpeedModels::RaviPetersen::operator()() const
p.time().timeName(),
p.db(),
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
p.mesh(),
dimensionedScalar("EqR", dimless, 0.0)
@@ -344,7 +345,8 @@ Foam::laminarFlameSpeedModels::RaviPetersen::operator()() const
p.time().timeName(),
p.db(),
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
p.mesh(),
dimensionedScalar("Su0", dimVelocity, 0.0)
diff --git a/src/thermophysicalModels/laminarFlameSpeed/constant/constant.C b/src/thermophysicalModels/laminarFlameSpeed/constant/constant.C
index 4e7be77191c..37ba46fbb19 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/constant/constant.C
+++ b/src/thermophysicalModels/laminarFlameSpeed/constant/constant.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -79,7 +79,8 @@ Foam::laminarFlameSpeedModels::constant::operator()() const
psiuReactionThermo_.T().time().timeName(),
psiuReactionThermo_.T().db(),
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
psiuReactionThermo_.T().mesh(),
Su_
--
GitLab