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

Merge branch 'style-dimensioned' into 'develop'

Browse Source 
more consistent use of dimensioned Zero

See merge request Development/OpenFOAM-plus!196
This commit is contained in:
Mark Olesen
2018-04-03 20:30:31 +01:00
parent 06035b8a30 2f86cdc712
commit 5ac02c6809
381 changed files with 1891 additions and 2730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/solvers/basic/potentialFoam/createFields.H
View File

@ -13,7 +13,7 @@ volVectorField U
); );
// Initialise the velocity internal field to zero // Initialise the velocity internal field to zero
U = dimensionedVector("0", U.dimensions(), Zero); U = dimensionedVector(U.dimensions(), Zero);
surfaceScalarField phi surfaceScalarField phi
( (
@ -74,7 +74,7 @@ volScalarField p
false false
), ),
mesh, mesh,
dimensionedScalar(pName, sqr(dimVelocity), 0), dimensionedScalar(sqr(dimVelocity), Zero),
pBCTypes pBCTypes
); );
@ -105,7 +105,7 @@ volScalarField Phi
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
mesh, mesh,
dimensionedScalar("Phi", dimLength*dimVelocity, 0), dimensionedScalar(dimLength*dimVelocity, Zero),
PhiBCTypes PhiBCTypes
); );

6
applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H
View File

@ -13,7 +13,7 @@ volVectorField U
); );
// Initialise the velocity internal field to zero // Initialise the velocity internal field to zero
U = dimensionedVector("0", U.dimensions(), Zero); U = dimensionedVector(U.dimensions(), Zero);
surfaceScalarField phi surfaceScalarField phi
( (
@ -74,7 +74,7 @@ volScalarField p
false false
), ),
mesh, mesh,
dimensionedScalar(pName, sqr(dimVelocity), 0), dimensionedScalar(sqr(dimVelocity), Zero),
pBCTypes pBCTypes
); );
@ -105,7 +105,7 @@ volScalarField Phi
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
mesh, mesh,
dimensionedScalar("Phi", dimLength*dimVelocity, 0), dimensionedScalar(dimLength*dimVelocity, Zero),
PhiBCTypes PhiBCTypes
); );

9
applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C
View File

@ -103,7 +103,7 @@ Foam::tmp<Foam::volScalarField> Foam::XiEqModels::basicSubGrid::XiEq() const
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
mesh, mesh,
dimensionedScalar("zero", Nv.dimensions(), 0.0) dimensionedScalar(Nv.dimensions(), Zero)
); );
N.primitiveFieldRef() = Nv.primitiveField()*Cw; N.primitiveFieldRef() = Nv.primitiveField()*Cw;
@ -118,12 +118,7 @@ Foam::tmp<Foam::volScalarField> Foam::XiEqModels::basicSubGrid::XiEq() const
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
U.mesh(), U.mesh(),
dimensionedSymmTensor dimensionedSymmTensor(nsv.dimensions(), Zero)
(
"zero",
nsv.dimensions(),
Zero
)
); );
ns.primitiveFieldRef() = nsv.primitiveField()*Cw; ns.primitiveFieldRef() = nsv.primitiveField()*Cw;

9
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
View File

@ -104,12 +104,7 @@ Foam::tmp<Foam::volSymmTensorField> Foam::PDRDragModels::basic::Dcu() const
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
U_.mesh(), U_.mesh(),
dimensionedSymmTensor dimensionedSymmTensor(dimMass/dimTime/dimVolume, Zero)
(
"zero",
dimMass/dimTime/pow(dimLength, 3),
Zero
)
) )
); );
@ -143,7 +138,7 @@ Foam::tmp<Foam::volScalarField> Foam::PDRDragModels::basic::Gk() const
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
U_.mesh(), U_.mesh(),
dimensionedScalar("zero", dimMass/dimLength/pow(dimTime, 3), 0.0) dimensionedScalar(dimMass/dimLength/pow3(dimTime), Zero)
) )
); );

2
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C
View File

@ -105,7 +105,7 @@ Foam::tmp<Foam::volScalarField> Foam::XiEqModels::SCOPEXiEq::XiEq() const
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
epsilon.mesh(), epsilon.mesh(),
dimensionedScalar("XiEq", dimless, 0.0) dimensionedScalar(dimless, Zero)
) )
); );
volScalarField& xieq = tXiEq.ref(); volScalarField& xieq = tXiEq.ref();

9
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
View File

@ -110,7 +110,7 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const
false false
), ),
mesh, mesh,
dimensionedScalar("zero", Nv.dimensions(), 0.0) dimensionedScalar(Nv.dimensions(), Zero)
) )
); );
volScalarField& N = tN.ref(); volScalarField& N = tN.ref();
@ -127,12 +127,7 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
mesh, mesh,
dimensionedSymmTensor dimensionedSymmTensor(nsv.dimensions(), Zero)
(
"zero",
nsv.dimensions(),
Zero
)
); );
ns.primitiveFieldRef() = nsv.primitiveField()*pow(mesh.V(), 2.0/3.0); ns.primitiveFieldRef() = nsv.primitiveField()*pow(mesh.V(), 2.0/3.0);

6
applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C
View File

@ -255,7 +255,7 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::SCOPE::Su0pTphi
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
p.mesh(), p.mesh(),
dimensionedScalar("Su0", dimVelocity, 0.0) dimensionedScalar(dimVelocity, Zero)
) )
); );
@ -304,7 +304,7 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::SCOPE::Su0pTphi
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
p.mesh(), p.mesh(),
dimensionedScalar("Su0", dimVelocity, 0.0) dimensionedScalar(dimVelocity, Zero)
) )
); );
@ -358,7 +358,7 @@ Foam::tmp<Foam::volScalarField> Foam::laminarFlameSpeedModels::SCOPE::Ma
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
phi.mesh(), phi.mesh(),
dimensionedScalar("Ma", dimless, 0.0) dimensionedScalar(dimless, Zero)
) )
); );

