zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-12-28 03:37:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STYLE: more consistent use of dimensioned Zero

Browse Source 
- when constructing dimensioned fields that are to be zero-initialized,
  it is preferrable to use a form such as

      dimensionedScalar(dims, Zero)
      dimensionedVector(dims, Zero)

  rather than

      dimensionedScalar("0", dims, 0)
      dimensionedVector("zero", dims, vector::zero)

  This reduces clutter and also avoids any suggestion that the name of
  the dimensioned quantity has any influence on the field's name.

  An even shorter version is possible. Eg,

      dimensionedScalar(dims)

  but reduces the clarity of meaning.

- NB: UniformDimensionedField is an exception to these style changes
  since it does use the name of the dimensioned type (instead of the
  regIOobject).
This commit is contained in:
Mark Olesen
2018-03-16 10:24:03 +01:00
parent 06035b8a30
commit 2f86cdc712
381 changed files with 1891 additions and 2730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C
View File

@ -130,12 +130,7 @@ int main(int argc, char *argv[])
mesh
),
mesh,
dimensionedVector
(
"0",
cloudSU.dimensions()/dimVolume,
vector::zero
),
dimensionedVector(cloudSU.dimensions()/dimVolume, Zero),
zeroGradientFvPatchVectorField::typeName
);

2
applications/solvers/multiphase/MPPICInterFoam/alphaEqnSubCycle.H
View File

@ -10,7 +10,7 @@ if (nAlphaSubCycles > 1)
mesh
),
mesh,
dimensionedScalar("0", rhoPhi.dimensions(), 0)
dimensionedScalar(rhoPhi.dimensions(), Zero)
);
tmp<volScalarField> trSubDeltaT;

2
applications/solvers/multiphase/MPPICInterFoam/createFields.H
View File

@ -138,7 +138,7 @@ volScalarField alphac
IOobject::AUTO_WRITE
),
mesh,
dimensionedScalar("0", dimless, 0),
dimensionedScalar(dimless, Zero),
zeroGradientFvPatchScalarField::typeName
);
alphac.oldTime();

2
applications/solvers/multiphase/VoF/alphaEqnSubCycle.H
View File

@ -10,7 +10,7 @@ if (nAlphaSubCycles > 1)
mesh
),
mesh,
dimensionedScalar("0", rhoPhi.dimensions(), 0)
dimensionedScalar(rhoPhi.dimensions(), Zero)
);
tmp<volScalarField> trSubDeltaT;

2
applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/correctPhi.H
View File

@ -12,7 +12,7 @@ correctUphiBCs(U, phi);
IOobject::NO_WRITE
),
mesh,
dimensionedScalar("pcorr", p.dimensions(), 0.0),
dimensionedScalar(p.dimensions(), Zero),
pcorrTypes
);

4
applications/solvers/multiphase/compressibleInterFoam/alphaSuSp.H
View File

@ -7,7 +7,7 @@ volScalarField::Internal Sp
mesh
),
mesh,
dimensionedScalar("Sp", dgdt.dimensions(), 0)
dimensionedScalar(dgdt.dimensions(), Zero)
);
volScalarField::Internal Su
@ -19,7 +19,7 @@ volScalarField::Internal Su
mesh
),
mesh,
dimensionedScalar("Su", dgdt.dimensions(), 0)
dimensionedScalar(dgdt.dimensions(), Zero)
);
forAll(dgdt, celli)

4
applications/solvers/multiphase/compressibleInterFoam/compressibleAlphaEqnSubCycle.H
View File

@ -13,7 +13,7 @@ if (nAlphaSubCycles > 1)
mesh
),
mesh,
dimensionedScalar("0", alphaPhi10.dimensions(), 0)
dimensionedScalar(alphaPhi10.dimensions(), Zero)
);
surfaceScalarField rhoPhiSum
@ -25,7 +25,7 @@ if (nAlphaSubCycles > 1)
mesh
),
mesh,
dimensionedScalar("0", rhoPhi.dimensions(), 0)
dimensionedScalar(rhoPhi.dimensions(), Zero)
);
tmp<volScalarField> trSubDeltaT;

4
applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/alphaSuSp.H
View File

@ -7,7 +7,7 @@ volScalarField::Internal Sp
mesh
),
mesh,
dimensionedScalar("Sp", dgdt.dimensions(), 0)
dimensionedScalar(dgdt.dimensions(), Zero)
);
volScalarField::Internal Su
@ -19,7 +19,7 @@ volScalarField::Internal Su
mesh
),
mesh,
dimensionedScalar("Su", dgdt.dimensions(), 0)
dimensionedScalar(dgdt.dimensions(), Zero)
);
forAll(dgdt, celli)

2
applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
View File

@ -136,7 +136,7 @@ Foam::fv::VoFSolidificationMeltingSource::VoFSolidificationMeltingSource
IOobject::AUTO_WRITE
),
mesh,
dimensionedScalar("alpha1", dimless, 0.0),
dimensionedScalar(dimless, Zero),
zeroGradientFvPatchScalarField::typeName
),
curTimeIndex_(-1)

19
applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/multiphaseMixtureThermo.C
View File

@ -85,7 +85,7 @@ Foam::multiphaseMixtureThermo::multiphaseMixtureThermo
IOobject::NO_WRITE
),
mesh_,
dimensionedScalar("rhoPhi", dimMass/dimTime, 0.0)
dimensionedScalar(dimMass/dimTime, Zero)
),
alphas_
@ -99,7 +99,7 @@ Foam::multiphaseMixtureThermo::multiphaseMixtureThermo
IOobject::AUTO_WRITE
),
mesh_,
dimensionedScalar("alphas", dimless, 0.0)
dimensionedScalar(dimless, Zero)
),
sigmas_(lookup("sigmas")),
@ -686,12 +686,7 @@ Foam::multiphaseMixtureThermo::surfaceTensionForce() const
mesh_
),
mesh_,
dimensionedScalar
(
"surfaceTensionForce",
dimensionSet(1, -2, -2, 0, 0),
0.0
)
dimensionedScalar(dimensionSet(1, -2, -2, 0, 0), Zero)
)
);
@ -943,7 +938,7 @@ Foam::multiphaseMixtureThermo::nearInterface() const
mesh_
),
mesh_,
dimensionedScalar("nearInterface", dimless, 0.0)
dimensionedScalar(dimless, Zero)
)
);
@ -1030,7 +1025,7 @@ void Foam::multiphaseMixtureThermo::solveAlphas
MULES::limitSum(alphaPhiCorrs);
rhoPhi_ = dimensionedScalar("0", dimensionSet(1, 0, -1, 0, 0), 0);
rhoPhi_ = dimensionedScalar(dimensionSet(1, 0, -1, 0, 0), Zero);
volScalarField sumAlpha
(
@ -1041,7 +1036,7 @@ void Foam::multiphaseMixtureThermo::solveAlphas
mesh_
),
mesh_,
dimensionedScalar("sumAlpha", dimless, 0)
dimensionedScalar(dimless, Zero)
);
@ -1066,7 +1061,7 @@ void Foam::multiphaseMixtureThermo::solveAlphas
mesh_
),
mesh_,
dimensionedScalar("Sp", alpha.dgdt().dimensions(), 0.0)
dimensionedScalar(alpha.dgdt().dimensions(), Zero)
);
volScalarField::Internal Su

2
applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.C
View File

@ -61,7 +61,7 @@ Foam::phaseModel::phaseModel
IOobject::AUTO_WRITE
),
p.mesh(),
dimensionedScalar("0", dimless/dimTime, 0)
dimensionedScalar(dimless/dimTime, Zero)
)
{
{

4
applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H
View File

@ -8,7 +8,7 @@
mesh
),
mesh,
dimensionedScalar("0", phi.dimensions(), 0)
dimensionedScalar(phi.dimensions(), Zero)
);
surfaceScalarField phir(fvc::flux(UdmModel.Udm()));
@ -25,7 +25,7 @@
mesh
),
mesh,
dimensionedScalar("0", phi.dimensions(), 0)
dimensionedScalar(phi.dimensions(), Zero)
);
for

2
applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C
View File

@ -102,7 +102,7 @@ incompressibleTwoPhaseInteractingMixture
U_.db()
),
U_.mesh(),
dimensionedScalar("mu", dimensionSet(1, -1, -1, 0, 0), 0),
dimensionedScalar(dimensionSet(1, -1, -1, 0, 0), Zero),
calculatedFvPatchScalarField::typeName
)
{

2
applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
View File

@ -90,7 +90,7 @@ Foam::relativeVelocityModel::relativeVelocityModel
IOobject::AUTO_WRITE
),
alphac_.mesh(),
dimensionedVector("Udm", dimVelocity, Zero),
dimensionedVector(dimVelocity, Zero),
UdmPatchFieldTypes()
)
{}

2
applications/solvers/multiphase/interCondensatingEvaporatingFoam/createFields.H
View File

@ -136,6 +136,6 @@ volScalarField pDivU
mesh
),
mesh,
dimensionedScalar("pDivU", p.dimensions()/dimTime, 0)
dimensionedScalar(p.dimensions()/dimTime, Zero)
);

