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

src: Changed tmp<volField> construction to use the new simpler "New" method

Browse Source 
avoiding unnecessary database registration of temporary fields
This commit is contained in:
Henry Weller
2018-12-21 07:14:52 +00:00
parent d6a13f6425
commit 819eb06657
66 changed files with 406 additions and 1408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
View File

@ -336,6 +336,34 @@ DimensionedField<Type, GeoMesh>::New
}
template<class Type, class GeoMesh>
Foam::tmp<Foam::DimensionedField<Type, GeoMesh>>
DimensionedField<Type, GeoMesh>::New
(
const word& newName,
const DimensionedField<Type, GeoMesh>& df
)
{
return tmp<DimensionedField<Type, GeoMesh>>
(
new DimensionedField<Type, GeoMesh>
(
IOobject
(
newName,
df.instance(),
df.local(),
df.db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
df
)
);
}
template<class Type, class GeoMesh>
Foam::tmp<Foam::DimensionedField<Type, GeoMesh>>
DimensionedField<Type, GeoMesh>::New

9
src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
View File

@ -254,7 +254,14 @@ public:
const dimensioned<Type>&
);
//- Rename temporary field and return
//- Return a temporary field constructed from name and a field
static tmp<DimensionedField<Type, GeoMesh>> New
(
const word& newName,
const DimensionedField<Type, GeoMesh>&
);
//- Return renamed temporary field
static tmp<DimensionedField<Type, GeoMesh>> New
(
const word& newName,

13
src/combustionModels/EDC/EDC.C
View File

@ -183,21 +183,10 @@ template<class ReactionThermo>
Foam::tmp<Foam::volScalarField>
Foam::combustionModels::EDC<ReactionThermo>::Qdot() const
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
this->thermo().phasePropertyName(typeName + ":Qdot"),
this->mesh().time().timeName(),
this->mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
kappa_*this->chemistryPtr_->Qdot()
)
);
}

27
src/combustionModels/FSD/FSD.C
View File