2
applications/solvers/combustion/XiFoam/bEqn.H
View File

@ -243,7 +243,7 @@ if (ign.ignited())
rho*max rho*max
( (
sigmat - sigmas, sigmat - sigmas,
dimensionedScalar("0", sigmat.dimensions(), 0) dimensionedScalar(sigmat.dimensions(), Zero)
), ),
Xi Xi
) )

9
applications/solvers/combustion/chemFoam/createFields.H
View File

@ -55,12 +55,7 @@
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedScalar dimensionedScalar(dimEnergy/dimMass/dimTemperature, Zero)
(
"zero",
dimensionSet(dimEnergy/dimMass/dimTemperature),
0.0
)
); );
volVectorField U volVectorField U
@ -74,7 +69,7 @@
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
mesh, mesh,
dimensionedVector("zero", dimVelocity, Zero) dimensionedVector(dimVelocity, Zero)
); );
#include "createPhi.H" #include "createPhi.H"

2
applications/solvers/combustion/fireFoam/createFields.H
View File

@ -142,7 +142,7 @@ volScalarField Qdot
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0.0) dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
); );
#include "createDpdt.H" #include "createDpdt.H"

2
applications/solvers/combustion/reactingFoam/createFields.H
View File

@ -90,7 +90,7 @@ volScalarField Qdot
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0.0) dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
); );
#include "createDpdt.H" #include "createDpdt.H"

2
applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H
View File

@ -111,7 +111,7 @@ volScalarField Qdot
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0.0) dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
); );
#include "createDpdt.H" #include "createDpdt.H"

2
applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H
View File

@ -91,7 +91,7 @@ volScalarField Qdot
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0.0) dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
); );
#include "createDpdt.H" #include "createDpdt.H"

2
applications/solvers/combustion/reactingFoam/setRDeltaT.H
View File

@ -104,7 +104,7 @@ License
mesh mesh
), ),
mesh, mesh,
dimensionedScalar("rDeltaTY", rDeltaT.dimensions(), 0) dimensionedScalar(rDeltaT.dimensions(), Zero)
); );
bool foundY = false; bool foundY = false;

2
applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
View File

@ -63,7 +63,7 @@ int main(int argc, char *argv[])
#include "readFluxScheme.H" #include "readFluxScheme.H"
dimensionedScalar v_zero("v_zero", dimVolume/dimTime, 0.0); const dimensionedScalar v_zero(dimVolume/dimTime, Zero);
// Courant numbers used to adjust the time-step // Courant numbers used to adjust the time-step
scalar CoNum = 0.0; scalar CoNum = 0.0;

2
applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
View File

@ -61,7 +61,7 @@ int main(int argc, char *argv[])
#include "readFluxScheme.H" #include "readFluxScheme.H"
dimensionedScalar v_zero("v_zero", dimVolume/dimTime, 0.0); const dimensionedScalar v_zero(dimVolume/dimTime, Zero);
// Courant numbers used to adjust the time-step // Courant numbers used to adjust the time-step
scalar CoNum = 0.0; scalar CoNum = 0.0;

2
applications/solvers/compressible/rhoPimpleAdiabaticFoam/createFields.H
View File

@ -91,7 +91,7 @@ volScalarField dpdt
mesh mesh
), ),
mesh, mesh,
dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) dimensionedScalar(p.dimensions()/dimTime, Zero)
); );
#include "createMRF.H" #include "createMRF.H"

2
applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/createFields.H
View File

@ -73,7 +73,7 @@ volScalarField dpdt
mesh mesh
), ),
mesh, mesh,
dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) dimensionedScalar(p.dimensions()/dimTime, Zero)
); );
Info<< "Creating field kinetic energy K\n" << endl; Info<< "Creating field kinetic energy K\n" << endl;

2
applications/solvers/electromagnetics/magneticFoam/createFields.H
View File

@ -49,7 +49,7 @@
mesh mesh
), ),
mesh, mesh,
dimensionedScalar("Mr", dimensionSet(0, 1, 0, 0, 0, 1, 0), 0) dimensionedScalar(dimensionSet(0, 1, 0, 0, 0, 1, 0), Zero)
); );
forAll(magnets, i) forAll(magnets, i)

2
applications/solvers/financial/financialFoam/createFields.H
View File

@ -82,7 +82,7 @@ volVectorField P
V == max V == max
( (
P.component(Foam::vector::X) - strike, P.component(Foam::vector::X) - strike,
dimensionedScalar("0", V.dimensions(), 0.0) dimensionedScalar(V.dimensions(), Zero)
); );
volScalarField delta volScalarField delta

6
applications/solvers/finiteArea/liquidFilmFoam/createFaFields.H
View File

@ -72,7 +72,7 @@
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
aMesh, aMesh,
dimensionedScalar("Sm", dimLength/dimTime, 0) dimensionedScalar(dimLength/dimTime, Zero)
); );
// Mass sink // Mass sink
@ -87,7 +87,7 @@
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
aMesh, aMesh,
dimensionedScalar("Sd", dimLength/dimTime, 0) dimensionedScalar(dimLength/dimTime, Zero)
); );
areaVectorField Ug areaVectorField Ug
@ -101,7 +101,7 @@
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
aMesh, aMesh,
dimensionedVector("Ug", dimVelocity, vector::zero) dimensionedVector(dimVelocity, Zero)
); );

4
applications/solvers/finiteArea/liquidFilmFoam/createFvFields.H
View File