2
applications/solvers/multiphase/interCondensatingEvaporatingFoam/interCondensatingEvaporatingFoam.C
View File

@ -102,7 +102,7 @@ int main(int argc, char *argv[])
mesh
),
mesh,
dimensionedScalar("0", dimMass/dimTime, 0)
dimensionedScalar(dimMass/dimTime, Zero)
);
mixture->correct();

11
applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/constant/constant.C
View File

@ -72,9 +72,9 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDotAlphal() const
mesh_.lookupObject<basicThermo>(basicThermo::dictName)
);
const dimensionedScalar& TSat = thermo.TSat();
const dimensionedScalar& TSat = thermo.TSat();
dimensionedScalar T0("0", dimTemperature, 0.0);
const dimensionedScalar T0(dimTemperature, Zero);
return Pair<tmp<volScalarField>>
(
@ -106,9 +106,9 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDot() const
mesh_.lookupObject<basicThermo>(basicThermo::dictName)
);
const dimensionedScalar& TSat = thermo.TSat();
const dimensionedScalar& TSat = thermo.TSat();
dimensionedScalar T0("0", dimTemperature, 0.0);
const dimensionedScalar T0(dimTemperature, Zero);
return Pair<tmp<volScalarField>>
(
@ -139,8 +139,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDotDeltaT() const
mesh_.lookupObject<basicThermo>(basicThermo::dictName)
);
const dimensionedScalar& TSat = thermo.TSat();
const dimensionedScalar& TSat = thermo.TSat();
return Pair<tmp<volScalarField>>
(

23
applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C
View File

@ -100,7 +100,7 @@ Foam::twoPhaseMixtureEThermo::twoPhaseMixtureEThermo
IOobject::NO_WRITE
),
U.mesh(),
dimensionedScalar("zero", dimEnergy/dimMass, 0.0),
dimensionedScalar(dimEnergy/dimMass, Zero),
heBoundaryTypes()
)
),
@ -234,21 +234,18 @@ Foam::tmp<Foam::volScalarField> Foam::twoPhaseMixtureEThermo::hc() const
{
const fvMesh& mesh = this->T_.mesh();
return tmp<volScalarField>
return tmp<volScalarField>::New
(
new volScalarField
IOobject
(
IOobject
(
"hc",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
"hc",
mesh.time().timeName(),
mesh,
dimensionedScalar("hc",Hf2() - Hf1())
)
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
mesh,
dimensionedScalar("hc", Hf2() - Hf1())
);
}

2
applications/solvers/multiphase/interFoam/createFields.H
View File

@ -133,7 +133,7 @@ surfaceScalarField alphaPhiUn
IOobject::NO_WRITE
),
mesh,
dimensionedScalar("zero", phi.dimensions(), 0.0)
dimensionedScalar(phi.dimensions(), Zero)
);
#include "createMRF.H"

2
applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnSubCycle.H
View File

@ -10,7 +10,7 @@ if (nAlphaSubCycles > 1)
mesh
),
mesh,
dimensionedScalar("0", rhoPhi.dimensions(), 0)
dimensionedScalar(rhoPhi.dimensions(), Zero)
);
for

2
applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
View File

@ -116,7 +116,7 @@ Foam::incompressibleThreePhaseMixture::incompressibleThreePhaseMixture
U.db()
),
U.mesh(),
dimensionedScalar("nu", dimensionSet(0, 2, -1, 0, 0), 0),
dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), Zero),
calculatedFvPatchScalarField::typeName
),

4
applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
View File

@ -181,7 +181,7 @@ Foam::threePhaseInterfaceProperties::threePhaseInterfaceProperties
mixture.alpha1().mesh()
),
mixture.alpha1().mesh(),
dimensionedScalar("nHatf", dimArea, 0.0)
dimensionedScalar(dimArea, Zero)
),
K_
@ -193,7 +193,7 @@ Foam::threePhaseInterfaceProperties::threePhaseInterfaceProperties
mixture.alpha1().mesh()
),
mixture.alpha1().mesh(),
dimensionedScalar("K", dimless/dimLength, 0.0)
dimensionedScalar(dimless/dimLength, Zero)
)
{
calculateK();

2
applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H
View File

@ -49,7 +49,7 @@
IOobject::NO_WRITE
),
mesh,
dimensionedScalar("pcorr", p_rgh.dimensions(), 0.0),
dimensionedScalar(p_rgh.dimensions(), Zero),
pcorrTypes
);

2
applications/solvers/multiphase/interFoam/overInterDyMFoam/createFields.H
View File

@ -165,7 +165,7 @@ surfaceScalarField alphaPhiUn
IOobject::NO_WRITE
),
mesh,
dimensionedScalar("zero", phi.dimensions(), 0.0)
dimensionedScalar(phi.dimensions(), Zero)
);
#include "createMRF.H"

2
applications/solvers/multiphase/interIsoFoam/alphaEqnSubCycle.H
View File

@ -10,7 +10,7 @@ if (nAlphaSubCycles > 1)
mesh
),
mesh,
dimensionedScalar("0", rhoPhi.dimensions(), 0)
dimensionedScalar(rhoPhi.dimensions(), Zero)
);
tmp<volScalarField> trSubDeltaT;

2
applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C
View File

@ -158,7 +158,7 @@ int main(int argc, char *argv[])
mesh
),
mesh,
dimensionedScalar("0", dimMass/dimTime, 0)
dimensionedScalar(dimMass/dimTime, Zero)
);
mixture->correct();

2
applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
View File

@ -98,7 +98,7 @@ int main(int argc, char *argv[])
mesh
),
mesh,
dimensionedScalar("0", dimMass/dimTime, 0)
dimensionedScalar(dimMass/dimTime, Zero)
);
mixture->correct();

2
applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.C
View File

@ -52,7 +52,7 @@ Foam::phaseChangeTwoPhaseMixtures::Kunz::Kunz
Cc_("Cc", dimless, phaseChangeTwoPhaseMixtureCoeffs_),
Cv_("Cv", dimless, phaseChangeTwoPhaseMixtureCoeffs_),
p0_("0", pSat().dimensions(), 0.0),
p0_(pSat().dimensions(), Zero),
mcCoeff_(Cc_*rho2()/tInf_),
mvCoeff_(Cv_*rho2()/(0.5*rho1()*sqr(UInf_)*tInf_))

2
applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.C
View File

@ -52,7 +52,7 @@ Foam::phaseChangeTwoPhaseMixtures::Merkle::Merkle
Cc_("Cc", dimless, phaseChangeTwoPhaseMixtureCoeffs_),
Cv_("Cv", dimless, phaseChangeTwoPhaseMixtureCoeffs_),
p0_("0", pSat().dimensions(), 0.0),
p0_(pSat().dimensions(), Zero),
mcCoeff_(Cc_/(0.5*sqr(UInf_)*tInf_)),
mvCoeff_(Cv_*rho1()/(0.5*sqr(UInf_)*tInf_*rho2()))

2
applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C
View File

@ -59,7 +59,7 @@ Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::SchnerrSauer
Cc_("Cc", dimless, phaseChangeTwoPhaseMixtureCoeffs_),
Cv_("Cv", dimless, phaseChangeTwoPhaseMixtureCoeffs_),
p0_("0", pSat().dimensions(), 0.0)
p0_(pSat().dimensions(), Zero)
{
correct();
}

4
applications/solvers/multiphase/multiphaseEulerFoam/createFields.H
View File

@ -23,7 +23,7 @@ volVectorField U
IOobject::AUTO_WRITE
),
mesh,
dimensionedVector("U", dimVelocity, Zero)
dimensionedVector(dimVelocity, Zero)
);
surfaceScalarField phi
@ -37,7 +37,7 @@ surfaceScalarField phi
IOobject::AUTO_WRITE
),
mesh,
dimensionedScalar("phi", dimArea*dimVelocity, 0)
dimensionedScalar(dimArea*dimVelocity, Zero)
);
multiphaseSystem fluid(U, phi);

23
applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/interface/interface.C
View File

