thermophysicalModels: Don't register derived fields such as Cp to avoid name conflicts in the objectRegistry

This commit is contained in:
Henry
2015-02-12 15:08:57 +00:00
parent bdc16a24b6
commit 0a3b4fad81
4 changed files with 30 additions and 16 deletions

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
@ -176,7 +176,8 @@ Foam::tmp<Foam::volScalarField> Foam::heThermo<BasicThermo, MixtureType>::he
mesh.time().timeName(), mesh.time().timeName(),
mesh, mesh,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
mesh, mesh,
he_.dimensions() he_.dimensions()
@ -268,7 +269,8 @@ Foam::heThermo<BasicThermo, MixtureType>::hc() const
mesh.time().timeName(), mesh.time().timeName(),
mesh, mesh,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
mesh, mesh,
he_.dimensions() he_.dimensions()
@ -334,7 +336,8 @@ Foam::heThermo<BasicThermo, MixtureType>::Cp() const
mesh.time().timeName(), mesh.time().timeName(),
mesh, mesh,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
mesh, mesh,
dimEnergy/dimMass/dimTemperature dimEnergy/dimMass/dimTemperature
@ -404,7 +407,8 @@ Foam::heThermo<BasicThermo, MixtureType>::Cv() const
mesh.time().timeName(), mesh.time().timeName(),
mesh, mesh,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
mesh, mesh,
dimEnergy/dimMass/dimTemperature dimEnergy/dimMass/dimTemperature
@ -470,7 +474,8 @@ Foam::heThermo<BasicThermo, MixtureType>::gamma() const
mesh.time().timeName(), mesh.time().timeName(),
mesh, mesh,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
mesh, mesh,
dimless dimless
@ -542,7 +547,8 @@ Foam::heThermo<BasicThermo, MixtureType>::Cpv() const
mesh.time().timeName(), mesh.time().timeName(),
mesh, mesh,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
mesh, mesh,
dimEnergy/dimMass/dimTemperature dimEnergy/dimMass/dimTemperature
@ -611,7 +617,8 @@ Foam::heThermo<BasicThermo, MixtureType>::CpByCpv() const
mesh.time().timeName(), mesh.time().timeName(),
mesh, mesh,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
mesh, mesh,
dimless dimless

View File

@ -489,7 +489,8 @@ Foam::chemistryModel<CompType, ThermoType>::tc() const
this->time().timeName(), this->time().timeName(),
this->mesh(), this->mesh(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
this->mesh(), this->mesh(),
dimensionedScalar("zero", dimTime, SMALL), dimensionedScalar("zero", dimTime, SMALL),

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
@ -278,7 +278,8 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::Tb() const
this->T_.time().timeName(), this->T_.time().timeName(),
this->T_.db(), this->T_.db(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
this->T_ this->T_
) )
@ -334,7 +335,8 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::psiu() const
this->psi_.time().timeName(), this->psi_.time().timeName(),
this->psi_.db(), this->psi_.db(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
this->psi_.mesh(), this->psi_.mesh(),
this->psi_.dimensions() this->psi_.dimensions()
@ -385,7 +387,8 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::psib() const
this->psi_.time().timeName(), this->psi_.time().timeName(),
this->psi_.db(), this->psi_.db(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
this->psi_.mesh(), this->psi_.mesh(),
this->psi_.dimensions() this->psi_.dimensions()
@ -437,7 +440,8 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::muu() const
this->T_.time().timeName(), this->T_.time().timeName(),
this->T_.db(), this->T_.db(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
this->T_.mesh(), this->T_.mesh(),
dimensionSet(1, -1, -1, 0, 0) dimensionSet(1, -1, -1, 0, 0)
@ -492,7 +496,8 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::mub() const
this->T_.time().timeName(), this->T_.time().timeName(),
this->T_.db(), this->T_.db(),
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
this->T_.mesh(), this->T_.mesh(),
dimensionSet(1, -1, -1, 0, 0) dimensionSet(1, -1, -1, 0, 0)

View File

@ -628,7 +628,8 @@ Foam::pyrolysisChemistryModel<CompType, SolidThermo, GasThermo>::gasHs
this->mesh_.time().timeName(), this->mesh_.time().timeName(),
this->mesh_, this->mesh_,
IOobject::NO_READ, IOobject::NO_READ,
IOobject::NO_WRITE IOobject::NO_WRITE,
false
), ),
this->mesh_, this->mesh_,
dimensionedScalar("zero", dimEnergy/dimMass, 0.0), dimensionedScalar("zero", dimEnergy/dimMass, 0.0),