@ -9,7 +9,7 @@ volVectorField U
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedVector("0", dimVelocity, vector::zero) dimensionedVector(dimVelocity, Zero)
); );
@ -24,7 +24,7 @@ volScalarField H
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedScalar("0", dimLength, 0) dimensionedScalar(dimLength, Zero)
); );
// Create volume-to surface mapping object // Create volume-to surface mapping object

2
applications/solvers/finiteArea/sphereSurfactantFoam/createFaFields.H
View File

@ -43,7 +43,7 @@ areaVectorField Us
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
aMesh, aMesh,
dimensioned<vector>("Us", dimVelocity, vector::zero) dimensionedVector(dimVelocity, Zero)
); );
dimensioned<scalar> Uinf("Uinf", dimVelocity, 1.0); dimensioned<scalar> Uinf("Uinf", dimVelocity, 1.0);

4
applications/solvers/finiteArea/sphereSurfactantFoam/createVolFields.H
View File

@ -12,7 +12,7 @@
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedScalar("0", dimless/dimLength, 0) dimensionedScalar(dimless/dimLength, Zero)
); );
vsm.mapToVolume(Cs, Cvf.boundaryFieldRef()); vsm.mapToVolume(Cs, Cvf.boundaryFieldRef());
@ -29,7 +29,7 @@
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedVector("zero", dimVelocity, vector::zero) dimensionedVector(dimVelocity, Zero)
); );
vsm.mapToVolume(Us, U.boundaryFieldRef()); vsm.mapToVolume(Us, U.boundaryFieldRef());

4
applications/solvers/finiteArea/surfactantFoam/createVolFields.H
View File

@ -12,7 +12,7 @@
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedScalar("0", dimless/dimLength, 0) dimensionedScalar(dimless/dimLength, Zero)
); );
vsm.mapToVolume(Cs, Cvf.boundaryFieldRef()); vsm.mapToVolume(Cs, Cvf.boundaryFieldRef());
@ -29,7 +29,7 @@
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedVector("zero", dimVelocity, vector::zero) dimensionedVector(dimVelocity, Zero)
); );
vsm.mapToVolume(Us, U.boundaryFieldRef()); vsm.mapToVolume(Us, U.boundaryFieldRef());

2
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
View File

@ -122,7 +122,7 @@ forAll(fluidRegions, i)
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
dimensionedScalar("hRef", dimLength, 0) dimensionedScalar("hRef", dimLength, Zero) // uses name
) )
); );

9
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
View File

@ -122,7 +122,7 @@ forAll(fluidRegions, i)
IOobject::READ_IF_PRESENT, IOobject::READ_IF_PRESENT,
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
dimensionedScalar("hRef", dimLength, 0) dimensionedScalar("hRef", dimLength, Zero) // uses name
) )
); );
@ -223,12 +223,7 @@ forAll(fluidRegions, i)
fluidRegions[i] fluidRegions[i]
), ),
fluidRegions[i], fluidRegions[i],
dimensionedScalar dimensionedScalar(thermoFluid[i].p().dimensions()/dimTime, Zero)
(
"dpdt",
thermoFluid[i].p().dimensions()/dimTime,
0
)
) )
); );

7
applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
View File

@ -51,12 +51,7 @@
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
solidRegions[i], solidRegions[i],
dimensionedSymmTensor dimensionedSymmTensor(tkappaByCp().dimensions(), Zero),
(
"zero",
tkappaByCp().dimensions(),
Zero
),
zeroGradientFvPatchSymmTensorField::typeName zeroGradientFvPatchSymmTensorField::typeName
) )
); );

4
applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H
View File

@ -86,8 +86,8 @@ autoPtr<incompressible::turbulenceModel> turbulence
); );
dimensionedScalar zeroSensitivity("0", dimVelocity*dimVelocity, 0.0); dimensionedScalar zeroSensitivity(dimVelocity*dimVelocity, Zero);
dimensionedScalar zeroAlpha("0", dimless/dimTime, 0.0); dimensionedScalar zeroAlpha(dimless/dimTime, Zero);
dimensionedScalar lambda dimensionedScalar lambda
( (

2
applications/solvers/incompressible/boundaryFoam/createFields.H
View File

@ -25,7 +25,7 @@ surfaceScalarField phi
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
mesh, mesh,
dimensionedScalar("zero", mesh.Sf().dimensions()*U.dimensions(), 0.0) dimensionedScalar(mesh.Sf().dimensions()*U.dimensions(), Zero)
); );

2
applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H
View File

@ -47,7 +47,7 @@ if (mesh.changing())
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
mesh, mesh,
dimensionedScalar("pcorr", p.dimensions(), 0.0), dimensionedScalar(p.dimensions(), Zero),
pcorrTypes pcorrTypes
); );

2
applications/solvers/incompressible/shallowWaterFoam/createFields.H
View File

@ -25,7 +25,7 @@ volScalarField h0
IOobject::READ_IF_PRESENT IOobject::READ_IF_PRESENT
), ),
mesh, mesh,
dimensionedScalar("h0", dimLength, 0.0) dimensionedScalar(dimLength, Zero)
); );
Info<< "Creating field hU\n" << endl; Info<< "Creating field hU\n" << endl;

7
applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C
View File

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

7
applications/solvers/lagrangian/DPMFoam/DPMFoam.C
View File

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

2
applications/solvers/lagrangian/DPMFoam/createFields.H
View File

@ -119,7 +119,7 @@ volScalarField alphac
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedScalar("0", dimless, 0) dimensionedScalar(dimless, Zero)
); );
word kinematicCloudName("kinematicCloud"); word kinematicCloudName("kinematicCloud");

6
applications/solvers/lagrangian/coalChemistryFoam/createFields.H
View File