@ -70,22 +70,19 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::interface::K
const volScalarField& Ur
) const
{
return tmp<volScalarField>
return tmp<volScalarField>::New
(
new volScalarField
IOobject
(
IOobject
(
"K",
Ur.mesh().time().timeName(),
Ur.mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"K",
Ur.mesh().time().timeName(),
Ur.mesh(),
dimensionedScalar("K", dimDensity/dimTime, 0)
)
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
Ur.mesh(),
dimensionedScalar(dimDensity/dimTime, Zero)
);
}

36
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
View File

@ -146,7 +146,7 @@ void Foam::multiphaseSystem::solveAlphas()
mesh_
),
mesh_,
dimensionedScalar("sumAlpha", dimless, 0)
dimensionedScalar(dimless, Zero)
);
phasei = 0;
@ -398,7 +398,7 @@ Foam::multiphaseSystem::multiphaseSystem
IOobject::AUTO_WRITE
),
mesh_,
dimensionedScalar("alphas", dimless, 0.0)
dimensionedScalar(dimless, Zero)
),
sigmas_(lookup("sigmas")),
@ -557,12 +557,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::Cvm
mesh_
),
mesh_,
dimensionedScalar
(
"Cvm",
dimensionSet(1, -3, 0, 0, 0),
0
)
dimensionedScalar(dimensionSet(1, -3, 0, 0, 0), Zero)
)
);
@ -613,12 +608,7 @@ Foam::tmp<Foam::volVectorField> Foam::multiphaseSystem::Svm
mesh_
),
mesh_,
dimensionedVector
(
"Svm",
dimensionSet(1, -2, -2, 0, 0),
Zero
)
dimensionedVector(dimensionSet(1, -2, -2, 0, 0), Zero)
)
);
@ -740,12 +730,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::dragCoeff
mesh_
),
mesh_,
dimensionedScalar
(
"dragCoeff",
dimensionSet(1, -3, -1, 0, 0),
0
)
dimensionedScalar(dimensionSet(1, -3, -1, 0, 0), Zero)
)
);
@ -788,12 +773,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseSystem::surfaceTension
mesh_
),
mesh_,
dimensionedScalar
(
"surfaceTension",
dimensionSet(1, -2, -2, 0, 0),
0
)
dimensionedScalar(dimensionSet(1, -2, -2, 0, 0), Zero)
)
);
tSurfaceTension.ref().setOriented();
@ -840,7 +820,7 @@ Foam::multiphaseSystem::nearInterface() const
mesh_
),
mesh_,
dimensionedScalar("nearInterface", dimless, 0.0)
dimensionedScalar(dimless, Zero)
)
);
@ -897,7 +877,7 @@ void Foam::multiphaseSystem::solve()
mesh_
),
mesh_,
dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0)
dimensionedScalar(dimensionSet(0, 3, -1, 0, 0), Zero)
)
);

4
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
View File

@ -99,7 +99,7 @@ Foam::phaseModel::phaseModel
mesh
),
mesh,
dimensionedVector("0", dimVelocity/dimTime, Zero)
dimensionedVector(dimVelocity/dimTime, Zero)
),
alphaPhi_
(
@ -110,7 +110,7 @@ Foam::phaseModel::phaseModel
mesh
),
mesh,
dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0)
dimensionedScalar(dimensionSet(0, 3, -1, 0, 0), Zero)
)
{
alphaPhi_.setOriented();

4
applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
View File

@ -55,7 +55,7 @@
IOobject::AUTO_WRITE
),
mesh,
dimensionedScalar("phiHbyA", dimArea*dimVelocity, 0)
dimensionedScalar(dimArea*dimVelocity, Zero)
);
volScalarField rho("rho", fluid.rho());
@ -173,7 +173,7 @@
mesh
),
mesh,
dimensionedScalar("rAUf", dimensionSet(-1, 3, 1, 0, 0), 0)
dimensionedScalar(dimensionSet(-1, 3, 1, 0, 0), Zero)
);
phasei = 0;

19
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
View File

@ -87,7 +87,7 @@ Foam::multiphaseMixture::multiphaseMixture
IOobject::NO_WRITE
),
mesh_,
dimensionedScalar("rhoPhi", dimMass/dimTime, 0.0)
dimensionedScalar(dimMass/dimTime, Zero)
),
alphas_
@ -101,7 +101,7 @@ Foam::multiphaseMixture::multiphaseMixture
IOobject::AUTO_WRITE
),
mesh_,
dimensionedScalar("alphas", dimless, 0.0)
dimensionedScalar(dimless, Zero)
),
nu_
@ -260,12 +260,7 @@ Foam::multiphaseMixture::surfaceTensionForce() const
mesh_
),
mesh_,
dimensionedScalar
(
"surfaceTensionForce",
dimensionSet(1, -2, -2, 0, 0),
0.0
)
dimensionedScalar(dimensionSet(1, -2, -2, 0, 0), Zero)
)
);
@ -330,7 +325,7 @@ void Foam::multiphaseMixture::solve()
mesh_
),
mesh_,
dimensionedScalar("0", rhoPhi_.dimensions(), 0)
dimensionedScalar(rhoPhi_.dimensions(), Zero)
);
dimensionedScalar totalDeltaT = runTime.deltaT();
@ -542,7 +537,7 @@ Foam::multiphaseMixture::nearInterface() const
mesh_
),
mesh_,
dimensionedScalar("nearInterface", dimless, 0.0)
dimensionedScalar(dimless, Zero)
)
);
@ -629,7 +624,7 @@ void Foam::multiphaseMixture::solveAlphas
MULES::limitSum(alphaPhiCorrs);
rhoPhi_ = dimensionedScalar("0", dimensionSet(1, 0, -1, 0, 0), 0);
rhoPhi_ = dimensionedScalar(dimensionSet(1, 0, -1, 0, 0), Zero);
volScalarField sumAlpha
(
@ -640,7 +635,7 @@ void Foam::multiphaseMixture::solveAlphas
mesh_
),
mesh_,
dimensionedScalar("sumAlpha", dimless, 0)
dimensionedScalar(dimless, Zero)
);
phasei = 0;

2
applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H
View File

@ -49,7 +49,7 @@ volVectorField zeta
IOobject::AUTO_WRITE
),
mesh,
dimensionedVector("zero", dimLength, Zero)
dimensionedVector(dimLength, Zero)
);
Info<< "Creating field p_gh\n" << endl;

19
applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Henry/Henry.C
View File

@ -116,19 +116,16 @@ Foam::interfaceCompositionModels::Henry<Thermo, OtherThermo>::YfPrime
const volScalarField& Tf
) const
{
return tmp<volScalarField>
return tmp<volScalarField>::New
(
new volScalarField
IOobject
(
IOobject
(
IOobject::groupName("YfPrime", this->pair_.name()),
this->pair_.phase1().mesh().time().timeName(),
this->pair_.phase1().mesh()
),
this->pair_.phase1().mesh(),
dimensionedScalar("zero", dimless/dimTemperature, 0)
)
IOobject::groupName("YfPrime", this->pair_.name()),
this->pair_.phase1().mesh().time().timeName(),
this->pair_.phase1().mesh()
),
this->pair_.phase1().mesh(),
dimensionedScalar(dimless/dimTemperature, Zero)
);
}

4
applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C
View File

@ -149,7 +149,7 @@ Foam::InterfaceCompositionModel<Thermo, OtherThermo>::D
p.mesh()
),
p.mesh(),
dimensionedScalar("zero", dimArea/dimTime, 0)
dimensionedScalar(dimArea/dimTime, Zero)
)
);
@ -203,7 +203,7 @@ Foam::InterfaceCompositionModel<Thermo, OtherThermo>::L
p.mesh()
),
p.mesh(),
dimensionedScalar("zero", dimEnergy/dimMass, 0)
dimensionedScalar(dimEnergy/dimMass, Zero)
)
);

2
applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C
View File

@ -55,7 +55,7 @@ Foam::interfaceCompositionModels::Raoult<Thermo, OtherThermo>::Raoult
pair.phase1().mesh()
),
pair.phase1().mesh(),
dimensionedScalar("zero", dimless/dimTemperature, 0)
dimensionedScalar(dimless/dimTemperature, Zero)
)
{
forAllConstIter(hashedWordList, this->speciesNames_, iter)

92
applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C
View File

@ -69,22 +69,19 @@ Foam::saturationModels::constantSaturationConditions::pSat
const volScalarField& T
) const
{
return tmp<volScalarField>
return tmp<volScalarField>::New
(
new volScalarField
IOobject
(
IOobject
(
"pSat",
T.mesh().time().timeName(),
T.mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"pSat",
T.mesh().time().timeName(),
T.mesh(),
pSat_
)
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
T.mesh(),
pSat_
);
}
@ -95,22 +92,19 @@ Foam::saturationModels::constantSaturationConditions::pSatPrime
const volScalarField& T
) const
{
return tmp<volScalarField>
return tmp<volScalarField>::New
(
new volScalarField
IOobject
(
IOobject
(
"pSatPrime",
T.mesh().time().timeName(),
T.mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"pSatPrime",
T.mesh().time().timeName(),
T.mesh(),
dimensionedScalar("zero", dimPressure/dimTemperature, 0)
)
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
T.mesh(),
dimensionedScalar(dimPressure/dimTemperature, Zero)
);
}
@ -121,22 +115,19 @@ Foam::saturationModels::constantSaturationConditions::lnPSat
const volScalarField& T
) const
{
return tmp<volScalarField>
return tmp<volScalarField>::New
(
new volScalarField
IOobject
(
IOobject
(
"lnPSat",
T.mesh().time().timeName(),
T.mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"lnPSat",
T.mesh().time().timeName(),
T.mesh(),
dimensionedScalar("lnPSat", dimless, log(pSat_.value()))
)
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
T.mesh(),
dimensionedScalar("lnPSat", dimless, log(pSat_.value()))
);
}
@ -147,22 +138,19 @@ Foam::saturationModels::constantSaturationConditions::Tsat
const volScalarField& p
) const
{
return tmp<volScalarField>
return tmp<volScalarField>::New
(
new volScalarField
IOobject
(
IOobject
(
"Tsat",
p.mesh().time().timeName(),
p.mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"Tsat",
p.mesh().time().timeName(),
p.mesh(),
Tsat_
)
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
p.mesh(),
Tsat_
);
}

2
applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/function1/function1.C
View File

@ -110,7 +110,7 @@ Foam::saturationModels::function1::Tsat
IOobject::NO_WRITE
),
p.mesh(),
dimensionedScalar("zero", dimTemperature, 0)
dimensionedScalar(dimTemperature, Zero)
)
);