@ -148,16 +148,9 @@ void FSD<ReactionThermo, ThermoType>::calculateSourceNorm()
tmp<volScalarField> tPc
(
new volScalarField
(
IOobject
volScalarField::New
(
this->thermo().phasePropertyName("Pc"),
U.time().timeName(),
U.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
U.mesh(),
dimensionedScalar(dimless, 0)
)
@ -167,16 +160,9 @@ void FSD<ReactionThermo, ThermoType>::calculateSourceNorm()
tmp<volScalarField> tomegaFuel
(
new volScalarField
(
IOobject
volScalarField::New
(
this->thermo().phasePropertyName("omegaFuelBar"),
U.time().timeName(),
U.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
U.mesh(),
dimensionedScalar(omegaFuel.dimensions(), 0)
)
@ -293,16 +279,9 @@ void FSD<ReactionThermo, ThermoType>::calculateSourceNorm()
tmp<volScalarField> tproducts
(
new volScalarField
(
IOobject
volScalarField::New
(
this->thermo().phasePropertyName("products"),
U.time().timeName(),
U.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
U.mesh(),
dimensionedScalar(dimless, 0)
)

9
src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C
View File

@ -82,16 +82,9 @@ Foam::tmp<Foam::volScalarField> Foam::consumptionSpeed::omega0Sigma
{
tmp<volScalarField> tomega0
(
new volScalarField
(
IOobject
volScalarField::New
(
"omega0",
sigma.time().timeName(),
sigma.db(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
sigma.mesh(),
dimensionedScalar
(

5
src/combustionModels/PaSR/PaSR.C
View File

@ -109,13 +109,10 @@ template<class ReactionThermo>
Foam::tmp<Foam::volScalarField>
Foam::combustionModels::PaSR<ReactionThermo>::Qdot() const
{
return tmp<volScalarField>
(
new volScalarField
return volScalarField::New
(
this->thermo().phasePropertyName(typeName + ":Qdot"),
kappa_*laminar<ReactionThermo>::Qdot()
)
);
}

13
src/combustionModels/noCombustion/noCombustion.C
View File

@ -75,22 +75,11 @@ template<class ReactionThermo>
Foam::tmp<Foam::volScalarField>
Foam::combustionModels::noCombustion<ReactionThermo>::Qdot() const
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
this->thermo().phasePropertyName(typeName + ":Qdot"),
this->mesh().time().timeName(),
this->mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh(),
dimensionedScalar(dimEnergy/dimVolume/dimTime, 0)
)
);
}

24
src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
View File

@ -121,20 +121,10 @@ const Foam::dimensionedVector& Foam::SRF::SRFModel::omega() const
Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh>>
Foam::SRF::SRFModel::Fcoriolis() const
{
return tmp<volVectorField::Internal>
(
new volVectorField::Internal
(
IOobject
return volVectorField::Internal::New
(
"Fcoriolis",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
2.0*omega_ ^ Urel_
)
);
}
@ -142,20 +132,10 @@ Foam::SRF::SRFModel::Fcoriolis() const
Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh>>
Foam::SRF::SRFModel::Fcentrifugal() const
{
return tmp<volVectorField::Internal>
(
new volVectorField::Internal
(
IOobject
return volVectorField::Internal::New
(
"Fcentrifugal",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
omega_ ^ (omega_ ^ (mesh_.C() - origin_))
)
);
}

7
src/functionObjects/field/CourantNo/CourantNo.C
View File

@ -75,14 +75,9 @@ bool Foam::functionObjects::CourantNo::calc()
tmp<volScalarField> tCo
(
new volScalarField
(
IOobject
volScalarField::New
(
resultName_,
mesh_.time().timeName(),
mesh_
),
mesh_,
dimensionedScalar(dimless, 0),
zeroGradientFvPatchScalarField::typeName

7
src/functionObjects/field/processorField/processorField.C
View File

@ -76,14 +76,9 @@ bool Foam::functionObjects::processorField::execute()
tmp<volScalarField> tprocField
(
new volScalarField
(
IOobject
volScalarField::New
(
name,
mesh_.time().timeName(),
mesh_
),
mesh_,
dimensionedScalar(name, dimless, Pstream::myProcNo())
)

7
src/functionObjects/field/wallHeatFlux/wallHeatFlux.C
View File

@ -67,14 +67,9 @@ Foam::functionObjects::wallHeatFlux::calcWallHeatFlux
{
tmp<volScalarField> twallHeatFlux
(
new volScalarField
(
IOobject
volScalarField::New
(
type(),
mesh_.time().timeName(),
mesh_
),
mesh_,
dimensionedScalar(dimMass/pow3(dimTime), 0)
)

7
src/functionObjects/field/wallHeatTransferCoeff/wallHeatTransferCoeff.C
View File

@ -72,14 +72,9 @@ Foam::functionObjects::wallHeatTransferCoeff::calcHeatTransferCoeff
{
tmp<volScalarField> twallHeatTransferCoeff
(
new volScalarField
(
IOobject
volScalarField::New
(
type(),
mesh_.time().timeName(),
mesh_
),
mesh_,
dimensionedScalar
(

7
src/functionObjects/field/wallShearStress/wallShearStress.C
View File

@ -65,14 +65,9 @@ Foam::functionObjects::wallShearStress::calcShearStress
{
tmp<volVectorField> twallShearStress
(
new volVectorField
(
IOobject
volVectorField::New
(
type(),
mesh_.time().timeName(),
mesh_
),
mesh_,
dimensionedVector("0", Reff.dimensions(), Zero)
)

7
src/functionObjects/field/yPlus/yPlus.C
View File

@ -69,14 +69,9 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::yPlus::calcYPlus
{
tmp<volScalarField> tyPlus
(
new volScalarField
(
IOobject
volScalarField::New
(
type(),
mesh_.time().timeName(),
mesh_
),
mesh_,
dimensionedScalar(dimless, 0)
)

10
src/functionObjects/forces/forces/forces.C
View File

@ -331,19 +331,11 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::forces::rho() const
{
if (rhoName_ == "rhoInf")
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
"rho",
mesh_.time().timeName(),
mesh_
),
mesh_,
dimensionedScalar(dimDensity, rhoRef_)
)
);
}
else

24
src/functionObjects/solvers/scalarTransport/scalarTransport.C
View File

@ -65,21 +65,11 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::scalarTransport::D
if (constantD_)
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
Dname,
mesh_.time().timeName(),
mesh_.time(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensionedScalar(Dname, phi.dimensions()/dimLength, D_)
)
);
}
else if (mesh_.foundObject<icoModel>(turbulenceModel::propertiesName))
@ -102,21 +92,11 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::scalarTransport::D
}
else
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
Dname,
mesh_.time().timeName(),
mesh_.time(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensionedScalar(Dname, phi.dimensions()/dimLength, 0)
)
);
}
}

3
src/fvOptions/sources/derived/meanVelocityForce/meanVelocityForce.C
View File

@ -244,7 +244,8 @@ void Foam::fv::meanVelocityForce::constrain
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
IOobject::NO_WRITE,
false
),
1.0/eqn.A()
)

12
src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
View File

@ -85,18 +85,9 @@ Foam::fv::solidificationMeltingSource::Cp() const
{
scalar CpRef = readScalar(coeffs_.lookup("CpRef"));
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
name_ + ":Cp",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensionedScalar
(
@ -104,7 +95,6 @@ Foam::fv::solidificationMeltingSource::Cp() const
CpRef
),
extrapolatedCalculatedFvPatchScalarField::typeName
)
);
}
else

13
src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
View File

@ -179,18 +179,7 @@ void Foam::fv::interRegionHeatTransferModel::addSup
tmp<volScalarField> tTmapped
(
new volScalarField
(
IOobject
(
type() + ":Tmapped",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
T
)
volScalarField::New(type() + ":Tmapped", T)
);
volScalarField& Tmapped = tTmapped.ref();

45
src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H
View File

@ -32,16 +32,9 @@ Foam::coalCloudList::UTrans() const
{
tmp<volVectorField::Internal> tfld
(
new volVectorField::Internal
(
IOobject
volVectorField::Internal::New
(
"UTransEff",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensionedVector("zero", dimMass*dimVelocity, Zero)
)
@ -80,16 +73,9 @@ Foam::coalCloudList::hsTrans() const
{
tmp<volScalarField::Internal> tfld
(
new volScalarField::Internal
(
IOobject
volScalarField::Internal::New
(
"hsTransEff",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensionedScalar(dimEnergy, 0)
)
@ -146,16 +132,9 @@ Foam::coalCloudList::rhoTrans() const
{
tmp<volScalarField::Internal> tfld
(
new volScalarField::Internal
(
IOobject
volScalarField::Internal::New
(
"rhoTransEff",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensionedScalar(dimMass, 0)
)
@ -182,16 +161,9 @@ Foam::coalCloudList::Srho() const
{
tmp<volScalarField::Internal> tfld
(
new volScalarField::Internal
(
IOobject
volScalarField::Internal::New
(
"rhoTransEff",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensionedScalar(dimDensity/dimTime, 0)
)
@ -216,16 +188,9 @@ Foam::coalCloudList::Srho
{
tmp<volScalarField::Internal> tfld
(
new volScalarField::Internal
(
IOobject
volScalarField::Internal::New
(
"rhoTransEff",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensionedScalar(dimDensity/dimTime, 0)
)

40
src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
View File

@ -457,17 +457,9 @@ Foam::KinematicCloud<CloudType>::vDotSweep() const
{
tmp<volScalarField> tvDotSweep
(
new volScalarField
(
IOobject
volScalarField::New
(
this->name() + ":vDotSweep",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
dimensionedScalar(dimless/dimTime, 0),
extrapolatedCalculatedFvPatchScalarField::typeName
@ -496,17 +488,9 @@ Foam::KinematicCloud<CloudType>::theta() const
{
tmp<volScalarField> ttheta
(
new volScalarField
(
IOobject
volScalarField::New
(
this->name() + ":theta",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
dimensionedScalar(dimless, 0),
extrapolatedCalculatedFvPatchScalarField::typeName
@ -535,17 +519,9 @@ Foam::KinematicCloud<CloudType>::alpha() const
{
tmp<volScalarField> talpha
(
new volScalarField
(
IOobject
volScalarField::New
(
this->name() + ":alpha",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
dimensionedScalar(dimless, 0)
)
@ -572,17 +548,9 @@ Foam::KinematicCloud<CloudType>::rhoEff() const
{
tmp<volScalarField> trhoEff
(
new volScalarField
(
IOobject
volScalarField::New
(
this->name() + ":rhoEff",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
dimensionedScalar(dimDensity, 0)
)

40
src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
View File

@ -111,17 +111,9 @@ inline Foam::tmp<Foam::fvScalarMatrix> Foam::ReactingCloud<CloudType>::SYi
{
tmp<volScalarField> trhoTrans
(
new volScalarField
(
IOobject
volScalarField::New
(
this->name() + ":rhoTrans",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh(),
dimensionedScalar(dimMass/dimTime/dimVolume, 0)
)
@ -159,17 +151,9 @@ Foam::ReactingCloud<CloudType>::Srho(const label i) const
{
tmp<volScalarField::Internal> tRhoi
(
new volScalarField::Internal
(
IOobject
volScalarField::Internal::New
(
this->name() + ":rhoTrans",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh(),
dimensionedScalar
(
@ -195,17 +179,9 @@ Foam::ReactingCloud<CloudType>::Srho() const
{
tmp<volScalarField::Internal> trhoTrans
(
new volScalarField::Internal
(
IOobject
volScalarField::Internal::New
(
this->name() + ":rhoTrans",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh(),
dimensionedScalar
(
@ -238,17 +214,9 @@ Foam::ReactingCloud<CloudType>::Srho(volScalarField& rho) const
{
tmp<volScalarField> trhoTrans
(
new volScalarField
(
IOobject
volScalarField::New
(
this->name() + ":rhoTrans",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh(),
dimensionedScalar(dimMass/dimTime/dimVolume, 0)
)

30
src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
View File

@ -264,17 +264,9 @@ inline Foam::tmp<Foam::volScalarField> Foam::ThermoCloud<CloudType>::Ep() const
{
tmp<volScalarField> tEp
(
new volScalarField
(
IOobject
volScalarField::New
(
this->name() + ":radiation:Ep",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh(),
dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0)
)
@ -300,17 +292,9 @@ inline Foam::tmp<Foam::volScalarField> Foam::ThermoCloud<CloudType>::ap() const
{
tmp<volScalarField> tap
(
new volScalarField
(
IOobject
volScalarField::New
(
this->name() + ":radiation:ap",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh(),
dimensionedScalar(dimless/dimLength, 0)
)
@ -337,17 +321,9 @@ Foam::ThermoCloud<CloudType>::sigmap() const
{
tmp<volScalarField> tsigmap
(
new volScalarField
(
IOobject
volScalarField::New
(
this->name() + ":radiation:sigmap",
this->db().time().timeName(),
this->db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh(),
dimensionedScalar(dimless/dimLength, 0)
)

6
src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C
View File

@ -301,14 +301,10 @@ void Foam::PackingModels::Implicit<CloudType>::cacheFields(const bool store)
}
// correction velocity
uCorrect_ = tmp<volVectorField>
(
new volVectorField
uCorrect_ = volVectorField::New
(
cloudName + ":uCorrect",
fvc::reconstruct(phiCorrect_())
)
);
uCorrect_->correctBoundaryConditions();

30
src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
View File

@ -72,17 +72,9 @@ Foam::radiation::cloudAbsorptionEmission::aDisp(const label) const
{
tmp<volScalarField> ta
(
new volScalarField
(
IOobject
volScalarField::New
(
"a",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
dimensionedScalar(dimless/dimLength, 0)
)
@ -107,17 +99,9 @@ Foam::radiation::cloudAbsorptionEmission::eDisp(const label bandI) const
{
tmp<volScalarField> te
(
new volScalarField
(
IOobject
volScalarField::New
(
"e",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
dimensionedScalar(dimless/dimLength, 0)
)
@ -132,17 +116,9 @@ Foam::radiation::cloudAbsorptionEmission::EDisp(const label bandI) const
{
tmp<volScalarField> tE
(
new volScalarField
(
IOobject
volScalarField::New
(
"E",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0)
)

10
src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
View File

@ -72,17 +72,9 @@ Foam::radiation::cloudScatter::sigmaEff() const
{
tmp<volScalarField> tsigma
(
new volScalarField
(
IOobject
volScalarField::New
(
"sigma",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
dimensionedScalar(dimless/dimLength, 0)
)

63
src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
View File

@ -162,42 +162,22 @@ void kinematicSingleLayer::transferPrimaryRegionSourceFields()
tmp<volScalarField> kinematicSingleLayer::pu()
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
typeName + ":pu",
time_.timeName(),
regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
pPrimary_ // pressure (mapped from primary region)
- pSp_ // accumulated particle impingement
- fvc::laplacian(sigma_, delta_) // surface tension
)
);
}
tmp<volScalarField> kinematicSingleLayer::pp()
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
typeName + ":pp",
time_.timeName(),
regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
-rho_*gNormClipped() // hydrostatic effect only
)
);
}
@ -1101,22 +1081,11 @@ void kinematicSingleLayer::info()
tmp<volScalarField::Internal> kinematicSingleLayer::Srho() const
{
return tmp<volScalarField::Internal>
(
new volScalarField::Internal
(
IOobject
return volScalarField::Internal::New
(
typeName + ":Srho",
time().timeName(),
primaryMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
primaryMesh(),
dimensionedScalar(dimMass/dimVolume/dimTime, 0)
)
);
}
@ -1126,44 +1095,22 @@ tmp<volScalarField::Internal> kinematicSingleLayer::Srho
const label i
) const
{
return tmp<volScalarField::Internal>
(
new volScalarField::Internal
(
IOobject
return volScalarField::Internal::New
(
typeName + ":Srho(" + Foam::name(i) + ")",
time().timeName(),
primaryMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
primaryMesh(),
dimensionedScalar(dimMass/dimVolume/dimTime, 0)
)
);
}
tmp<volScalarField::Internal> kinematicSingleLayer::Sh() const
{
return tmp<volScalarField::Internal>
(
new volScalarField::Internal
(
IOobject
return volScalarField::Internal::New
(
typeName + ":Sh",
time().timeName(),
primaryMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
primaryMesh(),
dimensionedScalar(dimEnergy/dimVolume/dimTime, 0)
)
);
}

49
src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H
View File

@ -208,23 +208,7 @@ inline tmp<volScalarField> kinematicSingleLayer::deltaMass() const
inline tmp<volScalarField> kinematicSingleLayer::gNorm() const
{
tmp<volScalarField> tgNorm
(
new volScalarField
(
IOobject
(
"gNorm",
time().timeName(),
regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
g_ & nHat()
)
);
return tgNorm;
return volScalarField::New("gNorm", g_ & nHat());
}
@ -232,18 +216,7 @@ inline tmp<volScalarField> kinematicSingleLayer::gNormClipped() const
{
tmp<volScalarField> tgNormClipped
(
new volScalarField
(
IOobject
(
"gNormClipped",
time().timeName(),
regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
g_ & nHat()
)
volScalarField::New("gNormClipped", g_ & nHat())
);
volScalarField& gNormClipped = tgNormClipped.ref();
@ -255,23 +228,7 @@ inline tmp<volScalarField> kinematicSingleLayer::gNormClipped() const
inline tmp<volVectorField> kinematicSingleLayer::gTan() const
{
tmp<volVectorField> tgTan
(
new volVectorField
(
IOobject
(
"gTan",
time().timeName(),
regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
g_ - nHat()*gNorm()
)
);
return tgTan;
return volVectorField::New("gTan", g_ - nHat()*gNorm());
}

39
src/regionModels/surfaceFilmModels/noFilm/noFilm.C
View File

@ -72,66 +72,33 @@ Foam::scalar noFilm::CourantNumber() const
tmp<volScalarField::Internal> noFilm::Srho() const
{
return tmp<volScalarField::Internal>
(
new volScalarField::Internal
(
IOobject
return volScalarField::Internal::New
(
"noFilm::Srho",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
dimensionedScalar(dimMass/dimVolume/dimTime, 0)
)
);
}
tmp<volScalarField::Internal> noFilm::Srho(const label i) const
{
return tmp<volScalarField::Internal>
(
new volScalarField::Internal
(
IOobject
return volScalarField::Internal::New
(
"noFilm::Srho(" + Foam::name(i) + ")",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
dimensionedScalar(dimMass/dimVolume/dimTime, 0)
)
);
}
tmp<volScalarField::Internal> noFilm::Sh() const
{
return tmp<volScalarField::Internal>
(
new volScalarField::Internal
(
IOobject
return volScalarField::Internal::New
(
"noFilm::Sh",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
dimensionedScalar(dimEnergy/dimVolume/dimTime, 0)
)
);
}

45
src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
View File

@ -261,16 +261,9 @@ tmp<volScalarField> constantFilmThermo::rho() const
{
tmp<volScalarField> trho
(
new volScalarField
(
IOobject
volScalarField::New
(
type() + ':' + rho0_.name_,
film().time().timeName(),
film().regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
film().regionMesh(),
dimensionedScalar(dimDensity, 0),
extrapolatedCalculatedFvPatchScalarField::typeName
@ -288,16 +281,9 @@ tmp<volScalarField> constantFilmThermo::mu() const
{
tmp<volScalarField> tmu
(
new volScalarField
(
IOobject
volScalarField::New
(
type() + ':' + mu0_.name_,
film().time().timeName(),
film().regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
film().regionMesh(),
dimensionedScalar(dimPressure*dimTime, 0),
extrapolatedCalculatedFvPatchScalarField::typeName
@ -315,16 +301,9 @@ tmp<volScalarField> constantFilmThermo::sigma() const
{
tmp<volScalarField> tsigma
(
new volScalarField
(
IOobject
volScalarField::New
(
type() + ':' + sigma0_.name_,
film().time().timeName(),
film().regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
film().regionMesh(),
dimensionedScalar(dimMass/sqr(dimTime), 0),
extrapolatedCalculatedFvPatchScalarField::typeName
@ -342,16 +321,9 @@ tmp<volScalarField> constantFilmThermo::Cp() const
{
tmp<volScalarField> tCp
(
new volScalarField
(
IOobject
volScalarField::New
(
type() + ':' + Cp0_.name_,
film().time().timeName(),
film().regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
film().regionMesh(),
dimensionedScalar(dimEnergy/dimMass/dimTemperature, 0),
extrapolatedCalculatedFvPatchScalarField::typeName
@ -369,16 +341,9 @@ tmp<volScalarField> constantFilmThermo::kappa() const
{
tmp<volScalarField> tkappa
(
new volScalarField
(
IOobject
volScalarField::New
(
type() + ':' + kappa0_.name_,
film().time().timeName(),
film().regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
film().regionMesh(),
dimensionedScalar(dimPower/dimLength/dimTemperature, 0),
extrapolatedCalculatedFvPatchScalarField::typeName

45
src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
View File

@ -240,16 +240,9 @@ tmp<volScalarField> liquidFilmThermo::rho() const
{
tmp<volScalarField> trho
(
new volScalarField
(
IOobject
volScalarField::New
(
type() + ":rho",
film().time().timeName(),
film().regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
film().regionMesh(),
dimensionedScalar(dimDensity, 0),
extrapolatedCalculatedFvPatchScalarField::typeName
@ -288,16 +281,9 @@ tmp<volScalarField> liquidFilmThermo::mu() const
{
tmp<volScalarField> tmu
(
new volScalarField
(
IOobject
volScalarField::New
(
type() + ":mu",
film().time().timeName(),
film().regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
film().regionMesh(),
dimensionedScalar(dimPressure*dimTime, 0),
extrapolatedCalculatedFvPatchScalarField::typeName
@ -336,16 +322,9 @@ tmp<volScalarField> liquidFilmThermo::sigma() const
{
tmp<volScalarField> tsigma
(
new volScalarField
(
IOobject
volScalarField::New
(
type() + ":sigma",
film().time().timeName(),
film().regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
film().regionMesh(),
dimensionedScalar(dimMass/sqr(dimTime), 0),
extrapolatedCalculatedFvPatchScalarField::typeName
@ -384,16 +363,9 @@ tmp<volScalarField> liquidFilmThermo::Cp() const
{
tmp<volScalarField> tCp
(
new volScalarField
(
IOobject
volScalarField::New
(
type() + ":Cp",
film().time().timeName(),
film().regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
film().regionMesh(),
dimensionedScalar(dimEnergy/dimMass/dimTemperature, 0),
extrapolatedCalculatedFvPatchScalarField::typeName
@ -432,16 +404,9 @@ tmp<volScalarField> liquidFilmThermo::kappa() const
{
tmp<volScalarField> tkappa
(
new volScalarField
(
IOobject
volScalarField::New
(
type() + ":kappa",
film().time().timeName(),
film().regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
film().regionMesh(),
dimensionedScalar(dimPower/dimLength/dimTemperature, 0),
extrapolatedCalculatedFvPatchScalarField::typeName

18
src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
View File

@ -72,16 +72,9 @@ tmp<volVectorField> laminar::Us() const
{
tmp<volVectorField> tUs
(
new volVectorField
(
IOobject
volVectorField::New
(
typeName + ":Us",
filmModel_.regionMesh().time().timeName(),
filmModel_.regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
filmModel_.regionMesh(),
dimensionedVector("zero", dimVelocity, Zero),
extrapolatedCalculatedFvPatchVectorField::typeName
@ -100,16 +93,9 @@ tmp<volScalarField> laminar::mut() const
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
volScalarField::New
(
typeName + ":mut",
filmModel_.regionMesh().time().timeName(),
filmModel_.regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
filmModel_.regionMesh(),
dimensionedScalar(dimMass/dimLength/dimTime, 0)
)

9
src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C
View File

@ -131,16 +131,9 @@ tmp<fvVectorMatrix> contactAngleForce::correct(volVectorField& U)
{
tmp<volVectorField> tForce
(
new volVectorField
(
IOobject
volVectorField::New
(
typeName + ":contactForce",
filmModel_.time().timeName(),
filmModel_.regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
filmModel_.regionMesh(),
dimensionedVector("zero", dimForce/dimArea, Zero)
)

7
src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C
View File

@ -74,14 +74,9 @@ tmp<volScalarField> distributionContactAngleForce::theta() const
{
tmp<volScalarField> ttheta
(
new volScalarField
(
IOobject
volScalarField::New
(
typeName + ":theta",
filmModel_.time().timeName(),
filmModel_.regionMesh()
),
filmModel_.regionMesh(),
dimensionedScalar(dimless, 0)
)

7
src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C
View File

@ -83,14 +83,9 @@ perturbedTemperatureDependentContactAngleForce::theta() const
{
tmp<volScalarField> ttheta
(
new volScalarField
(
IOobject
volScalarField::New
(
typeName + ":theta",
filmModel_.time().timeName(),
filmModel_.regionMesh()
),
filmModel_.regionMesh(),
dimensionedScalar(dimless, 0)
)

7
src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C
View File

@ -71,14 +71,9 @@ tmp<volScalarField> temperatureDependentContactAngleForce::theta() const
{
tmp<volScalarField> ttheta
(
new volScalarField
(
IOobject
volScalarField::New
(
typeName + ":theta",
filmModel_.time().timeName(),
filmModel_.regionMesh()
),
filmModel_.regionMesh(),
dimensionedScalar(dimless, 0)
)

4
src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C
View File

@ -65,7 +65,7 @@ tmp<volScalarField> curvatureSeparation::calcInvR1
/*
tmp<volScalarField> tinvR1
(
new volScalarField("invR1", fvc::div(film().nHat()))
volScalarField::New("invR1", fvc::div(film().nHat()))
);
*/
@ -74,7 +74,7 @@ tmp<volScalarField> curvatureSeparation::calcInvR1
volVectorField UHat(U/(mag(U) + smallU));
tmp<volScalarField> tinvR1
(
new volScalarField("invR1", UHat & (UHat & gradNHat_))
volScalarField::New("invR1", UHat & (UHat & gradNHat_))
);

9
src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C
View File

@ -105,16 +105,9 @@ tmp<volScalarField> constantRadiation::Shs()
{
tmp<volScalarField> tShs
(
new volScalarField
(
IOobject
volScalarField::New
(
typeName + ":Shs",
film().time().timeName(),
film().regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
film().regionMesh(),
dimensionedScalar(dimMass/pow3(dimTime), 0)
)

12
src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/noRadiation/noRadiation.C
View File

@ -73,21 +73,11 @@ void noRadiation::correct()
tmp<volScalarField> noRadiation::Shs()
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
typeName + ":Shs",
film().time().timeName(),
film().regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
film().regionMesh(),
dimensionedScalar(dimMass/pow3(dimTime), 0)
)
);
}

9
src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C
View File

@ -92,16 +92,9 @@ tmp<volScalarField> primaryRadiation::Shs()
{
tmp<volScalarField> tShs
(
new volScalarField
(
IOobject
volScalarField::New
(
typeName + ":Shs",
film().time().timeName(),
film().regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
film().regionMesh(),
dimensionedScalar(dimMass/pow3(dimTime), 0)
)

9
src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C
View File

@ -109,16 +109,9 @@ tmp<volScalarField> standardRadiation::Shs()
{
tmp<volScalarField> tShs
(
new volScalarField
(
IOobject
volScalarField::New
(
typeName + ":Shs",
film().time().timeName(),
film().regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
film().regionMesh(),
dimensionedScalar(dimMass/pow3(dimTime), 0)
)

13
src/regionModels/surfaceFilmModels/submodels/thermo/heatTransferModel/constantHeatTransfer/constantHeatTransfer.C
View File

@ -74,26 +74,15 @@ void constantHeatTransfer::correct()
tmp<volScalarField> constantHeatTransfer::h() const
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
"htc",
filmModel_.time().timeName(),
filmModel_.regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
filmModel_.regionMesh(),
dimensionedScalar
(
dimEnergy/dimTime/sqr(dimLength)/dimTemperature,
c0_
)
)
);
}

30
src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
View File

@ -726,17 +726,9 @@ tmp<volScalarField::Internal> thermoSingleLayer::Srho() const
{
tmp<volScalarField::Internal> tSrho
(
new volScalarField::Internal
(
IOobject
volScalarField::Internal::New
(
"thermoSingleLayer::Srho",
time().timeName(),
primaryMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
primaryMesh(),
dimensionedScalar(dimMass/dimVolume/dimTime, 0)
)
@ -778,17 +770,9 @@ tmp<volScalarField::Internal> thermoSingleLayer::Srho
tmp<volScalarField::Internal> tSrho
(
new volScalarField::Internal
(
IOobject
volScalarField::Internal::New
(
"thermoSingleLayer::Srho(" + Foam::name(i) + ")",
time_.timeName(),
primaryMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
primaryMesh(),
dimensionedScalar(dimMass/dimVolume/dimTime, 0)
)
@ -828,17 +812,9 @@ tmp<volScalarField::Internal> thermoSingleLayer::Sh() const
{
tmp<volScalarField::Internal> tSh
(
new volScalarField::Internal
(
IOobject
volScalarField::Internal::New
(
"thermoSingleLayer::Sh",
time().timeName(),
primaryMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
primaryMesh(),
dimensionedScalar(dimEnergy/dimVolume/dimTime, 0)
)

25
src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H
View File

@ -61,20 +61,10 @@ inline tmp<volScalarField> thermoSingleLayer::hs
const volScalarField& T
) const
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
"hs(" + T.name() + ")",
time().timeName(),
regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
Cp_*(T - Tref)
)
);
}
@ -86,18 +76,7 @@ inline tmp<volScalarField> thermoSingleLayer::T
{
tmp<volScalarField> tT
(
new volScalarField
(
IOobject
(
"T(" + hs.name() + ")",
time().timeName(),
regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
hs/Cp_ + Tref
)
volScalarField::New("T(" + hs.name() + ")", hs/Cp_ + Tref)
);
tT.ref().min(Tmax_);

10
src/regionModels/thermalBaffleModels/noThermo/noThermo.C
View File

@ -93,17 +93,9 @@ const tmp<volScalarField> noThermo::Cp() const
return tmp<volScalarField>
(
new volScalarField
(
IOobject
volScalarField::New
(
"noThermo::Cp",
time().timeName(),
primaryMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
primaryMesh(),
dimensionedScalar(dimEnergy/dimVolume/dimTime, 0)
)

10
src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C
View File

@ -75,17 +75,9 @@ void thermalBaffle::solveEnergy()
tmp<volScalarField> tQ
(
new volScalarField
(
IOobject
volScalarField::New
(
"tQ",
regionMesh().time().timeName(),
regionMesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
regionMesh(),
dimensionedScalar(dimEnergy/dimVolume/dimTime, 0)
)

80
src/thermophysicalModels/basic/heThermo/heThermo.C
View File

@ -170,17 +170,9 @@ Foam::tmp<Foam::volScalarField> Foam::heThermo<BasicThermo, MixtureType>::he
tmp<volScalarField> the
(
new volScalarField
(
IOobject
volScalarField::New
(
"he",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh,
he_.dimensions()
)
@ -265,17 +257,9 @@ Foam::heThermo<BasicThermo, MixtureType>::hc() const
tmp<volScalarField> thc
(
new volScalarField
(
IOobject
volScalarField::New
(
"hc",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh,
he_.dimensions()
)
@ -334,17 +318,9 @@ Foam::heThermo<BasicThermo, MixtureType>::Cp() const
tmp<volScalarField> tCp
(
new volScalarField
(
IOobject
volScalarField::New
(
"Cp",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh,
dimEnergy/dimMass/dimTemperature
)
@ -407,17 +383,9 @@ Foam::heThermo<BasicThermo, MixtureType>::Cv() const
tmp<volScalarField> tCv
(
new volScalarField
(
IOobject
volScalarField::New
(
"Cv",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh,
dimEnergy/dimMass/dimTemperature
)
@ -476,17 +444,9 @@ Foam::heThermo<BasicThermo, MixtureType>::gamma() const
tmp<volScalarField> tgamma
(
new volScalarField
(
IOobject
volScalarField::New
(
"gamma",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh,
dimless
)
@ -551,17 +511,9 @@ Foam::heThermo<BasicThermo, MixtureType>::Cpv() const
tmp<volScalarField> tCpv
(
new volScalarField
(
IOobject
volScalarField::New
(
"Cpv",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh,
dimEnergy/dimMass/dimTemperature
)
@ -623,17 +575,9 @@ Foam::heThermo<BasicThermo, MixtureType>::CpByCpv() const
tmp<volScalarField> tCpByCpv
(
new volScalarField
(
IOobject
volScalarField::New
(
"CpByCpv",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh,
dimless
)
@ -729,17 +673,9 @@ Foam::tmp<Foam::volScalarField> Foam::heThermo<BasicThermo, MixtureType>::W
tmp<volScalarField> tW
(
new volScalarField
(
IOobject
volScalarField::New
(
"W",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh,
dimMass/dimMoles
)

29
src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C
View File

@ -276,17 +276,9 @@ Foam::StandardChemistryModel<ReactionThermo, ThermoType>::tc() const
{
tmp<volScalarField> ttc
(
new volScalarField
(
IOobject
volScalarField::New
(
"tc",
this->time().timeName(),
this->mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh(),
dimensionedScalar(dimTime, small),
extrapolatedCalculatedFvPatchScalarField::typeName
@ -350,17 +342,9 @@ Foam::StandardChemistryModel<ReactionThermo, ThermoType>::Qdot() const
{
tmp<volScalarField> tQdot
(
new volScalarField
(
IOobject
volScalarField::New
(
"Qdot",
this->mesh_.time().timeName(),
this->mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh_,
dimensionedScalar(dimEnergy/dimVolume/dimTime, 0)
)
@ -394,16 +378,9 @@ Foam::StandardChemistryModel<ReactionThermo, ThermoType>::calculateRR
{
tmp<volScalarField::Internal> tRR
(
new volScalarField::Internal
(
IOobject
volScalarField::Internal::New
(
"RR",
this->mesh().time().timeName(),
this->mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
this->mesh(),
dimensionedScalar(dimMass/dimVolume/dimTime, 0)
)

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

@ -112,17 +112,9 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::Gulders::Su0pTphi
{
tmp<volScalarField> tSu0
(
new volScalarField
(
IOobject
volScalarField::New
(
"Su0",
p.time().timeName(),
p.db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
p.mesh(),
dimensionedScalar(dimVelocity, 0)
)
@ -165,17 +157,9 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::Gulders::Su0pTphi
{
tmp<volScalarField> tSu0
(
new volScalarField
(
IOobject
volScalarField::New
(
"Su0",
p.time().timeName(),
p.db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
p.mesh(),
dimensionedScalar(dimVelocity, 0)
)

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

@ -112,17 +112,9 @@ Foam::laminarFlameSpeedModels::GuldersEGR::Su0pTphi
{
tmp<volScalarField> tSu0
(
new volScalarField
(
IOobject
volScalarField::New
(
"Su0",
p.time().timeName(),
p.db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
p.mesh(),
dimensionedScalar(dimVelocity, 0)
)
@ -167,17 +159,9 @@ Foam::laminarFlameSpeedModels::GuldersEGR::Su0pTphi
{
tmp<volScalarField> tSu0
(
new volScalarField
(
IOobject
volScalarField::New
(
"Su0",
p.time().timeName(),
p.db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
p.mesh(),
dimensionedScalar(dimVelocity, 0)
)

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

@ -327,17 +327,9 @@ Foam::laminarFlameSpeedModels::RaviPetersen::operator()() const
tmp<volScalarField> tSu0
(
new volScalarField
(
IOobject
volScalarField::New
(
"Su0",
p.time().timeName(),
p.db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
p.mesh(),
dimensionedScalar(dimVelocity, 0)
)

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

@ -69,22 +69,11 @@ Foam::laminarFlameSpeedModels::constant::~constant()
Foam::tmp<Foam::volScalarField>
Foam::laminarFlameSpeedModels::constant::operator()() const
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
"Su0",
psiuReactionThermo_.T().time().timeName(),
psiuReactionThermo_.T().db(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
psiuReactionThermo_.T().mesh(),
Su_
)
);
}

13
src/thermophysicalModels/radiation/radiationModels/P1/P1.C
View File

@ -259,21 +259,10 @@ void Foam::radiation::P1::calculate()
Foam::tmp<Foam::volScalarField> Foam::radiation::P1::Rp() const
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
"Rp",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
4.0*absorptionEmission_->eCont()*physicoChemical::sigma
)
);
}

18
src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C
View File

@ -206,16 +206,9 @@ Foam::radiation::blackBodyEmission::deltaLambdaT
{
tmp<volScalarField> deltaLambdaT
(
new volScalarField
(
IOobject
volScalarField::New
(
"deltaLambdaT",
T.mesh().time().timeName(),
T.mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
T.mesh(),
dimensionedScalar(dimless, 1.0)
)
@ -244,16 +237,9 @@ Foam::radiation::blackBodyEmission::EbDeltaLambdaT
{
tmp<volScalarField> Eb
(
new volScalarField
(
IOobject
volScalarField::New
(
"Eb",
T.mesh().time().timeName(),
T.mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
physicoChemical::sigma*pow4(T)
)
);

12
src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
View File

@ -448,24 +448,14 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::fvDOM::Rp() const
// Construct using contribution from first frequency band
tmp<volScalarField> tRp
(
new volScalarField
(
IOobject
volScalarField::New
(
"Rp",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
(
4
*physicoChemical::sigma
*(aLambda_[0] - absorptionEmission_->aDisp(0)())
*blackBody_.deltaLambdaT(T_, absorptionEmission_->bands(0))
)
)
);
volScalarField& Rp=tRp.ref();

24
src/thermophysicalModels/radiation/radiationModels/noRadiation/noRadiation.C
View File

@ -84,25 +84,15 @@ bool Foam::radiation::noRadiation::read()
Foam::tmp<Foam::volScalarField> Foam::radiation::noRadiation::Rp() const
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
"Rp",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensionedScalar
(
constant::physicoChemical::sigma.dimensions()/dimLength,
0
)
)
);
}
@ -110,21 +100,11 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::noRadiation::Rp() const
Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
Foam::radiation::noRadiation::Ru() const
{
return tmp<volScalarField::Internal>
(
new volScalarField::Internal
(
IOobject
return volScalarField::Internal::New
(
"Ru",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0)
)
);
}

24
src/thermophysicalModels/radiation/radiationModels/opaqueSolid/opaqueSolid.C
View File

@ -81,25 +81,15 @@ void Foam::radiation::opaqueSolid::calculate()
Foam::tmp<Foam::volScalarField> Foam::radiation::opaqueSolid::Rp() const
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
"Rp",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensionedScalar
(
constant::physicoChemical::sigma.dimensions()/dimLength,
0
)
)
);
}
@ -107,21 +97,11 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::opaqueSolid::Rp() const
Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
Foam::radiation::opaqueSolid::Ru() const
{
return tmp<volScalarField::Internal>
(
new volScalarField::Internal
(
IOobject
return volScalarField::Internal::New
(
"Ru",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0)
)
);
}

26
src/thermophysicalModels/radiation/radiationModels/viewFactor/viewFactor.C
View File

@ -677,26 +677,15 @@ void Foam::radiation::viewFactor::calculate()
Foam::tmp<Foam::volScalarField> Foam::radiation::viewFactor::Rp() const
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
"Rp",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
dimensionedScalar
(
dimMass/pow3(dimTime)/dimLength/pow4(dimTemperature),
0
)
)
);
}
@ -704,22 +693,11 @@ Foam::tmp<Foam::volScalarField> Foam::radiation::viewFactor::Rp() const
Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh>>
Foam::radiation::viewFactor::Ru() const
{
return tmp<volScalarField::Internal>
(
new volScalarField::Internal
(
IOobject
return volScalarField::Internal::New
(
"Ru",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0)
)
);
}

78
src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C
View File

@ -67,22 +67,11 @@ Foam::radiation::absorptionEmissionModel::a(const label bandI) const
Foam::tmp<Foam::volScalarField>
Foam::radiation::absorptionEmissionModel::aCont(const label bandI) const
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
"aCont",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
dimensionedScalar(dimless/dimLength, 0)
)
);
}
@ -90,22 +79,11 @@ Foam::radiation::absorptionEmissionModel::aCont(const label bandI) const
Foam::tmp<Foam::volScalarField>
Foam::radiation::absorptionEmissionModel::aDisp(const label bandI) const
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
"aDisp",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
dimensionedScalar(dimless/dimLength, 0)
)
);
}
@ -120,22 +98,11 @@ Foam::radiation::absorptionEmissionModel::e(const label bandI) const
Foam::tmp<Foam::volScalarField>
Foam::radiation::absorptionEmissionModel::eCont(const label bandI) const
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
"eCont",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
dimensionedScalar(dimless/dimLength, 0)
)
);
}
@ -143,22 +110,11 @@ Foam::radiation::absorptionEmissionModel::eCont(const label bandI) const
Foam::tmp<Foam::volScalarField>
Foam::radiation::absorptionEmissionModel::eDisp(const label bandI) const
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
"eDisp",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
dimensionedScalar(dimless/dimLength, 0)
)
);
}
@ -173,22 +129,11 @@ Foam::radiation::absorptionEmissionModel::E(const label bandI) const
Foam::tmp<Foam::volScalarField>
Foam::radiation::absorptionEmissionModel::ECont(const label bandI) const
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
"ECont",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0)
)
);
}
@ -196,22 +141,11 @@ Foam::radiation::absorptionEmissionModel::ECont(const label bandI) const
Foam::tmp<Foam::volScalarField>
Foam::radiation::absorptionEmissionModel::EDisp(const label bandI) const
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
"EDisp",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0)
)
);
}

45
src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C
View File

@ -71,75 +71,36 @@ Foam::radiation::constantAbsorptionEmission::~constantAbsorptionEmission()
Foam::tmp<Foam::volScalarField>
Foam::radiation::constantAbsorptionEmission::aCont(const label bandI) const
{
tmp<volScalarField> ta
(
new volScalarField
(
IOobject
return volScalarField::New
(
"a",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
a_
)
);
return ta;
}
Foam::tmp<Foam::volScalarField>
Foam::radiation::constantAbsorptionEmission::eCont(const label bandI) const
{
tmp<volScalarField> te
(
new volScalarField
(
IOobject
return volScalarField::New
(
"e",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
e_
)
);
return te;
}
Foam::tmp<Foam::volScalarField>
Foam::radiation::constantAbsorptionEmission::ECont(const label bandI) const
{
tmp<volScalarField> tE
(
new volScalarField
(
IOobject
return volScalarField::New
(
"E",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
E_
)
);
return tE;
}

18
src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
View File

@ -186,16 +186,9 @@ Foam::radiation::greyMeanAbsorptionEmission::aCont(const label bandI) const
tmp<volScalarField> ta
(
new volScalarField
(
IOobject
volScalarField::New
(
"aCont" + name(bandI),
mesh().time().timeName(),
mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh(),
dimensionedScalar(dimless/dimLength, 0),
extrapolatedCalculatedFvPatchVectorField::typeName
@ -267,16 +260,9 @@ Foam::radiation::greyMeanAbsorptionEmission::ECont(const label bandI) const
{
tmp<volScalarField> E
(
new volScalarField
(
IOobject
volScalarField::New
(
"ECont" + name(bandI),
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0)
)

18
src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
View File

@ -201,16 +201,9 @@ Foam::radiation::wideBandAbsorptionEmission::aCont(const label bandi) const
tmp<volScalarField> ta
(
new volScalarField
(
IOobject
volScalarField::New
(
"a",
mesh().time().timeName(),
mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh(),
dimensionedScalar(dimless/dimLength, 0)
)
@ -285,16 +278,9 @@ Foam::radiation::wideBandAbsorptionEmission::ECont(const label bandi) const
{
tmp<volScalarField> E
(
new volScalarField
(
IOobject
volScalarField::New
(
"E",
mesh().time().timeName(),
mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh(),
dimensionedScalar(dimMass/dimLength/pow3(dimTime), 0)
)

13
src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.C
View File

@ -70,22 +70,11 @@ Foam::radiation::constantScatter::~constantScatter()
Foam::tmp<Foam::volScalarField>
Foam::radiation::constantScatter::sigmaEff() const
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
"sigma",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
sigma_*(3.0 - C_)
)
);
}

13
src/thermophysicalModels/radiation/submodels/scatterModel/noScatter/noScatter.C
View File

@ -60,22 +60,11 @@ Foam::radiation::noScatter::~noScatter()
Foam::tmp<Foam::volScalarField> Foam::radiation::noScatter::sigmaEff() const
{
return tmp<volScalarField>
(
new volScalarField
(
IOobject
return volScalarField::New
(
"sigma",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh_,
dimensionedScalar(dimless/dimLength, 0)
)
);
}

1
tutorials/combustion/reactingFoam/RAS/DLR_A_LTS/constant/reactionsGRI
View File

@ -3611,3 +3611,4 @@ reactions
Tlow 250;
Thigh 5000;

6
tutorials/combustion/reactingFoam/RAS/SandiaD_LTS/system/controlDict
View File

@ -18,17 +18,17 @@ application reactingFoam;
startFrom startTime;
startTime 1500;
startTime 0;
stopAt endTime;
endTime 5000;
endTime 1500;
deltaT 1;
writeControl runTime;
writeInterval 100;
writeInterval 1500;
purgeWrite 0;