@ -63,7 +63,7 @@ volScalarField rhoEffLagrangian
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedScalar("zero", dimDensity, 0.0) dimensionedScalar(dimDensity, Zero)
); );
// dynamic pressure field - used externally (optional) // dynamic pressure field - used externally (optional)
@ -78,7 +78,7 @@ volScalarField pDyn
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedScalar("zero", dimPressure, 0.0) dimensionedScalar(dimPressure, Zero)
); );
@ -126,7 +126,7 @@ volScalarField Qdot
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0.0) dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
); );
#include "createDpdt.H" #include "createDpdt.H"

2
applications/solvers/lagrangian/reactingParcelFoam/createFields.H
View File

@ -121,7 +121,7 @@ volScalarField Qdot
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0.0) dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
); );
#include "createDpdt.H" #include "createDpdt.H"

2
applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H
View File

@ -114,7 +114,7 @@ volScalarField Qdot
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0.0) dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
); );
#include "createMRF.H" #include "createMRF.H"

2
applications/solvers/lagrangian/simpleCoalParcelFoam/createFields.H
View File

@ -114,7 +114,7 @@ volScalarField Qdot
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0.0) dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
); );
#include "createMRF.H" #include "createMRF.H"

2
applications/solvers/lagrangian/sprayFoam/createFields.H
View File

@ -113,7 +113,7 @@ volScalarField Qdot
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0.0) dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
); );
#include "createDpdt.H" #include "createDpdt.H"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -7,7 +7,7 @@ volScalarField::Internal Sp
mesh mesh
), ),
mesh, mesh,
dimensionedScalar("Sp", dgdt.dimensions(), 0) dimensionedScalar(dgdt.dimensions(), Zero)
); );
volScalarField::Internal Su volScalarField::Internal Su
@ -19,7 +19,7 @@ volScalarField::Internal Su
mesh mesh
), ),
mesh, mesh,
dimensionedScalar("Su", dgdt.dimensions(), 0) dimensionedScalar(dgdt.dimensions(), Zero)
); );
forAll(dgdt, celli) 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 IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedScalar("alpha1", dimless, 0.0), dimensionedScalar(dimless, Zero),
zeroGradientFvPatchScalarField::typeName zeroGradientFvPatchScalarField::typeName
), ),
curTimeIndex_(-1) curTimeIndex_(-1)

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

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

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

@ -61,7 +61,7 @@ Foam::phaseModel::phaseModel
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
p.mesh(), 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
), ),
mesh, mesh,
dimensionedScalar("0", phi.dimensions(), 0) dimensionedScalar(phi.dimensions(), Zero)
); );
surfaceScalarField phir(fvc::flux(UdmModel.Udm())); surfaceScalarField phir(fvc::flux(UdmModel.Udm()));
@ -25,7 +25,7 @@
mesh mesh
), ),
mesh, mesh,
dimensionedScalar("0", phi.dimensions(), 0) dimensionedScalar(phi.dimensions(), Zero)
); );
for for

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

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

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

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

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

@ -136,6 +136,6 @@ volScalarField pDivU
mesh mesh
), ),
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
), ),
mesh, mesh,
dimensionedScalar("0", dimMass/dimTime, 0) dimensionedScalar(dimMass/dimTime, Zero)
); );
mixture->correct(); 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) 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>> return Pair<tmp<volScalarField>>
( (
@ -106,9 +106,9 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDot() const
mesh_.lookupObject<basicThermo>(basicThermo::dictName) 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>> return Pair<tmp<volScalarField>>
( (
@ -139,8 +139,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixtures::constant::mDotDeltaT() const
mesh_.lookupObject<basicThermo>(basicThermo::dictName) mesh_.lookupObject<basicThermo>(basicThermo::dictName)
); );
const dimensionedScalar& TSat = thermo.TSat(); const dimensionedScalar& TSat = thermo.TSat();
return Pair<tmp<volScalarField>> 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 IOobject::NO_WRITE
), ),
U.mesh(), U.mesh(),
dimensionedScalar("zero", dimEnergy/dimMass, 0.0), dimensionedScalar(dimEnergy/dimMass, Zero),
heBoundaryTypes() heBoundaryTypes()
) )
), ),
@ -234,21 +234,18 @@ Foam::tmp<Foam::volScalarField> Foam::twoPhaseMixtureEThermo::hc() const
{ {
const fvMesh& mesh = this->T_.mesh(); const fvMesh& mesh = this->T_.mesh();
return tmp<volScalarField> return tmp<volScalarField>::New
( (
new volScalarField IOobject
( (
IOobject "hc",
( mesh.time().timeName(),
"hc",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
mesh, 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 IOobject::NO_WRITE
), ),
mesh, mesh,
dimensionedScalar("zero", phi.dimensions(), 0.0) dimensionedScalar(phi.dimensions(), Zero)
); );
#include "createMRF.H" #include "createMRF.H"

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

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

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

@ -116,7 +116,7 @@ Foam::incompressibleThreePhaseMixture::incompressibleThreePhaseMixture
U.db() U.db()
), ),
U.mesh(), U.mesh(),
dimensionedScalar("nu", dimensionSet(0, 2, -1, 0, 0), 0), dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), Zero),
calculatedFvPatchScalarField::typeName 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()
), ),
mixture.alpha1().mesh(), mixture.alpha1().mesh(),
dimensionedScalar("nHatf", dimArea, 0.0) dimensionedScalar(dimArea, Zero)
), ),
K_ K_
@ -193,7 +193,7 @@ Foam::threePhaseInterfaceProperties::threePhaseInterfaceProperties
mixture.alpha1().mesh() mixture.alpha1().mesh()
), ),
mixture.alpha1().mesh(), mixture.alpha1().mesh(),
dimensionedScalar("K", dimless/dimLength, 0.0) dimensionedScalar(dimless/dimLength, Zero)
) )
{ {
calculateK(); calculateK();

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

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

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

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

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

@ -10,7 +10,7 @@ if (nAlphaSubCycles > 1)
mesh mesh
), ),
mesh, mesh,
dimensionedScalar("0", rhoPhi.dimensions(), 0) dimensionedScalar(rhoPhi.dimensions(), Zero)
); );
tmp<volScalarField> trSubDeltaT; 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
), ),
mesh, mesh,
dimensionedScalar("0", dimMass/dimTime, 0) dimensionedScalar(dimMass/dimTime, Zero)
); );
mixture->correct(); mixture->correct();

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