2
applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/polynomial/polynomial.C
View File

@ -107,7 +107,7 @@ Foam::saturationModels::polynomial::Tsat
IOobject::NO_WRITE
),
p.mesh(),
dimensionedScalar("zero", dimTemperature, 0)
dimensionedScalar(dimTemperature, Zero)
)
);

2
applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C
View File

@ -101,7 +101,7 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::segregated::K() const
mesh
),
mesh,
dimensionedScalar("L", dimLength, 0),
dimensionedScalar(dimLength, Zero),
zeroGradientFvPatchField<scalar>::typeName
);
L.primitiveFieldRef() = cbrt(mesh.V());

24
applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
View File

@ -65,21 +65,17 @@ Foam::liftModels::constantLiftCoefficient::Cl() const
{
const fvMesh& mesh(this->pair_.phase1().mesh());
return
tmp<volScalarField>
return tmp<volScalarField>::New
(
IOobject
(
new volScalarField
(
IOobject
(
"zero",
mesh.time().timeName(),
mesh
),
mesh,
Cl_
)
);
"zero",
mesh.time().timeName(),
mesh
),
mesh,
Cl_
);
}

69
applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/noLift/noLift.C
View File

@ -63,22 +63,19 @@ Foam::tmp<Foam::volScalarField> Foam::liftModels::noLift::Cl() const
{
const fvMesh& mesh(this->pair_.phase1().mesh());
return tmp<volScalarField>
return tmp<volScalarField>::New
(
new volScalarField
IOobject
(
IOobject
(
"Cl",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"Cl",
mesh.time().timeName(),
mesh,
dimensionedScalar("Cl", dimless, 0)
)
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh,
dimensionedScalar(dimless, Zero)
);
}
@ -87,22 +84,19 @@ Foam::tmp<Foam::volVectorField> Foam::liftModels::noLift::F() const
{
const fvMesh& mesh(this->pair_.phase1().mesh());
return tmp<volVectorField>
return tmp<volVectorField>::New
(
new volVectorField
IOobject
(
IOobject
(
"noLift:F",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"noLift:F",
mesh.time().timeName(),
mesh,
dimensionedVector("zero", dimF, Zero)
)
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh,
dimensionedVector(dimF, Zero)
);
}
@ -111,22 +105,19 @@ Foam::tmp<Foam::surfaceScalarField> Foam::liftModels::noLift::Ff() const
{
const fvMesh& mesh(this->pair_.phase1().mesh());
return tmp<surfaceScalarField>
return tmp<surfaceScalarField>::New
(
new surfaceScalarField
IOobject
(
IOobject
(
"noLift:Ff",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"noLift:Ff",
mesh.time().timeName(),
mesh,
dimensionedScalar("zero", dimF*dimArea, 0)
)
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh,
dimensionedScalar(dimF*dimArea, Zero)
);
}

47
applications/solvers/multiphase/reactingEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
View File

@ -70,22 +70,19 @@ Foam::turbulentDispersionModels::noTurbulentDispersion::D() const
{
const fvMesh& mesh(this->pair_.phase1().mesh());
return tmp<volScalarField>
return tmp<volScalarField>::New
(
new volScalarField
IOobject
(
IOobject
(
"zero",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"zero",
mesh.time().timeName(),
mesh,
dimensionedScalar("zero", dimD, 0)
)
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh,
dimensionedScalar(dimD, Zero)
);
}
@ -95,21 +92,17 @@ Foam::turbulentDispersionModels::noTurbulentDispersion::F() const
{
const fvMesh& mesh(this->pair_.phase1().mesh());
return
tmp<volVectorField>
return tmp<volVectorField>::New
(
IOobject
(
new volVectorField
(
IOobject
(
"zero",
mesh.time().timeName(),
mesh
),
mesh,
dimensionedVector("zero", dimF, Zero)
)
);
"zero",
mesh.time().timeName(),
mesh
),
mesh,
dimensionedVector(dimF, Zero)
);
}

26
applications/solvers/multiphase/reactingEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C
View File

@ -65,28 +65,24 @@ Foam::virtualMassModels::noVirtualMass::Cvm() const
{
const fvMesh& mesh(this->pair_.phase1().mesh());
return
tmp<volScalarField>
return tmp<volScalarField>::New
(
IOobject
(
new volScalarField
(
IOobject
(
"zero",
mesh.time().timeName(),
mesh
),
mesh,
dimensionedScalar("zero", dimless, 0)
)
);
"zero",
mesh.time().timeName(),
mesh
),
mesh,
dimensionedScalar(dimless, Zero)
);
}
Foam::tmp<Foam::volScalarField>
Foam::virtualMassModels::noVirtualMass::K() const
{
return Cvm()*dimensionedScalar("zero", dimDensity, 0);
return Cvm()*dimensionedScalar("zero", dimDensity, Zero);
}

2
applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C
View File

@ -76,7 +76,7 @@ Foam::tmp<Foam::volVectorField> Foam::wallLubricationModels::Antal::Fi() const
(
max
(
dimensionedScalar("zero", dimless/dimLength, 0),
dimensionedScalar(dimless/dimLength, Zero),
Cw1_/pair_.dispersed().d() + Cw2_/yWall()
)
*pair_.continuous().rho()

2
applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C
View File

@ -86,7 +86,7 @@ Foam::tmp<Foam::volVectorField> Foam::wallLubricationModels::Frank::Fi() const
)
*max
(
dimensionedScalar("zero", dimless/dimLength, 0.0),
dimensionedScalar(dimless/dimLength, Zero),
(1.0 - yTilde)/(Cwd_*y*pow(yTilde, p_ - 1.0))
)
*pair_.continuous().rho()

46
applications/solvers/multiphase/reactingEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
View File

@ -69,22 +69,19 @@ Foam::wallLubricationModels::noWallLubrication::Fi() const
{
const fvMesh& mesh(this->pair_.phase1().mesh());
return tmp<volVectorField>
return tmp<volVectorField>::New
(
new volVectorField
IOobject
(
IOobject
(
"noWallLubrication:Fi",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"noWallLubrication:Fi",
mesh.time().timeName(),
mesh,
dimensionedVector("zero", dimF, Zero)
)
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh,
dimensionedVector(dimF, Zero)
);
}
@ -94,22 +91,19 @@ Foam::wallLubricationModels::noWallLubrication::F() const
{
const fvMesh& mesh(this->pair_.phase1().mesh());
return tmp<volVectorField>
return tmp<volVectorField>::New
(
new volVectorField
IOobject
(
IOobject
(
"noWallLubrication:F",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"noWallLubrication:F",
mesh.time().timeName(),
mesh,
dimensionedVector("zero", dimF, Zero)
)
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh,
dimensionedVector(dimF, Zero)
);
}

12
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C
View File

@ -195,7 +195,7 @@ Foam::BlendedInterfacialModel<ModelType>::K() const
false
),
phase1_.mesh(),
dimensionedScalar("zero", ModelType::dimK, 0)
dimensionedScalar(ModelType::dimK, Zero)
)
);
@ -255,7 +255,7 @@ Foam::BlendedInterfacialModel<ModelType>::K(const scalar residualAlpha) const
false
),
phase1_.mesh(),
dimensionedScalar("zero", ModelType::dimK, 0)
dimensionedScalar(ModelType::dimK, Zero)
)
);
@ -321,7 +321,7 @@ Foam::BlendedInterfacialModel<ModelType>::Kf() const
false
),
phase1_.mesh(),
dimensionedScalar("zero", ModelType::dimK, 0)
dimensionedScalar(ModelType::dimK, Zero)
)
);
@ -384,7 +384,7 @@ Foam::BlendedInterfacialModel<ModelType>::F() const
false
),
phase1_.mesh(),
dimensioned<Type>("zero", ModelType::dimF, Zero)
dimensioned<Type>(ModelType::dimF, Zero)
)
);
@ -452,7 +452,7 @@ Foam::BlendedInterfacialModel<ModelType>::Ff() const
false
),
phase1_.mesh(),
dimensionedScalar("zero", ModelType::dimF*dimArea, 0)
dimensionedScalar(ModelType::dimF*dimArea, Zero)
)
);
x.ref().setOriented();
@ -515,7 +515,7 @@ Foam::BlendedInterfacialModel<ModelType>::D() const
false
),
phase1_.mesh(),
dimensionedScalar("zero", ModelType::dimD, 0)
dimensionedScalar(ModelType::dimD, Zero)
)
);

