From 0a3b4fad81b6c34b9743c816facf5567af8ef512 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 12 Feb 2015 15:08:57 +0000
Subject: [PATCH] thermophysicalModels: Don't register derived fields such as
Cp to avoid name conflicts in the objectRegistry
---
.../basic/heThermo/heThermo.C | 23 ++++++++++++-------
.../chemistryModel/chemistryModel.C | 3 ++-
.../psiuReactionThermo/heheuPsiThermo.C | 17 +++++++++-----
.../pyrolysisChemistryModel.C | 3 ++-
4 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.C b/src/thermophysicalModels/basic/heThermo/heThermo.C
index d1b26c5e88d..07a75f2c91a 100644
--- a/src/thermophysicalModels/basic/heThermo/heThermo.C
+++ b/src/thermophysicalModels/basic/heThermo/heThermo.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
@@ -176,7 +176,8 @@ Foam::tmp<Foam::volScalarField> Foam::heThermo<BasicThermo, MixtureType>::he
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
mesh,
he_.dimensions()
@@ -268,7 +269,8 @@ Foam::heThermo<BasicThermo, MixtureType>::hc() const
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
mesh,
he_.dimensions()
@@ -334,7 +336,8 @@ Foam::heThermo<BasicThermo, MixtureType>::Cp() const
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
mesh,
dimEnergy/dimMass/dimTemperature
@@ -404,7 +407,8 @@ Foam::heThermo<BasicThermo, MixtureType>::Cv() const
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
mesh,
dimEnergy/dimMass/dimTemperature
@@ -470,7 +474,8 @@ Foam::heThermo<BasicThermo, MixtureType>::gamma() const
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
mesh,
dimless
@@ -542,7 +547,8 @@ Foam::heThermo<BasicThermo, MixtureType>::Cpv() const
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
mesh,
dimEnergy/dimMass/dimTemperature
@@ -611,7 +617,8 @@ Foam::heThermo<BasicThermo, MixtureType>::CpByCpv() const
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
mesh,
dimless
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
index 321c8235d1c..c9c462d2b10 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C
@@ -489,7 +489,8 @@ Foam::chemistryModel<CompType, ThermoType>::tc() const
this->time().timeName(),
this->mesh(),
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
this->mesh(),
dimensionedScalar("zero", dimTime, SMALL),
diff --git a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
index cc6950b80a6..982446ccb11 100644
--- a/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
+++ b/src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.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
@@ -278,7 +278,8 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::Tb() const
this->T_.time().timeName(),
this->T_.db(),
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
this->T_
)
@@ -334,7 +335,8 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::psiu() const
this->psi_.time().timeName(),
this->psi_.db(),
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
this->psi_.mesh(),
this->psi_.dimensions()
@@ -385,7 +387,8 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::psib() const
this->psi_.time().timeName(),
this->psi_.db(),
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
this->psi_.mesh(),
this->psi_.dimensions()
@@ -437,7 +440,8 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::muu() const
this->T_.time().timeName(),
this->T_.db(),
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
this->T_.mesh(),
dimensionSet(1, -1, -1, 0, 0)
@@ -492,7 +496,8 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::mub() const
this->T_.time().timeName(),
this->T_.db(),
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
this->T_.mesh(),
dimensionSet(1, -1, -1, 0, 0)
diff --git a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
index 215e9b55f39..fabc4130e43 100644
--- a/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
+++ b/src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
@@ -628,7 +628,8 @@ Foam::pyrolysisChemistryModel<CompType, SolidThermo, GasThermo>::gasHs
this->mesh_.time().timeName(),
this->mesh_,
IOobject::NO_READ,
- IOobject::NO_WRITE
+ IOobject::NO_WRITE,
+ false
),
this->mesh_,
dimensionedScalar("zero", dimEnergy/dimMass, 0.0),
--
GitLab