@ -98,7 +98,7 @@ int main(int argc, char *argv[])
mesh mesh
), ),
mesh, mesh,
dimensionedScalar("0", dimMass/dimTime, 0) dimensionedScalar(dimMass/dimTime, Zero)
); );
mixture->correct(); 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_), Cc_("Cc", dimless, phaseChangeTwoPhaseMixtureCoeffs_),
Cv_("Cv", dimless, phaseChangeTwoPhaseMixtureCoeffs_), Cv_("Cv", dimless, phaseChangeTwoPhaseMixtureCoeffs_),
p0_("0", pSat().dimensions(), 0.0), p0_(pSat().dimensions(), Zero),
mcCoeff_(Cc_*rho2()/tInf_), mcCoeff_(Cc_*rho2()/tInf_),
mvCoeff_(Cv_*rho2()/(0.5*rho1()*sqr(UInf_)*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_), Cc_("Cc", dimless, phaseChangeTwoPhaseMixtureCoeffs_),
Cv_("Cv", dimless, phaseChangeTwoPhaseMixtureCoeffs_), Cv_("Cv", dimless, phaseChangeTwoPhaseMixtureCoeffs_),
p0_("0", pSat().dimensions(), 0.0), p0_(pSat().dimensions(), Zero),
mcCoeff_(Cc_/(0.5*sqr(UInf_)*tInf_)), mcCoeff_(Cc_/(0.5*sqr(UInf_)*tInf_)),
mvCoeff_(Cv_*rho1()/(0.5*sqr(UInf_)*tInf_*rho2())) 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_), Cc_("Cc", dimless, phaseChangeTwoPhaseMixtureCoeffs_),
Cv_("Cv", dimless, phaseChangeTwoPhaseMixtureCoeffs_), Cv_("Cv", dimless, phaseChangeTwoPhaseMixtureCoeffs_),
p0_("0", pSat().dimensions(), 0.0) p0_(pSat().dimensions(), Zero)
{ {
correct(); correct();
} }

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