6
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatAndMassTransferPhaseSystem/HeatAndMassTransferPhaseSystem.C
View File

@ -84,7 +84,7 @@ HeatAndMassTransferPhaseSystem
IOobject::AUTO_WRITE
),
this->mesh(),
dimensionedScalar("zero", dimDensity/dimTime, 0)
dimensionedScalar(dimDensity/dimTime, Zero)
)
);
@ -100,7 +100,7 @@ HeatAndMassTransferPhaseSystem
this->mesh()
),
this->mesh(),
dimensionedScalar("zero", dimDensity/dimTime, 0)
dimensionedScalar(dimDensity/dimTime, Zero)
)
);
@ -188,7 +188,7 @@ Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::dmdt
this->mesh_
),
this->mesh_,
dimensionedScalar("zero", dimDensity/dimTime, 0)
dimensionedScalar(dimDensity/dimTime, Zero)
)
);

23
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/HeatTransferPhaseSystem/HeatTransferPhaseSystem.C
View File

@ -74,23 +74,20 @@ Foam::HeatTransferPhaseSystem<BasePhaseSystem>::dmdt
const phasePairKey& key
) const
{
return tmp<volScalarField>
return tmp<volScalarField>::New
(
new volScalarField
IOobject
(
IOobject
IOobject::groupName
(
IOobject::groupName
(
"dmdt",
this->phasePairs_[key]->name()
"dmdt",
this->phasePairs_[key]->name()
),
this->mesh().time().timeName(),
this->mesh().time()
),
this->mesh(),
dimensionedScalar("zero", dimDensity/dimTime, 0)
)
this->mesh().time().timeName(),
this->mesh().time()
),
this->mesh(),
dimensionedScalar(dimDensity/dimTime, Zero)
);
}

6
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C
View File

@ -99,7 +99,7 @@ massTransfer() const
*this->dmdtExplicit_[pair];
*this->dmdtExplicit_[pair] =
dimensionedScalar("zero", dimDensity/dimTime, 0);
dimensionedScalar(dimDensity/dimTime, Zero);
}
// Sum up the contribution from each interface composition model
@ -225,7 +225,7 @@ correctThermo()
this->mesh()
),
this->mesh(),
dimensionedScalar("zero", dimEnergy/dimVolume/dimTime, 0)
dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
);
volScalarField mDotLPrime
(
@ -236,7 +236,7 @@ correctThermo()
this->mesh()
),
this->mesh(),
dimensionedScalar("zero", mDotL.dimensions()/dimTemperature, 0)
dimensionedScalar(mDotL.dimensions()/dimTemperature, Zero)
);
volScalarField& Tf = *this->Tf_[pair];

146
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/MomentumTransferPhaseSystem/MomentumTransferPhaseSystem.C
View File

@ -166,12 +166,7 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Kd
this->mesh_
),
this->mesh_,
dimensionedScalar
(
IOobject::groupName("Kd", phase.name()),
dimensionSet(1, -3, -1, 0, 0),
0
)
dimensionedScalar(dimensionSet(1, -3, -1, 0, 0), Zero)
)
);
@ -210,26 +205,21 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Vm
{
return virtualMassModels_[key]->K();
}
else
{
return tmp<volScalarField>
return tmp<volScalarField>::New
(
IOobject
(
new volScalarField
(
IOobject
(
virtualMassModel::typeName + ":K",
this->mesh_.time().timeName(),
this->mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh_,
dimensionedScalar("zero", virtualMassModel::dimK, 0)
)
);
}
virtualMassModel::typeName + ":K",
this->mesh_.time().timeName(),
this->mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh_,
dimensionedScalar(virtualMassModel::dimK, Zero)
);
}
@ -244,26 +234,21 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Vmf
{
return virtualMassModels_[key]->Kf();
}
else
{
return tmp<surfaceScalarField>
return tmp<surfaceScalarField>::New
(
IOobject
(
new surfaceScalarField
(
IOobject
(
virtualMassModel::typeName + ":Kf",
this->mesh_.time().timeName(),
this->mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh_,
dimensionedScalar("zero", virtualMassModel::dimK, 0)
)
);
}
virtualMassModel::typeName + ":Kf",
this->mesh_.time().timeName(),
this->mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh_,
dimensionedScalar(virtualMassModel::dimK, Zero)
);
}
@ -288,26 +273,21 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::F
{
return wallLubricationModels_[key]->template F<vector>();
}
else
{
return tmp<volVectorField>
return tmp<volVectorField>::New
(
IOobject
(
new volVectorField
(
IOobject
(
liftModel::typeName + ":F",
this->mesh_.time().timeName(),
this->mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh_,
dimensionedVector("zero", liftModel::dimF, Zero)
)
);
}
liftModel::typeName + ":F",
this->mesh_.time().timeName(),
this->mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh_,
dimensionedVector(liftModel::dimF, Zero)
);
}
@ -348,7 +328,7 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Ff
false
),
this->mesh_,
dimensionedScalar("zero", liftModel::dimF*dimArea, 0)
dimensionedScalar(liftModel::dimF*dimArea, Zero)
)
);
@ -370,26 +350,21 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::D
{
return turbulentDispersionModels_[key]->D();
}
else
{
return tmp<volScalarField>
return tmp<volScalarField>::New
(
IOobject
(
new volScalarField
(
IOobject
(
turbulentDispersionModel::typeName + ":D",
this->mesh_.time().timeName(),
this->mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh_,
dimensionedScalar("zero", turbulentDispersionModel::dimD, 0)
)
);
}
turbulentDispersionModel::typeName + ":D",
this->mesh_.time().timeName(),
this->mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh_,
dimensionedScalar(turbulentDispersionModel::dimD, Zero)
);
}
@ -504,7 +479,7 @@ Foam::volVectorField& Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::setF
false
),
this->mesh_,
dimensionedVector("zero", liftModel::dimF, Zero)
dimensionedVector(liftModel::dimF, Zero)
)
);
}
@ -575,9 +550,8 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::setPhiD
this->mesh_,
dimensionedScalar
(
"zero",
dimTime*dimArea*turbulentDispersionModel::dimF/dimDensity,
0
Zero
)
)
);

10
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
View File

@ -66,7 +66,7 @@ ThermalPhaseChangePhaseSystem
IOobject::AUTO_WRITE
),
this->mesh(),
dimensionedScalar("zero", dimDensity/dimTime, 0)
dimensionedScalar(dimDensity/dimTime, Zero)
)
);
}
@ -128,7 +128,7 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::heatTransfer() const
false
),
phase.mesh(),
dimensionedScalar("",dimensionSet(1,-1,-3,0,0),0.0)
dimensionedScalar(dimensionSet(1,-1,-3,0,0), Zero)
);
if
@ -274,7 +274,7 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::iDmdt
this->mesh_
),
this->mesh_,
dimensionedScalar("zero", dimDensity/dimTime, 0)
dimensionedScalar(dimDensity/dimTime, Zero)
)
);
@ -383,7 +383,7 @@ void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
}
else
{
iDmdtNew == dimensionedScalar("0",dmdt.dimensions(), 0);
iDmdtNew == dimensionedScalar(dmdt.dimensions(), Zero);
}
volScalarField H1(this->heatTransferModels_[pair][pair.first()]->K());
@ -430,7 +430,7 @@ void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
false
),
this->mesh(),
dimensionedScalar("zero", dimDensity/dimTime, 0)
dimensionedScalar(dimDensity/dimTime, Zero)
);
if

2
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C
View File

@ -46,7 +46,7 @@ Foam::AnisothermalPhaseModel<BasePhaseModel>::AnisothermalPhaseModel
fluid.mesh()
),
fluid.mesh(),
dimensionedScalar("K", sqr(dimVelocity), scalar(0))
dimensionedScalar(sqr(dimVelocity), Zero)
)
{}

19
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/InertPhaseModel/InertPhaseModel.C
View File

@ -67,19 +67,16 @@ template<class BasePhaseModel>
Foam::tmp<Foam::volScalarField>
Foam::InertPhaseModel<BasePhaseModel>::Qdot() const
{
return tmp<volScalarField>
return tmp<volScalarField>::New
(
new volScalarField
IOobject
(
IOobject
(
IOobject::groupName("Qdot", this->name()),
this->mesh().time().timeName(),
this->mesh()
),
this->mesh(),
dimensionedScalar("zero", dimEnergy/dimTime/dimVolume, 0)
)
IOobject::groupName("Qdot", this->name()),
this->mesh().time().timeName(),
this->mesh()
),
this->mesh(),
dimensionedScalar(dimEnergy/dimTime/dimVolume, Zero)
);
}

8
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C
View File

