zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GeometricFields: Removed registration of temporary fields

Browse Source
This commit is contained in:
Henry Weller
2018-12-20 15:25:41 +00:00
parent 942d9d1515
commit 2fada7886a
8 changed files with 39 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C
View File

@ -57,16 +57,9 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> stabilise
{
tmp<GeometricField<scalar, PatchField, GeoMesh>> tRes
(
new GeometricField<scalar, PatchField, GeoMesh>
GeometricField<scalar, PatchField, GeoMesh>::New
(
IOobject
(
"stabilise(" + gsf.name() + ',' + ds.name() + ')',
gsf.instance(),
gsf.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
"stabilise(" + gsf.name() + ',' + ds.name() + ')',
gsf.mesh(),
ds.dimensions() + gsf.dimensions()
)
@ -154,16 +147,9 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
(
new GeometricField<scalar, PatchField, GeoMesh>
GeometricField<scalar, PatchField, GeoMesh>::New
(
IOobject
(
"pow(" + gsf1.name() + ',' + gsf2.name() + ')',
gsf1.instance(),
gsf1.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
"pow(" + gsf1.name() + ',' + gsf2.name() + ')',
gsf1.mesh(),
dimless
)
@ -330,16 +316,9 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
(
new GeometricField<scalar, PatchField, GeoMesh>
GeometricField<scalar, PatchField, GeoMesh>::New
(
IOobject
(
"pow(" + gsf.name() + ',' + ds.name() + ')',
gsf.instance(),
gsf.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
"pow(" + gsf.name() + ',' + ds.name() + ')',
gsf.mesh(),
pow(gsf.dimensions(), ds)
)
@ -440,16 +419,9 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> pow
tmp<GeometricField<scalar, PatchField, GeoMesh>> tPow
(
new GeometricField<scalar, PatchField, GeoMesh>
GeometricField<scalar, PatchField, GeoMesh>::New
(
IOobject
(
"pow(" + ds.name() + ',' + gsf.name() + ')',
gsf.instance(),
gsf.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
"pow(" + ds.name() + ',' + gsf.name() + ')',
gsf.mesh(),
dimless
)
@ -556,16 +528,9 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
{
tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
(
new GeometricField<scalar, PatchField, GeoMesh>
GeometricField<scalar, PatchField, GeoMesh>::New
(
IOobject
(
"atan2(" + gsf1.name() + ',' + gsf2.name() + ')',
gsf1.instance(),
gsf1.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
"atan2(" + gsf1.name() + ',' + gsf2.name() + ')',
gsf1.mesh(),
atan2(gsf1.dimensions(), gsf2.dimensions())
)
@ -683,16 +648,9 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
{
tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
(
new GeometricField<scalar, PatchField, GeoMesh>
GeometricField<scalar, PatchField, GeoMesh>::New
(
IOobject
(
"atan2(" + gsf.name() + ',' + ds.name() + ')',
gsf.instance(),
gsf.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
"atan2(" + gsf.name() + ',' + ds.name() + ')',
gsf.mesh(),
atan2(gsf.dimensions(), ds)
)
@ -772,16 +730,9 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> atan2
{
tmp<GeometricField<scalar, PatchField, GeoMesh>> tAtan2
(
new GeometricField<scalar, PatchField, GeoMesh>
GeometricField<scalar, PatchField, GeoMesh>::New
(
IOobject
(
"atan2(" + ds.name() + ',' + gsf.name() + ')',
gsf.instance(),
gsf.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
"atan2(" + ds.name() + ',' + gsf.name() + ')',
gsf.mesh(),
atan2(ds, gsf.dimensions())
)
@ -913,16 +864,9 @@ tmp<GeometricField<scalar, PatchField, GeoMesh>> func \
\
tmp<GeometricField<scalar, PatchField, GeoMesh>> tFunc \
( \
new GeometricField<scalar, PatchField, GeoMesh> \
GeometricField<scalar, PatchField, GeoMesh>::New \
( \
IOobject \
( \
#func "(" + gsf.name() + ')', \
gsf.instance(), \
gsf.db(), \
IOobject::NO_READ, \
IOobject::NO_WRITE \
), \
#func "(" + gsf.name() + ')', \
gsf.mesh(), \
dimless \
) \

22
src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.C
View File

@ -69,16 +69,9 @@ tmp<GeometricField<Type, PatchField, GeoMesh>> transform
{
tmp<GeometricField<Type, PatchField, GeoMesh>> tranf
(
new GeometricField<Type, PatchField, GeoMesh>
GeometricField<Type, PatchField, GeoMesh>::New
(
IOobject
(
"transform(" + trf.name() + ',' + tf.name() + ')',
tf.instance(),
tf.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
"transform(" + trf.name() + ',' + tf.name() + ')',
tf.mesh(),
tf.dimensions()
)
@ -155,16 +148,9 @@ tmp<GeometricField<Type, PatchField, GeoMesh>> transform
{
tmp<GeometricField<Type, PatchField, GeoMesh>> tranf
(
new GeometricField<Type, PatchField, GeoMesh>
GeometricField<Type, PatchField, GeoMesh>::New
(
IOobject
(
"transform(" + t.name() + ',' + tf.name() + ')',
tf.instance(),
tf.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
"transform(" + t.name() + ',' + tf.name() + ')',
tf.mesh(),
tf.dimensions()
)

65
src/thermophysicalModels/reactionThermo/psiuReactionThermo/heheuPsiThermo.C
View File

@ -290,22 +290,7 @@ template<class BasicPsiThermo, class MixtureType>
Foam::tmp<Foam::volScalarField>
Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::Tb() const
{
tmp<volScalarField> tTb
(
new volScalarField
(
IOobject
(
"Tb",
this->T_.time().timeName(),
this->T_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->T_
)
);
tmp<volScalarField> tTb(volScalarField::New("Tb", this->T_));
volScalarField& Tb_ = tTb.ref();
scalarField& TbCells = Tb_.primitiveFieldRef();
@ -351,17 +336,9 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::psiu() const
{
tmp<volScalarField> tpsiu
(
new volScalarField
volScalarField::New
(
IOobject
(
"psiu",
this->psi_.time().timeName(),
this->psi_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"psiu",
this->psi_.mesh(),
this->psi_.dimensions()
)
@ -405,17 +382,9 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::psib() const
{
tmp<volScalarField> tpsib
(
new volScalarField
volScalarField::New
(
IOobject
(
"psib",
this->psi_.time().timeName(),
this->psi_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"psib",
this->psi_.mesh(),
this->psi_.dimensions()
)
@ -460,17 +429,9 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::muu() const
{
tmp<volScalarField> tmuu
(
new volScalarField
volScalarField::New
(
IOobject
(
"muu",
this->T_.time().timeName(),
this->T_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"muu",
this->T_.mesh(),
dimensionSet(1, -1, -1, 0, 0)
)
@ -518,17 +479,9 @@ Foam::heheuPsiThermo<BasicPsiThermo, MixtureType>::mub() const
{
tmp<volScalarField> tmub
(
new volScalarField
volScalarField::New
(
IOobject
(
"mub",
this->T_.time().timeName(),
this->T_.db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"mub",
this->T_.mesh(),
dimensionSet(1, -1, -1, 0, 0)
)

12
src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModel.C
View File

@ -630,17 +630,9 @@ Foam::pyrolysisChemistryModel<CompType, SolidThermo, GasThermo>::gasHs
{
tmp<volScalarField> tHs
(
new volScalarField
volScalarField::New
(
IOobject
(
"Hs_" + pyrolisisGases_[index],
this->mesh_.time().timeName(),
this->mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"Hs_" + pyrolisisGases_[index],
this->mesh_,
dimensionedScalar(dimEnergy/dimMass, 0)
)

11
src/thermophysicalModels/solidChemistryModel/pyrolysisChemistryModel/pyrolysisChemistryModelI.H
View File

@ -81,16 +81,9 @@ RRg() const
{
tmp<volScalarField::Internal> tRRg
(
new volScalarField::Internal
volScalarField::Internal::New
(
IOobject
(
"RRg",
this->time().timeName(),
this->mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
"RRg",
this->mesh(),
dimensionedScalar(dimMass/dimVolume/dimTime, 0)
)

12
src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModel.C
View File

@ -116,17 +116,9 @@ Foam::solidChemistryModel<CompType, SolidThermo>::Qdot() const
{
tmp<volScalarField> tQdot
(
new volScalarField
volScalarField::New
(
IOobject
(
"Qdot",
this->mesh_.time().timeName(),
this->mesh_,
IOobject::NO_READ,
IOobject::AUTO_WRITE,
false
),
"Qdot",
this->mesh_,
dimensionedScalar(dimEnergy/dimVolume/dimTime, 0)
)

11
src/thermophysicalModels/solidChemistryModel/solidChemistryModel/solidChemistryModelI.H
View File

@ -68,16 +68,9 @@ Foam::solidChemistryModel<CompType, SolidThermo>::RRs() const
{
tmp<volScalarField::Internal> tRRs
(
new volScalarField::Internal
volScalarField::Internal::New
(
IOobject
(
"RRs",
this->time().timeName(),
this->mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
"RRs",
this->mesh(),
dimensionedScalar(dimMass/dimVolume/dimTime, 0)
)

11
src/thermophysicalModels/solidThermo/solidThermo/heSolidThermo.C
View File

@ -204,16 +204,9 @@ Foam::heSolidThermo<BasicSolidThermo, MixtureType>::Kappa() const
tmp<volVectorField> tKappa
(
new volVectorField
volVectorField::New
(
IOobject
(
"Kappa",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE
),
"Kappa",
mesh,
dimEnergy/dimTime/dimLength/dimTemperature
)