@ -23,7 +23,7 @@ volVectorField U
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedVector("U", dimVelocity, Zero) dimensionedVector(dimVelocity, Zero)
); );
surfaceScalarField phi surfaceScalarField phi
@ -37,7 +37,7 @@ surfaceScalarField phi
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedScalar("phi", dimArea*dimVelocity, 0) dimensionedScalar(dimArea*dimVelocity, Zero)
); );
multiphaseSystem fluid(U, phi); 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 volScalarField& Ur
) const ) const
{ {
return tmp<volScalarField> return tmp<volScalarField>::New
( (
new volScalarField IOobject
( (
IOobject "K",
( Ur.mesh().time().timeName(),
"K",
Ur.mesh().time().timeName(),
Ur.mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
Ur.mesh(), 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_
), ),
mesh_, mesh_,
dimensionedScalar("sumAlpha", dimless, 0) dimensionedScalar(dimless, Zero)
); );
phasei = 0; phasei = 0;
@ -398,7 +398,7 @@ Foam::multiphaseSystem::multiphaseSystem
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh_, mesh_,
dimensionedScalar("alphas", dimless, 0.0) dimensionedScalar(dimless, Zero)
), ),
sigmas_(lookup("sigmas")), sigmas_(lookup("sigmas")),
@ -557,12 +557,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::Cvm
mesh_ mesh_
), ),
mesh_, mesh_,
dimensionedScalar dimensionedScalar(dimensionSet(1, -3, 0, 0, 0), Zero)
(
"Cvm",
dimensionSet(1, -3, 0, 0, 0),
0
)
) )
); );
@ -613,12 +608,7 @@ Foam::tmp<Foam::volVectorField> Foam::multiphaseSystem::Svm
mesh_ mesh_
), ),
mesh_, mesh_,
dimensionedVector dimensionedVector(dimensionSet(1, -2, -2, 0, 0), Zero)
(
"Svm",
dimensionSet(1, -2, -2, 0, 0),
Zero
)
) )
); );
@ -740,12 +730,7 @@ Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::dragCoeff
mesh_ mesh_
), ),
mesh_, mesh_,
dimensionedScalar dimensionedScalar(dimensionSet(1, -3, -1, 0, 0), Zero)
(
"dragCoeff",
dimensionSet(1, -3, -1, 0, 0),
0
)
) )
); );
@ -788,12 +773,7 @@ Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseSystem::surfaceTension
mesh_ mesh_
), ),
mesh_, mesh_,
dimensionedScalar dimensionedScalar(dimensionSet(1, -2, -2, 0, 0), Zero)
(
"surfaceTension",
dimensionSet(1, -2, -2, 0, 0),
0
)
) )
); );
tSurfaceTension.ref().setOriented(); tSurfaceTension.ref().setOriented();
@ -840,7 +820,7 @@ Foam::multiphaseSystem::nearInterface() const
mesh_ mesh_
), ),
mesh_, mesh_,
dimensionedScalar("nearInterface", dimless, 0.0) dimensionedScalar(dimless, Zero)
) )
); );
@ -897,7 +877,7 @@ void Foam::multiphaseSystem::solve()
mesh_ mesh_
), ),
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
), ),
mesh, mesh,
dimensionedVector("0", dimVelocity/dimTime, Zero) dimensionedVector(dimVelocity/dimTime, Zero)
), ),
alphaPhi_ alphaPhi_
( (
@ -110,7 +110,7 @@ Foam::phaseModel::phaseModel
mesh mesh
), ),
mesh, mesh,
dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0) dimensionedScalar(dimensionSet(0, 3, -1, 0, 0), Zero)
) )
{ {
alphaPhi_.setOriented(); alphaPhi_.setOriented();

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

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

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

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

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

@ -49,7 +49,7 @@ volVectorField zeta
IOobject::AUTO_WRITE IOobject::AUTO_WRITE
), ),
mesh, mesh,
dimensionedVector("zero", dimLength, Zero) dimensionedVector(dimLength, Zero)
); );
Info<< "Creating field p_gh\n" << endl; 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 volScalarField& Tf
) const ) const
{ {
return tmp<volScalarField> return tmp<volScalarField>::New
( (
new volScalarField IOobject
( (
IOobject IOobject::groupName("YfPrime", this->pair_.name()),
( this->pair_.phase1().mesh().time().timeName(),
IOobject::groupName("YfPrime", this->pair_.name()), this->pair_.phase1().mesh()
this->pair_.phase1().mesh().time().timeName(), ),
this->pair_.phase1().mesh() this->pair_.phase1().mesh(),
), dimensionedScalar(dimless/dimTemperature, Zero)
this->pair_.phase1().mesh(),
dimensionedScalar("zero", dimless/dimTemperature, 0)
)
); );
} }

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()
), ),
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()
), ),
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()
), ),
pair.phase1().mesh(), pair.phase1().mesh(),
dimensionedScalar("zero", dimless/dimTemperature, 0) dimensionedScalar(dimless/dimTemperature, Zero)
) )
{ {
forAllConstIter(hashedWordList, this->speciesNames_, iter) 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 volScalarField& T
) const ) const
{ {
return tmp<volScalarField> return tmp<volScalarField>::New
( (
new volScalarField IOobject
( (
IOobject "pSat",
( T.mesh().time().timeName(),
"pSat",
T.mesh().time().timeName(),
T.mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
T.mesh(), 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 volScalarField& T
) const ) const
{ {
return tmp<volScalarField> return tmp<volScalarField>::New
( (
new volScalarField IOobject
( (
IOobject "pSatPrime",
( T.mesh().time().timeName(),
"pSatPrime",
T.mesh().time().timeName(),
T.mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
T.mesh(), 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 volScalarField& T
) const ) const
{ {
return tmp<volScalarField> return tmp<volScalarField>::New
( (
new volScalarField IOobject
( (
IOobject "lnPSat",
( T.mesh().time().timeName(),
"lnPSat",
T.mesh().time().timeName(),
T.mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
T.mesh(), 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 volScalarField& p
) const ) const
{ {
return tmp<volScalarField> return tmp<volScalarField>::New
( (
new volScalarField IOobject
( (
IOobject "Tsat",
( p.mesh().time().timeName(),
"Tsat",
p.mesh().time().timeName(),
p.mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
p.mesh(), 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 IOobject::NO_WRITE
), ),
p.mesh(), 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 IOobject::NO_WRITE
), ),
p.mesh(), 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
), ),
mesh, mesh,
dimensionedScalar("L", dimLength, 0), dimensionedScalar(dimLength, Zero),
zeroGradientFvPatchField<scalar>::typeName zeroGradientFvPatchField<scalar>::typeName
); );
L.primitiveFieldRef() = cbrt(mesh.V()); 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()); const fvMesh& mesh(this->pair_.phase1().mesh());
return return tmp<volScalarField>::New
tmp<volScalarField> (
IOobject
( (
new volScalarField "zero",
( mesh.time().timeName(),
IOobject mesh
( ),
"zero", mesh,
mesh.time().timeName(), Cl_
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()); const fvMesh& mesh(this->pair_.phase1().mesh());
return tmp<volScalarField> return tmp<volScalarField>::New
( (
new volScalarField IOobject
( (
IOobject "Cl",
( mesh.time().timeName(),
"Cl",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh, 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()); const fvMesh& mesh(this->pair_.phase1().mesh());
return tmp<volVectorField> return tmp<volVectorField>::New
( (
new volVectorField IOobject
( (
IOobject "noLift:F",
( mesh.time().timeName(),
"noLift:F",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh, 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()); const fvMesh& mesh(this->pair_.phase1().mesh());
return tmp<surfaceScalarField> return tmp<surfaceScalarField>::New
( (
new surfaceScalarField IOobject
( (
IOobject "noLift:Ff",
( mesh.time().timeName(),
"noLift:Ff",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh, 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()); const fvMesh& mesh(this->pair_.phase1().mesh());
return tmp<volScalarField> return tmp<volScalarField>::New
( (
new volScalarField IOobject
( (
IOobject "zero",
( mesh.time().timeName(),
"zero",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh, 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()); const fvMesh& mesh(this->pair_.phase1().mesh());
return return tmp<volVectorField>::New
tmp<volVectorField> (
IOobject
( (
new volVectorField "zero",
( mesh.time().timeName(),
IOobject mesh
( ),
"zero", mesh,
mesh.time().timeName(), dimensionedVector(dimF, Zero)
mesh );
),
mesh,
dimensionedVector("zero", 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()); const fvMesh& mesh(this->pair_.phase1().mesh());
return return tmp<volScalarField>::New
tmp<volScalarField> (
IOobject
( (
new volScalarField "zero",
( mesh.time().timeName(),
IOobject mesh
( ),
"zero", mesh,
mesh.time().timeName(), dimensionedScalar(dimless, Zero)
mesh );
),
mesh,
dimensionedScalar("zero", dimless, 0)
)
);
} }
Foam::tmp<Foam::volScalarField> Foam::tmp<Foam::volScalarField>
Foam::virtualMassModels::noVirtualMass::K() const 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 max
( (
dimensionedScalar("zero", dimless/dimLength, 0), dimensionedScalar(dimless/dimLength, Zero),
Cw1_/pair_.dispersed().d() + Cw2_/yWall() Cw1_/pair_.dispersed().d() + Cw2_/yWall()
) )
*pair_.continuous().rho() *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 *max
( (
dimensionedScalar("zero", dimless/dimLength, 0.0), dimensionedScalar(dimless/dimLength, Zero),
(1.0 - yTilde)/(Cwd_*y*pow(yTilde, p_ - 1.0)) (1.0 - yTilde)/(Cwd_*y*pow(yTilde, p_ - 1.0))
) )
*pair_.continuous().rho() *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()); const fvMesh& mesh(this->pair_.phase1().mesh());
return tmp<volVectorField> return tmp<volVectorField>::New
( (
new volVectorField IOobject
( (
IOobject "noWallLubrication:Fi",
( mesh.time().timeName(),
"noWallLubrication:Fi",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh, 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()); const fvMesh& mesh(this->pair_.phase1().mesh());
return tmp<volVectorField> return tmp<volVectorField>::New
( (
new volVectorField IOobject
( (
IOobject "noWallLubrication:F",
( mesh.time().timeName(),
"noWallLubrication:F",
mesh.time().timeName(),
mesh,
IOobject::NO_READ,
IOobject::NO_WRITE,
false
),
mesh, 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 false
), ),
phase1_.mesh(), phase1_.mesh(),
dimensionedScalar("zero", ModelType::dimK, 0) dimensionedScalar(ModelType::dimK, Zero)
) )
); );
@ -255,7 +255,7 @@ Foam::BlendedInterfacialModel<ModelType>::K(const scalar residualAlpha) const
false false
), ),
phase1_.mesh(), phase1_.mesh(),
dimensionedScalar("zero", ModelType::dimK, 0) dimensionedScalar(ModelType::dimK, Zero)
) )
); );
@ -321,7 +321,7 @@ Foam::BlendedInterfacialModel<ModelType>::Kf() const
false false
), ),
phase1_.mesh(), phase1_.mesh(),
dimensionedScalar("zero", ModelType::dimK, 0) dimensionedScalar(ModelType::dimK, Zero)
) )
); );
@ -384,7 +384,7 @@ Foam::BlendedInterfacialModel<ModelType>::F() const
false false
), ),
phase1_.mesh(), phase1_.mesh(),
dimensioned<Type>("zero", ModelType::dimF, Zero) dimensioned<Type>(ModelType::dimF, Zero)
) )
); );
@ -452,7 +452,7 @@ Foam::BlendedInterfacialModel<ModelType>::Ff() const
false false
), ),
phase1_.mesh(), phase1_.mesh(),
dimensionedScalar("zero", ModelType::dimF*dimArea, 0) dimensionedScalar(ModelType::dimF*dimArea, Zero)
) )
); );
x.ref().setOriented(); x.ref().setOriented();
@ -515,7 +515,7 @@ Foam::BlendedInterfacialModel<ModelType>::D() const
false false
), ),
phase1_.mesh(), 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 IOobject::AUTO_WRITE
), ),
this->mesh(), this->mesh(),
dimensionedScalar("zero", dimDensity/dimTime, 0) dimensionedScalar(dimDensity/dimTime, Zero)
) )
); );
@ -100,7 +100,7 @@ HeatAndMassTransferPhaseSystem
this->mesh() this->mesh()
), ),
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_
), ),
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 phasePairKey& key
) const ) 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().timeName(),
this->mesh().time() this->mesh().time()
), ),
this->mesh(), this->mesh(),
dimensionedScalar("zero", dimDensity/dimTime, 0) 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];
*this->dmdtExplicit_[pair] = *this->dmdtExplicit_[pair] =
dimensionedScalar("zero", dimDensity/dimTime, 0); dimensionedScalar(dimDensity/dimTime, Zero);
} }
// Sum up the contribution from each interface composition model // Sum up the contribution from each interface composition model
@ -225,7 +225,7 @@ correctThermo()
this->mesh() this->mesh()
), ),
this->mesh(), this->mesh(),
dimensionedScalar("zero", dimEnergy/dimVolume/dimTime, 0) dimensionedScalar(dimEnergy/dimVolume/dimTime, Zero)
); );
volScalarField mDotLPrime volScalarField mDotLPrime
( (
@ -236,7 +236,7 @@ correctThermo()
this->mesh() this->mesh()
), ),
this->mesh(), this->mesh(),
dimensionedScalar("zero", mDotL.dimensions()/dimTemperature, 0) dimensionedScalar(mDotL.dimensions()/dimTemperature, Zero)
); );
volScalarField& Tf = *this->Tf_[pair]; 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_
), ),
this->mesh_, this->mesh_,
dimensionedScalar dimensionedScalar(dimensionSet(1, -3, -1, 0, 0), Zero)
(
IOobject::groupName("Kd", phase.name()),
dimensionSet(1, -3, -1, 0, 0),
0
)
) )
); );
@ -210,26 +205,21 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Vm
{ {
return virtualMassModels_[key]->K(); return virtualMassModels_[key]->K();
} }
else
{ return tmp<volScalarField>::New
return tmp<volScalarField> (
IOobject
( (
new volScalarField virtualMassModel::typeName + ":K",
( this->mesh_.time().timeName(),
IOobject this->mesh_,
( IOobject::NO_READ,
virtualMassModel::typeName + ":K", IOobject::NO_WRITE,
this->mesh_.time().timeName(), false
this->mesh_, ),
IOobject::NO_READ, this->mesh_,
IOobject::NO_WRITE, dimensionedScalar(virtualMassModel::dimK, Zero)
false );
),
this->mesh_,
dimensionedScalar("zero", virtualMassModel::dimK, 0)
)
);
}
} }
@ -244,26 +234,21 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Vmf
{ {
return virtualMassModels_[key]->Kf(); return virtualMassModels_[key]->Kf();
} }
else
{ return tmp<surfaceScalarField>::New
return tmp<surfaceScalarField> (
IOobject
( (
new surfaceScalarField virtualMassModel::typeName + ":Kf",
( this->mesh_.time().timeName(),
IOobject this->mesh_,
( IOobject::NO_READ,
virtualMassModel::typeName + ":Kf", IOobject::NO_WRITE,
this->mesh_.time().timeName(), false
this->mesh_, ),
IOobject::NO_READ, this->mesh_,
IOobject::NO_WRITE, dimensionedScalar(virtualMassModel::dimK, Zero)
false );
),
this->mesh_,
dimensionedScalar("zero", virtualMassModel::dimK, 0)
)
);
}
} }
@ -288,26 +273,21 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::F
{ {
return wallLubricationModels_[key]->template F<vector>(); return wallLubricationModels_[key]->template F<vector>();
} }
else
{ return tmp<volVectorField>::New
return tmp<volVectorField> (
IOobject
( (
new volVectorField liftModel::typeName + ":F",
( this->mesh_.time().timeName(),
IOobject this->mesh_,
( IOobject::NO_READ,
liftModel::typeName + ":F", IOobject::NO_WRITE,
this->mesh_.time().timeName(), false
this->mesh_, ),
IOobject::NO_READ, this->mesh_,
IOobject::NO_WRITE, dimensionedVector(liftModel::dimF, Zero)
false );
),
this->mesh_,
dimensionedVector("zero", liftModel::dimF, Zero)
)
);
}
} }
@ -348,7 +328,7 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::Ff
false false
), ),
this->mesh_, 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(); return turbulentDispersionModels_[key]->D();
} }
else
{ return tmp<volScalarField>::New
return tmp<volScalarField> (
IOobject
( (
new volScalarField turbulentDispersionModel::typeName + ":D",
( this->mesh_.time().timeName(),
IOobject this->mesh_,
( IOobject::NO_READ,
turbulentDispersionModel::typeName + ":D", IOobject::NO_WRITE,
this->mesh_.time().timeName(), false
this->mesh_, ),
IOobject::NO_READ, this->mesh_,
IOobject::NO_WRITE, dimensionedScalar(turbulentDispersionModel::dimD, Zero)
false );
),
this->mesh_,
dimensionedScalar("zero", turbulentDispersionModel::dimD, 0)
)
);
}
} }
@ -504,7 +479,7 @@ Foam::volVectorField& Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::setF
false false
), ),
this->mesh_, this->mesh_,
dimensionedVector("zero", liftModel::dimF, Zero) dimensionedVector(liftModel::dimF, Zero)
) )
); );
} }
@ -575,9 +550,8 @@ Foam::MomentumTransferPhaseSystem<BasePhaseSystem>::setPhiD
this->mesh_, this->mesh_,
dimensionedScalar dimensionedScalar
( (
"zero",
dimTime*dimArea*turbulentDispersionModel::dimF/dimDensity, 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 IOobject::AUTO_WRITE
), ),
this->mesh(), this->mesh(),
dimensionedScalar("zero", dimDensity/dimTime, 0) dimensionedScalar(dimDensity/dimTime, Zero)
) )
); );
} }
@ -128,7 +128,7 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::heatTransfer() const
false false
), ),
phase.mesh(), phase.mesh(),
dimensionedScalar("",dimensionSet(1,-1,-3,0,0),0.0) dimensionedScalar(dimensionSet(1,-1,-3,0,0), Zero)
); );
if if
@ -274,7 +274,7 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::iDmdt
this->mesh_ this->mesh_
), ),
this->mesh_, this->mesh_,
dimensionedScalar("zero", dimDensity/dimTime, 0) dimensionedScalar(dimDensity/dimTime, Zero)
) )
); );
@ -383,7 +383,7 @@ void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
} }
else else
{ {
iDmdtNew == dimensionedScalar("0",dmdt.dimensions(), 0); iDmdtNew == dimensionedScalar(dmdt.dimensions(), Zero);
} }
volScalarField H1(this->heatTransferModels_[pair][pair.first()]->K()); volScalarField H1(this->heatTransferModels_[pair][pair.first()]->K());
@ -430,7 +430,7 @@ void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
false false
), ),
this->mesh(), this->mesh(),
dimensionedScalar("zero", dimDensity/dimTime, 0) dimensionedScalar(dimDensity/dimTime, Zero)
); );
if 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()
), ),
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::tmp<Foam::volScalarField>
Foam::InertPhaseModel<BasePhaseModel>::Qdot() const 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(),
IOobject::groupName("Qdot", this->name()), this->mesh()
this->mesh().time().timeName(), ),
this->mesh() this->mesh(),
), dimensionedScalar(dimEnergy/dimTime/dimVolume, Zero)
this->mesh(),
dimensionedScalar("zero", dimEnergy/dimTime/dimVolume, 0)
)
); );
} }

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

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

Some files were not shown because too many files have changed in this diff Show More