@ -151,7 +151,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::MovingPhaseModel
fluid.mesh()
),
fluid.mesh(),
dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0)
dimensionedScalar(dimensionSet(0, 3, -1, 0, 0), Zero)
),
alphaRhoPhi_
(
@ -162,7 +162,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::MovingPhaseModel
fluid.mesh()
),
fluid.mesh(),
dimensionedScalar("0", dimensionSet(1, 0, -1, 0, 0), 0)
dimensionedScalar(dimensionSet(1, 0, -1, 0, 0), Zero)
),
DUDt_
(
@ -173,7 +173,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::MovingPhaseModel
fluid.mesh()
),
fluid.mesh(),
dimensionedVector("0", dimAcceleration, Zero)
dimensionedVector(dimAcceleration, Zero)
),
divU_(nullptr),
turbulence_
@ -197,7 +197,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::MovingPhaseModel
fluid.mesh()
),
fluid.mesh(),
dimensionedScalar("0", dimDensity/dimTime, 0)
dimensionedScalar(dimDensity/dimTime, Zero)
)
{
alphaPhi_.setOriented();

2
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
View File

@ -93,7 +93,7 @@ void Foam::MultiComponentPhaseModel<BasePhaseModel>::correctThermo()
this->fluid().mesh()
),
this->fluid().mesh(),
dimensionedScalar("zero", dimless, 0)
dimensionedScalar(dimless, Zero)
);
PtrList<volScalarField>& Yi = Y();

2
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/phaseModel/phaseModel.C
View File

@ -56,7 +56,7 @@ Foam::phaseModel::phaseModel
IOobject::AUTO_WRITE
),
fluid.mesh(),
dimensionedScalar("alpha", dimless, 0)
dimensionedScalar(dimless, Zero)
),
fluid_(fluid),

68
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseSystem/phaseSystem.C
View File

@ -149,7 +149,7 @@ Foam::phaseSystem::phaseSystem
mesh
),
mesh,
dimensionedScalar("dpdt", dimPressure/dimTime, 0)
dimensionedScalar(dimPressure/dimTime, Zero)
),
MRF_(mesh_)
@ -225,26 +225,21 @@ Foam::phaseSystem::E(const phasePairKey& key) const
{
return aspectRatioModels_[key]->E();
}
else
{
return tmp<volScalarField>
return tmp<volScalarField>::New
(
IOobject
(
new volScalarField
(
IOobject
(
aspectRatioModel::typeName + ":E",
this->mesh_.time().timeName(),
this->mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh_,
dimensionedScalar("zero", dimless, 1)
)
);
}
aspectRatioModel::typeName + ":E",
this->mesh_.time().timeName(),
this->mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh_,
dimensionedScalar("one", dimless, 1)
);
}
@ -255,26 +250,21 @@ Foam::phaseSystem::sigma(const phasePairKey& key) const
{
return surfaceTensionModels_[key]->sigma();
}
else
{
return tmp<volScalarField>
return tmp<volScalarField>::New
(
IOobject
(
new volScalarField
(
IOobject
(
surfaceTensionModel::typeName + ":sigma",
this->mesh_.time().timeName(),
this->mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh_,
dimensionedScalar("zero", surfaceTensionModel::dimSigma, 0)
)
);
}
surfaceTensionModel::typeName + ":sigma",
this->mesh_.time().timeName(),
this->mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
this->mesh_,
dimensionedScalar(surfaceTensionModel::dimSigma, Zero)
);
}

17
applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C
View File

@ -184,7 +184,7 @@ void Foam::multiphaseSystem::solveAlphas()
mesh_
),
mesh_,
dimensionedScalar("sumAlpha", dimless, 0)
dimensionedScalar(dimless, Zero)
);
@ -208,7 +208,7 @@ void Foam::multiphaseSystem::solveAlphas()
mesh_
),
mesh_,
dimensionedScalar("Sp", divU.dimensions(), 0.0)
dimensionedScalar(divU.dimensions(), Zero)
);
volScalarField::Internal Su
@ -495,7 +495,7 @@ Foam::multiphaseSystem::multiphaseSystem
IOobject::AUTO_WRITE
),
mesh,
dimensionedScalar("alphas", dimless, 0.0)
dimensionedScalar(dimless, Zero)
),
cAlphas_(lookup("interfaceCompression")),
@ -538,12 +538,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseSystem::surfaceTension
mesh_
),
mesh_,
dimensionedScalar
(
"surfaceTension",
dimensionSet(1, -2, -2, 0, 0),
0
)
dimensionedScalar(dimensionSet(1, -2, -2, 0, 0), Zero)
)
);
@ -589,7 +584,7 @@ Foam::multiphaseSystem::nearInterface() const
mesh_
),
mesh_,
dimensionedScalar("nearInterface", dimless, 0.0)
dimensionedScalar(dimless, Zero)
)
);
@ -651,7 +646,7 @@ void Foam::multiphaseSystem::solve()
mesh_
),
mesh_,
dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0)
dimensionedScalar(dimensionSet(0, 3, -1, 0, 0), Zero)
)
);
}

4
applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/pU/pEqn.H
View File

@ -166,7 +166,7 @@ while (pimple.correct())
IOobject::AUTO_WRITE
),
mesh,
dimensionedScalar("phiHbyA", dimArea*dimVelocity, 0)
dimensionedScalar(dimArea*dimVelocity, Zero)
);
forAll(phases, phasei)
@ -256,7 +256,7 @@ while (pimple.correct())
mesh
),
mesh,
dimensionedScalar("rAUf", dimensionSet(-1, 3, 1, 0, 0), 0)
dimensionedScalar(dimensionSet(-1, 3, 1, 0, 0), Zero)
);
forAll(phases, phasei)

4
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/wallBoilingSubModels/IATEsource/wallBoiling.C
View File

@ -74,7 +74,7 @@ Foam::diameterModels::IATEsources::wallBoiling::R
phase().mesh()
),
phase().mesh(),
dimensionedScalar("R", dimless/dimTime, 0)
dimensionedScalar(dimless/dimTime, Zero)
);
volScalarField::Internal Rdk
@ -86,7 +86,7 @@ Foam::diameterModels::IATEsources::wallBoiling::R
phase().mesh()
),
phase().mesh(),
dimensionedScalar("Rdk", kappai.dimensions()/dimTime, 0)
dimensionedScalar(kappai.dimensions()/dimTime, Zero)
);
const phaseCompressibleTurbulenceModel& turbulence =

2
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
View File

@ -141,7 +141,7 @@ JohnsonJacksonSchaeffer::nu
false
),
phase.mesh(),
dimensionedScalar("nu", dimensionSet(0, 2, -1, 0, 0), 0.0)
dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), Zero)
)
);

2
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
View File

@ -130,7 +130,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
false
),
phase.mesh(),
dimensionedScalar("nu", dimensionSet(0, 2, -1, 0, 0), 0.0)
dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), Zero)
)
);

8
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
View File

@ -142,7 +142,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
IOobject::NO_WRITE
),
U.mesh(),
dimensionedScalar("zero", dimensionSet(0, 2, -1, 0, 0), 0.0)
dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), Zero)
),
gs0_
@ -156,7 +156,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
IOobject::NO_WRITE
),
U.mesh(),
dimensionedScalar("zero", dimensionSet(0, 0, 0, 0, 0), 0.0)
dimensionedScalar(dimensionSet(0, 0, 0, 0, 0), Zero)
),
kappa_
@ -170,7 +170,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
IOobject::NO_WRITE
),
U.mesh(),
dimensionedScalar("zero", dimensionSet(1, -1, -1, 0, 0), 0.0)
dimensionedScalar(dimensionSet(1, -1, -1, 0, 0), Zero)
),
nuFric_
@ -184,7 +184,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
IOobject::AUTO_WRITE
),
U.mesh(),
dimensionedScalar("zero", dimensionSet(0, 2, -1, 0, 0), 0.0)
dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), Zero)
)
{
if (type == typeName)

7
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C
View File

@ -63,12 +63,7 @@ Foam::tmp<Foam::volScalarField> Foam::kineticTheoryModels::noneViscosity::nu
const dimensionedScalar& e
) const
{
return dimensionedScalar
(
"0",
dimensionSet(0, 2, -1, 0, 0, 0, 0),
0.0
)*alpha1;
return dimensionedScalar(dimViscosity, Zero)*alpha1;
}

55
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
View File

@ -67,7 +67,7 @@ Foam::RASModels::phasePressureModel::phasePressureModel
coeffDict_.lookup("g0")
)
{
nut_ == dimensionedScalar("zero", nut_.dimensions(), 0.0);
nut_ == dimensionedScalar(nut_.dimensions(), Zero);
if (type == typeName)
{
@ -127,26 +127,18 @@ Foam::RASModels::phasePressureModel::epsilon() const
Foam::tmp<Foam::volSymmTensorField>
Foam::RASModels::phasePressureModel::R() const
{
return tmp<volSymmTensorField>
return tmp<volSymmTensorField>::New
(
new volSymmTensorField
IOobject
(
IOobject
(
IOobject::groupName("R", U_.group()),
runTime_.timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
IOobject::groupName("R", U_.group()),
runTime_.timeName(),
mesh_,
dimensioned<symmTensor>
(
"R",
dimensionSet(0, 2, -2, 0, 0),
Zero
)
)
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensioned<symmTensor>(dimensionSet(0, 2, -2, 0, 0)) //Zero
);
}
@ -210,25 +202,20 @@ Foam::RASModels::phasePressureModel::pPrimef() const
Foam::tmp<Foam::volSymmTensorField>
Foam::RASModels::phasePressureModel::devRhoReff() const
{
return tmp<volSymmTensorField>
return tmp<volSymmTensorField>::New
(
new volSymmTensorField
IOobject
(
IOobject
(
IOobject::groupName("devRhoReff", U_.group()),
runTime_.timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
IOobject::groupName("devRhoReff", U_.group()),
runTime_.timeName(),
mesh_,
dimensioned<symmTensor>
(
"R",
rho_.dimensions()*dimensionSet(0, 2, -2, 0, 0),
Zero
)
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensioned<symmTensor>
(
rho_.dimensions()*dimensionSet(0, 2, -2, 0, 0), Zero
)
);
}

2
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C
View File

@ -59,7 +59,7 @@ Foam::diameterModels::IATEsources::dummy::R
iate_.phase().mesh()
),
iate_.phase().mesh(),
dimensionedScalar("R", kappai.dimensions()/dimTime, 0)
dimensionedScalar(kappai.dimensions()/dimTime, Zero)
);
return fvm::Su(R, kappai);

2
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
View File

@ -76,7 +76,7 @@ Foam::diameterModels::IATEsources::randomCoalescence::R
iate_.phase().mesh()
),
iate_.phase().mesh(),
dimensionedScalar("R", dimless/dimTime, 0)
dimensionedScalar(dimless/dimTime, Zero)
);
const scalar Crc = Crc_.value();

2
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
View File

@ -75,7 +75,7 @@ Foam::diameterModels::IATEsources::turbulentBreakUp::R
iate_.phase().mesh()
),
iate_.phase().mesh(),
dimensionedScalar("R", kappai.dimensions()/dimTime, 0)
dimensionedScalar(kappai.dimensions()/dimTime, Zero)
);
const scalar Cti = Cti_.value();

2
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
View File

@ -263,7 +263,7 @@ void Foam::twoPhaseSystem::solve()
mesh_
),
mesh_,
dimensionedScalar("Sp", dimless/dimTime, 0.0)
dimensionedScalar(dimless/dimTime, Zero)
);
volScalarField::Internal Su

2
applications/solvers/multiphase/twoLiquidMixingFoam/alphaEqnSubCycle.H
View File

@ -12,7 +12,7 @@ if (nAlphaSubCycles > 1)
mesh
),
mesh,
dimensionedScalar("0", rhoPhi.dimensions(), 0)
dimensionedScalar(rhoPhi.dimensions(), Zero)
);
for

2
applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
View File

@ -73,7 +73,7 @@ volScalarField dpdt
mesh
),
mesh,
dimensionedScalar("dpdt", p.dimensions()/dimTime, 0)
dimensionedScalar(p.dimensions()/dimTime, Zero)
);

24
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
View File

@ -70,21 +70,17 @@ Foam::aspectRatioModels::constantAspectRatio::E() const
{
const fvMesh& mesh(this->pair_.phase1().mesh());
return
tmp<volScalarField>
return tmp<volScalarField>::New
(
IOobject
(
new volScalarField
(
IOobject
(
"zero",
mesh.time().timeName(),
mesh
),
mesh,
E0_
)
);
"zero",
mesh.time().timeName(),
mesh
),
mesh,
E0_
);
}

2
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C
View File

@ -101,7 +101,7 @@ Foam::tmp<Foam::volScalarField> Foam::dragModels::segregated::K() const
mesh
),
mesh,
dimensionedScalar("L", dimLength, 0),
dimensionedScalar(dimLength, Zero),
zeroGradientFvPatchField<scalar>::typeName
);
L.primitiveFieldRef() = cbrt(mesh.V());

24
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
View File

@ -65,21 +65,17 @@ Foam::liftModels::constantLiftCoefficient::Cl() const
{
const fvMesh& mesh(this->pair_.phase1().mesh());
return
tmp<volScalarField>
return tmp<volScalarField>::New
(
IOobject
(
new volScalarField
(
IOobject
(
"zero",
mesh.time().timeName(),
mesh
),
mesh,
Cl_
)
);
"zero",
mesh.time().timeName(),
mesh
),
mesh,
Cl_
);
}

69
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/noLift/noLift.C
View File

@ -63,22 +63,19 @@ Foam::tmp<Foam::volScalarField> Foam::liftModels::noLift::Cl() const
{
const fvMesh& mesh(this->pair_.phase1().mesh());
return tmp<volScalarField>
return tmp<volScalarField>::New
(
new volScalarField
IOobject
(
IOobject
(
"Cl",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"Cl",
mesh.time().timeName(),
mesh,
dimensionedScalar("Cl", dimless, 0)
)
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh,
dimensionedScalar(dimless, Zero)
);
}
@ -87,22 +84,19 @@ Foam::tmp<Foam::volVectorField> Foam::liftModels::noLift::F() const
{
const fvMesh& mesh(this->pair_.phase1().mesh());
return tmp<volVectorField>
return tmp<volVectorField>::New
(
new volVectorField
IOobject
(
IOobject
(
"noLift:F",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"noLift:F",
mesh.time().timeName(),
mesh,
dimensionedVector("zero", dimF, Zero)
)
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh,
dimensionedVector(dimF, Zero)
);
}
@ -111,22 +105,19 @@ Foam::tmp<Foam::surfaceScalarField> Foam::liftModels::noLift::Ff() const
{
const fvMesh& mesh(this->pair_.phase1().mesh());
return tmp<surfaceScalarField>
return tmp<surfaceScalarField>::New
(
new surfaceScalarField
IOobject
(
IOobject
(
"noLift:Ff",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"noLift:Ff",
mesh.time().timeName(),
mesh,
dimensionedScalar("zero", dimF*dimArea, 0)
)
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh,
dimensionedScalar(dimF*dimArea, Zero)
);
}

47
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
View File

@ -70,22 +70,19 @@ Foam::turbulentDispersionModels::noTurbulentDispersion::D() const
{
const fvMesh& mesh(this->pair_.phase1().mesh());
return tmp<volScalarField>
return tmp<volScalarField>::New
(
new volScalarField
IOobject
(
IOobject
(
"zero",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"zero",
mesh.time().timeName(),
mesh,
dimensionedScalar("zero", dimD, 0)
)
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh,
dimensionedScalar(dimD, Zero)
);
}
@ -95,21 +92,17 @@ Foam::turbulentDispersionModels::noTurbulentDispersion::F() const
{
const fvMesh& mesh(this->pair_.phase1().mesh());
return
tmp<volVectorField>
return tmp<volVectorField>::New
(
IOobject
(
new volVectorField
(
IOobject
(
"zero",
mesh.time().timeName(),
mesh
),
mesh,
dimensionedVector("zero", dimF, Zero)
)
);
"zero",
mesh.time().timeName(),
mesh
),
mesh,
dimensionedVector(dimF, Zero)
);
}

26
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C
View File

@ -65,28 +65,24 @@ Foam::virtualMassModels::noVirtualMass::Cvm() const
{
const fvMesh& mesh(this->pair_.phase1().mesh());
return
tmp<volScalarField>
return tmp<volScalarField>::New
(
IOobject
(
new volScalarField
(
IOobject
(
"zero",
mesh.time().timeName(),
mesh
),
mesh,
dimensionedScalar("zero", dimless, 0)
)
);
"zero",
mesh.time().timeName(),
mesh
),
mesh,
dimensionedScalar(dimless, Zero)
);
}
Foam::tmp<Foam::volScalarField>
Foam::virtualMassModels::noVirtualMass::K() const
{
return Cvm()*dimensionedScalar("zero", dimDensity, 0);
return Cvm()*dimensionedScalar("zero", dimDensity, Zero);
}

2
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C
View File

@ -75,7 +75,7 @@ Foam::tmp<Foam::volVectorField> Foam::wallLubricationModels::Antal::Fi() const
return
max
(
dimensionedScalar("zero", dimless/dimLength, 0),
dimensionedScalar(dimless/dimLength, Zero),
Cw1_/pair_.dispersed().d() + Cw2_/yWall()
)
*pair_.continuous().rho()

2
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C
View File

@ -85,7 +85,7 @@ Foam::tmp<Foam::volVectorField> Foam::wallLubricationModels::Frank::Fi() const
)
*max
(
dimensionedScalar("zero", dimless/dimLength, 0.0),
dimensionedScalar(dimless/dimLength, Zero),
(1.0 - yTilde)/(Cwd_*y*pow(yTilde, p_ - 1.0))
)
*pair_.continuous().rho()

46
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
View File

@ -69,22 +69,19 @@ Foam::wallLubricationModels::noWallLubrication::Fi() const
{
const fvMesh& mesh(this->pair_.phase1().mesh());
return tmp<volVectorField>
return tmp<volVectorField>::New
(
new volVectorField
IOobject
(
IOobject
(
"noWallLubrication:Fi",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"noWallLubrication:Fi",
mesh.time().timeName(),
mesh,
dimensionedVector("zero", dimF, Zero)
)
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh,
dimensionedVector(dimF, Zero)
);
}
@ -94,22 +91,19 @@ Foam::wallLubricationModels::noWallLubrication::F() const
{
const fvMesh& mesh(this->pair_.phase1().mesh());
return tmp<volVectorField>
return tmp<volVectorField>::New
(
new volVectorField
IOobject
(
IOobject
(
"noWallLubrication:F",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
"noWallLubrication:F",
mesh.time().timeName(),
mesh,
dimensionedVector("zero", dimF, Zero)
)
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh,
dimensionedVector(dimF, Zero)
);
}

2
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
View File

@ -141,7 +141,7 @@ JohnsonJacksonSchaeffer::nu
false
),
phase.mesh(),
dimensionedScalar("nu", dimensionSet(0, 2, -1, 0, 0), 0.0)
dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), Zero)
)
);

2
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
View File

@ -130,7 +130,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::nu
false
),
phase.mesh(),
dimensionedScalar("nu", dimensionSet(0, 2, -1, 0, 0), 0.0)
dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), Zero)
)
);

8
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
View File

@ -142,7 +142,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
IOobject::NO_WRITE
),
U.mesh(),
dimensionedScalar("zero", dimensionSet(0, 2, -1, 0, 0), 0.0)
dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), Zero)
),
gs0_
@ -156,7 +156,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
IOobject::NO_WRITE
),
U.mesh(),
dimensionedScalar("zero", dimensionSet(0, 0, 0, 0, 0), 0.0)
dimensionedScalar(dimensionSet(0, 0, 0, 0, 0), Zero)
),
kappa_
@ -170,7 +170,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
IOobject::NO_WRITE
),
U.mesh(),
dimensionedScalar("zero", dimensionSet(1, -1, -1, 0, 0), 0.0)
dimensionedScalar(dimensionSet(1, -1, -1, 0, 0), Zero)
),
nuFric_
@ -184,7 +184,7 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
IOobject::AUTO_WRITE
),
U.mesh(),
dimensionedScalar("zero", dimensionSet(0, 2, -1, 0, 0), 0.0)
dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), Zero)
)
{
if (type == typeName)

7
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C
View File

@ -63,12 +63,7 @@ Foam::tmp<Foam::volScalarField> Foam::kineticTheoryModels::noneViscosity::nu
const dimensionedScalar& e
) const
{
return dimensionedScalar
(
"0",
dimensionSet(0, 2, -1, 0, 0, 0, 0),
0.0
)*alpha1;
return dimensionedScalar(dimViscosity, Zero)*alpha1;
}

55
applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C
View File

@ -70,7 +70,7 @@ Foam::RASModels::phasePressureModel::phasePressureModel
coeffDict_.lookup("g0")
)
{
nut_ == dimensionedScalar("zero", nut_.dimensions(), 0.0);
nut_ == dimensionedScalar(nut_.dimensions(), Zero);
if (type == typeName)
{
@ -133,26 +133,18 @@ Foam::RASModels::phasePressureModel::epsilon() const
Foam::tmp<Foam::volSymmTensorField>
Foam::RASModels::phasePressureModel::R() const
{
return tmp<volSymmTensorField>
return tmp<volSymmTensorField>::New
(
new volSymmTensorField
IOobject
(
IOobject
(
IOobject::groupName("R", U_.group()),
runTime_.timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
IOobject::groupName("R", U_.group()),
runTime_.timeName(),
mesh_,
dimensioned<symmTensor>
(
"R",
dimensionSet(0, 2, -2, 0, 0),
Zero
)
)
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensioned<symmTensor>(dimensionSet(0, 2, -2, 0, 0), Zero)
);
}
@ -216,25 +208,20 @@ Foam::RASModels::phasePressureModel::pPrimef() const
Foam::tmp<Foam::volSymmTensorField>
Foam::RASModels::phasePressureModel::devRhoReff() const
{
return tmp<volSymmTensorField>
return tmp<volSymmTensorField>::New
(
new volSymmTensorField
IOobject
(
IOobject
(
IOobject::groupName("devRhoReff", U_.group()),
runTime_.timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
IOobject::groupName("devRhoReff", U_.group()),
runTime_.timeName(),
mesh_,
dimensioned<symmTensor>
(
"R",
rho_.dimensions()*dimensionSet(0, 2, -2, 0, 0),
Zero
)
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensioned<symmTensor>
(
rho_.dimensions()*dimensionSet(0, 2, -2, 0, 0), Zero
)
);
}

10
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
View File

@ -151,7 +151,7 @@ Foam::BlendedInterfacialModel<modelType>::K() const
false
),
pair_.phase1().mesh(),
dimensionedScalar("zero", modelType::dimK, 0)
dimensionedScalar(modelType::dimK, Zero)
)
);
@ -219,7 +219,7 @@ Foam::BlendedInterfacialModel<modelType>::Kf() const
false
),
pair_.phase1().mesh(),
dimensionedScalar("zero", modelType::dimK, 0)
dimensionedScalar(modelType::dimK, Zero)
)
);
@ -282,7 +282,7 @@ Foam::BlendedInterfacialModel<modelType>::F() const
false
),
pair_.phase1().mesh(),
dimensioned<Type>("zero", modelType::dimF, Zero)
dimensioned<Type>(modelType::dimF, Zero)
)
);
@ -350,7 +350,7 @@ Foam::BlendedInterfacialModel<modelType>::Ff() const
false
),
pair_.phase1().mesh(),
dimensionedScalar("zero", modelType::dimF*dimArea, 0)
dimensionedScalar(modelType::dimF*dimArea, Zero)
)
);
@ -412,7 +412,7 @@ Foam::BlendedInterfacialModel<modelType>::D() const
false
),
pair_.phase1().mesh(),
dimensionedScalar("zero", modelType::dimD, 0)
dimensionedScalar(modelType::dimD, Zero)
)
);

19
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/dummy/dummy.C
View File

@ -46,19 +46,16 @@ namespace IATEsources
Foam::tmp<Foam::volScalarField>
Foam::diameterModels::IATEsources::dummy::R() const
{
return tmp<volScalarField>
return tmp<volScalarField>::New
(
new volScalarField
IOobject
(
IOobject
(
"R",
iate_.phase().U().time().timeName(),
iate_.phase().mesh()
),
iate_.phase().U().mesh(),
dimensionedScalar("R", dimless/dimTime, 0)
)
"R",
iate_.phase().U().time().timeName(),
iate_.phase().mesh()
),
iate_.phase().U().mesh(),
dimensionedScalar(dimless/dimTime, Zero)
);
}

2
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
View File

@ -73,7 +73,7 @@ Foam::diameterModels::IATEsources::randomCoalescence::R() const
iate_.phase().mesh()
),
iate_.phase().U().mesh(),
dimensionedScalar("R", dimless/dimTime, 0)
dimensionedScalar(dimless/dimTime, Zero)
)
);

2
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
View File

@ -72,7 +72,7 @@ Foam::diameterModels::IATEsources::turbulentBreakUp::R() const
iate_.phase().mesh()
),
iate_.phase().U().mesh(),
dimensionedScalar("R", dimless/dimTime, 0)
dimensionedScalar(dimless/dimTime, Zero)
)
);

6
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.C
View File

@ -58,7 +58,7 @@ Foam::phaseModel::phaseModel
IOobject::AUTO_WRITE
),
fluid.mesh(),
dimensionedScalar("alpha", dimless, 0)
dimensionedScalar(dimless, Zero)
),
fluid_(fluid),
name_(phaseName),
@ -95,7 +95,7 @@ Foam::phaseModel::phaseModel
fluid.mesh()
),
fluid.mesh(),
dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0)
dimensionedScalar(dimensionSet(0, 3, -1, 0, 0), Zero)
),
alphaRhoPhi_
(
@ -106,7 +106,7 @@ Foam::phaseModel::phaseModel
fluid.mesh()
),
fluid.mesh(),
dimensionedScalar("0", dimensionSet(1, 0, -1, 0, 0), 0)
dimensionedScalar(dimensionSet(1, 0, -1, 0, 0), Zero)
)
{
alphaPhi_.setOriented();

4
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/twoPhaseSystem.C
View File

@ -106,7 +106,7 @@ Foam::twoPhaseSystem::twoPhaseSystem
IOobject::AUTO_WRITE
),
mesh,
dimensionedScalar("dgdt", dimless/dimTime, 0)
dimensionedScalar(dimless/dimTime, Zero)
)
{
phase2_.volScalarField::operator=(scalar(1) - phase1_);
@ -399,7 +399,7 @@ void Foam::twoPhaseSystem::solve()
mesh_
),
mesh_,
dimensionedScalar("Sp", dgdt_.dimensions(), 0.0)
dimensionedScalar(dgdt_.dimensions(), Zero)
);
volScalarField::Internal Su